February 2010 - Wine-commits

Henri Verbeet : wined3d: Handle a zero source value for WINED3DSIH_LOG.
by Alexandre Julliard 01 Feb '10

01 Feb '10

Module: wine Branch: master Commit: 4a8f93baded2cc56b1154d4c2c3d8d696441bd38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a8f93baded2cc56b1154d4c2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 1 13:52:56 2010 +0100 wined3d: Handle a zero source value for WINED3DSIH_LOG. --- dlls/wined3d/glsl_shader.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e548aca..fd359b5 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2105,10 +2105,15 @@ static void shader_glsl_log(const struct wined3d_shader_instruction *ins) shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_0, &src0_param); - if (dst_size > 1) { - shader_addline(buffer, "vec%d(log2(abs(%s))));\n", dst_size, src0_param.param_str); - } else { - shader_addline(buffer, "log2(abs(%s)));\n", src0_param.param_str); + if (dst_size > 1) + { + shader_addline(buffer, "vec%d(%s == 0.0 ? -FLT_MAX : log2(abs(%s))));\n", + dst_size, src0_param.param_str, src0_param.param_str); + } + else + { + shader_addline(buffer, "%s == 0.0 ? -FLT_MAX : log2(abs(%s)));\n", + src0_param.param_str, src0_param.param_str); } }

1 0

Henri Verbeet : wined3d: Handle a zero source value for WINED3DSIH_RCP.
by Alexandre Julliard 01 Feb '10

01 Feb '10

Module: wine Branch: master Commit: ef82681d59ec264b981bb3653ea774044f02fa9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef82681d59ec264b981bb3653… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 1 13:52:57 2010 +0100 wined3d: Handle a zero source value for WINED3DSIH_RCP. --- dlls/wined3d/glsl_shader.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index fd359b5..ba16cae 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2229,10 +2229,15 @@ static void shader_glsl_rcp(const struct wined3d_shader_instruction *ins) mask_size = shader_glsl_get_write_mask_size(write_mask); shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_3, &src_param); - if (mask_size > 1) { - shader_addline(ins->ctx->buffer, "vec%d(1.0 / %s));\n", mask_size, src_param.param_str); - } else { - shader_addline(ins->ctx->buffer, "1.0 / %s);\n", src_param.param_str); + if (mask_size > 1) + { + shader_addline(ins->ctx->buffer, "vec%d(%s == 0.0 ? FLT_MAX : 1.0 / %s));\n", + mask_size, src_param.param_str, src_param.param_str); + } + else + { + shader_addline(ins->ctx->buffer, "%s == 0.0 ? FLT_MAX : 1.0 / %s);\n", + src_param.param_str, src_param.param_str); } }

1 0

Maarten Lankhorst : devenum: Scan special device categories more often.
by Alexandre Julliard 01 Feb '10

01 Feb '10

Module: wine Branch: master Commit: 737ed17f1ba64faa34a7b267b3f6f2ba01388521 URL: http://source.winehq.org/git/wine.git/?a=commit;h=737ed17f1ba64faa34a7b267b… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sat Jan 30 16:21:19 2010 +0100 devenum: Scan special device categories more often. --- dlls/devenum/createdevenum.c | 75 ++++++++++++++++++++++++++++++------------ 1 files changed, 54 insertions(+), 21 deletions(-) diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index 2923b8d..5a20da5 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -481,28 +481,25 @@ static HRESULT WINAPI DEVENUM_ICreateDevEnum_CreateClassEnumerator( if (FAILED(hr)) return hr; - if (RegOpenKeyW(hbasekey, wszRegKey, &hkey) != ERROR_SUCCESS) + if (IsEqualGUID(clsidDeviceClass, &CLSID_AudioRendererCategory) || + IsEqualGUID(clsidDeviceClass, &CLSID_AudioInputDeviceCategory) || + IsEqualGUID(clsidDeviceClass, &CLSID_VideoInputDeviceCategory) || + IsEqualGUID(clsidDeviceClass, &CLSID_MidiRendererCategory)) { - if (IsEqualGUID(clsidDeviceClass, &CLSID_AudioRendererCategory) || - IsEqualGUID(clsidDeviceClass, &CLSID_AudioInputDeviceCategory) || - IsEqualGUID(clsidDeviceClass, &CLSID_VideoInputDeviceCategory) || - IsEqualGUID(clsidDeviceClass, &CLSID_MidiRendererCategory)) - { - hr = DEVENUM_CreateSpecialCategories(); - if (FAILED(hr)) - return hr; - if (RegOpenKeyW(hbasekey, wszRegKey, &hkey) != ERROR_SUCCESS) - { - ERR("Couldn't open registry key for special device: %s\n", - debugstr_guid(clsidDeviceClass)); - return S_FALSE; - } - } - else - { - FIXME("Category %s not found\n", debugstr_guid(clsidDeviceClass)); - return S_FALSE; - } + hr = DEVENUM_CreateSpecialCategories(); + if (FAILED(hr)) + return hr; + if (RegOpenKeyW(hbasekey, wszRegKey, &hkey) != ERROR_SUCCESS) + { + ERR("Couldn't open registry key for special device: %s\n", + debugstr_guid(clsidDeviceClass)); + return S_FALSE; + } + } + else if (RegOpenKeyW(hbasekey, wszRegKey, &hkey) != ERROR_SUCCESS) + { + FIXME("Category %s not found\n", debugstr_guid(clsidDeviceClass)); + return S_FALSE; } return DEVENUM_IEnumMoniker_Construct(hkey, ppEnumMoniker); @@ -556,6 +553,12 @@ static HRESULT DEVENUM_CreateAMCategoryKey(const CLSID * clsidCategory) return res; } +static HANDLE DEVENUM_populate_handle; +static const WCHAR DEVENUM_populate_handle_nameW[] = + {'_','_','W','I','N','E','_', + 'D','e','v','e','n','u','m','_', + 'P','o','p','u','l','a','t','e',0}; + /********************************************************************** * DEVENUM_CreateSpecialCategories (INTERNAL) * @@ -571,6 +574,35 @@ static HRESULT DEVENUM_CreateSpecialCategories(void) IFilterMapper2 * pMapper = NULL; REGFILTER2 rf2; REGFILTERPINS2 rfp2; + WCHAR path[MAX_PATH]; + HKEY basekey; + + if (DEVENUM_populate_handle) + return S_OK; + DEVENUM_populate_handle = CreateEventW(NULL, TRUE, FALSE, DEVENUM_populate_handle_nameW); + if (GetLastError() == ERROR_ALREADY_EXISTS) + { + /* Webcams can take some time to scan if the driver is badly written and it enables them, + * so have a 10 s timeout here + */ + if (WaitForSingleObject(DEVENUM_populate_handle, 10000) == WAIT_TIMEOUT) + WARN("Waiting for object timed out\n"); + TRACE("No need to rescan\n"); + return S_OK; + } + TRACE("Scanning for devices\n"); + + /* Since devices can change between session, for example because you just plugged in a webcam + * or switched from pulseaudio to alsa, delete all old devices first + */ + if (SUCCEEDED(DEVENUM_GetCategoryKey(&CLSID_AudioRendererCategory, &basekey, path, MAX_PATH))) + RegDeleteTreeW(basekey, path); + if (SUCCEEDED(DEVENUM_GetCategoryKey(&CLSID_AudioInputDeviceCategory, &basekey, path, MAX_PATH))) + RegDeleteTreeW(basekey, path); + if (SUCCEEDED(DEVENUM_GetCategoryKey(&CLSID_VideoInputDeviceCategory, &basekey, path, MAX_PATH))) + RegDeleteTreeW(basekey, path); + if (SUCCEEDED(DEVENUM_GetCategoryKey(&CLSID_MidiRendererCategory, &basekey, path, MAX_PATH))) + RegDeleteTreeW(basekey, path); rf2.dwVersion = 2; rf2.dwMerit = MERIT_PREFERRED; @@ -814,5 +846,6 @@ static HRESULT DEVENUM_CreateSpecialCategories(void) if (pMapper) IFilterMapper2_Release(pMapper); + SetEvent(DEVENUM_populate_handle); return res; }

1 0

Maarten Lankhorst : powrprof: Add stubs for PowerGetActiveScheme and PowerReadDCValue.
by Alexandre Julliard 01 Feb '10

01 Feb '10

Module: wine Branch: master Commit: 89d458a128a03962f5e9c36923216ce05febaad2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89d458a128a03962f5e9c3692… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sun Jan 31 20:29:48 2010 +0100 powrprof: Add stubs for PowerGetActiveScheme and PowerReadDCValue. --- dlls/powrprof/powrprof.c | 12 ++++++++++++ dlls/powrprof/powrprof.spec | 2 ++ 2 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/powrprof/powrprof.c b/dlls/powrprof/powrprof.c index 507b380..a589728 100644 --- a/dlls/powrprof/powrprof.c +++ b/dlls/powrprof/powrprof.c @@ -297,6 +297,18 @@ BOOLEAN WINAPI WritePwrScheme(PUINT puiID, LPWSTR lpszName, LPWSTR lpszDescripti return FALSE; } +DWORD WINAPI PowerGetActiveScheme(HKEY UserRootPowerKey, GUID **polguid) +{ + FIXME("(%p,%p) stub!\n", UserRootPowerKey, polguid); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +DWORD WINAPI PowerReadDCValue(HKEY RootPowerKey, const GUID *Scheme, const GUID *SubGroup, const GUID *PowerSettings, PULONG Type, PUCHAR Buffer, DWORD *BufferSize) +{ + FIXME("(%p,%s,%s,%s,%p,%p,%p) stub!\n", RootPowerKey, debugstr_guid(Scheme), debugstr_guid(SubGroup), debugstr_guid(PowerSettings), Type, Buffer, BufferSize); + return ERROR_CALL_NOT_IMPLEMENTED; +} + BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { switch(fdwReason) { diff --git a/dlls/powrprof/powrprof.spec b/dlls/powrprof/powrprof.spec index b2c6402..cb1d487 100644 --- a/dlls/powrprof/powrprof.spec +++ b/dlls/powrprof/powrprof.spec @@ -10,6 +10,8 @@ @ stdcall IsPwrHibernateAllowed () @ stdcall IsPwrShutdownAllowed () @ stdcall IsPwrSuspendAllowed () +@ stdcall PowerGetActiveScheme (ptr ptr) +@ stdcall PowerReadDCValue (ptr ptr ptr ptr ptr ptr ptr) @ stdcall ReadGlobalPwrPolicy (ptr) @ stdcall ReadProcessorPwrScheme (long ptr) @ stdcall ReadPwrScheme (long ptr)

1 0

Maarten Lankhorst : advapi32: Fix RegGetValue on REG_BINARY data.
by Alexandre Julliard 01 Feb '10

01 Feb '10

Module: wine Branch: master Commit: 96ca7087064d6ee917b7ad83938cb42682e5158d URL: http://source.winehq.org/git/wine.git/?a=commit;h=96ca7087064d6ee917b7ad839… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Feb 1 11:09:26 2010 +0100 advapi32: Fix RegGetValue on REG_BINARY data. --- dlls/advapi32/registry.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 28eabe3..84320d1 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -1432,9 +1432,9 @@ static VOID ADVAPI_ApplyRestrictions( DWORD dwFlags, DWORD dwType, { DWORD cbExpect = 0; - if ((dwFlags & RRF_RT_DWORD) == RRF_RT_DWORD) + if ((dwFlags & RRF_RT_ANY) == RRF_RT_DWORD) cbExpect = 4; - else if ((dwFlags & RRF_RT_QWORD) == RRF_RT_QWORD) + else if ((dwFlags & RRF_RT_ANY) == RRF_RT_QWORD) cbExpect = 8; if (cbExpect && cbData != cbExpect)

1 0

Jörg Höhle : winmm: The MIDI MAPPER is not available with MIDI IN.
by Alexandre Julliard 01 Feb '10

01 Feb '10

Module: wine Branch: master Commit: ebd55d989009d956ed84dda5d7426d815d1e0059 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebd55d989009d956ed84dda5d… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Fri Jan 29 22:17:58 2010 +0100 winmm: The MIDI MAPPER is not available with MIDI IN. --- dlls/winmm/lolvldrv.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winmm/lolvldrv.c b/dlls/winmm/lolvldrv.c index 1c5e06b..74b9f9d 100644 --- a/dlls/winmm/lolvldrv.c +++ b/dlls/winmm/lolvldrv.c @@ -59,7 +59,7 @@ static LPWINE_MLD MM_MLDrvs[40]; static WINE_LLTYPE llTypes[MMDRV_MAX] = { A(TRUE, Aux), A(FALSE, Mixer), - A(TRUE, MidiIn), + A(FALSE, MidiIn), A(TRUE, MidiOut), A(TRUE, WaveIn), A(TRUE, WaveOut),

1 0

Maarten Lankhorst : includes: Add amaudio.h.
by Alexandre Julliard 01 Feb '10

01 Feb '10

Module: wine Branch: master Commit: fccdb30db39f674d8c427bac190728a2ea7ee77e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fccdb30db39f674d8c427bac1… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sun Jan 31 20:26:22 2010 +0100 includes: Add amaudio.h. --- include/Makefile.in | 1 + include/amaudio.h | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index b7de752..1ce4a04 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -112,6 +112,7 @@ SRCDIR_INCLUDES = \ adshlp.h \ advpub.h \ af_irda.h \ + amaudio.h \ appmgmt.h \ asynot.idl \ asysta.idl \ diff --git a/include/amaudio.h b/include/amaudio.h new file mode 100644 index 0000000..21892c6 --- /dev/null +++ b/include/amaudio.h @@ -0,0 +1,46 @@ +/* + * Copyright (C) 2010 Maarten Lankhorst for Codeweavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __AMAUDIO__ +#define __AMAUDIO__ + +#include <mmsystem.h> +#include <dsound.h> + +#undef INTERFACE +#define INTERFACE IAMDirectSound + +DECLARE_INTERFACE_(IAMDirectSound,IUnknown) +{ + /*** IUnknown methods ***/ + STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; + + /*** IAMDirectSound methods ***/ + STDMETHOD(GetDirectSoundInterface)(THIS_ IDirectSound **ds) PURE; + STDMETHOD(GetPrimaryBufferInterface(THIS_ IDirectSoundBuffer **buf) PURE; + STDMETHOD(GetSecondaryBufferInterface)(THIS_ IDirectSoundBuffer **buf) PURE; + STDMETHOD(ReleaseDirectSoundInterface(THIS_ IDirectSound *ds) PURE; + STDMETHOD(ReleasePrimaryBufferInterface(THIS_ IDirectSoundBuffer *buf) PURE; + STDMETHOD(ReleaseSecondaryBufferInterface(THIS_ IDirectSoundBuffer *buf) PURE; + STDMETHOD(SetFocusWindow)(THIS_ HWND hwnd, BOOL bgsilent) PURE; + STDMETHOD(GetFocusWindow)(THIS_ HWND hwnd) PURE; +}; + +#endif

1 0

Maarten Lankhorst : mmdevapi: Add some basic property store tests.
by Alexandre Julliard 01 Feb '10

01 Feb '10

Module: wine Branch: master Commit: 965e2ebba65ea8f43714229617dde7f5cf968f63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=965e2ebba65ea8f4371422961… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sun Jan 17 14:10:32 2010 +0100 mmdevapi: Add some basic property store tests. --- dlls/mmdevapi/tests/Makefile.in | 3 +- dlls/mmdevapi/tests/propstore.c | 102 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 104 insertions(+), 1 deletions(-) diff --git a/dlls/mmdevapi/tests/Makefile.in b/dlls/mmdevapi/tests/Makefile.in index ef58c63..998478e 100644 --- a/dlls/mmdevapi/tests/Makefile.in +++ b/dlls/mmdevapi/tests/Makefile.in @@ -7,7 +7,8 @@ IMPORTS = ole32 version user32 kernel32 CTESTS = \ dependency.c \ - mmdevenum.c + mmdevenum.c \ + propstore.c @MAKE_TEST_RULES@ diff --git a/dlls/mmdevapi/tests/propstore.c b/dlls/mmdevapi/tests/propstore.c new file mode 100644 index 0000000..3712622 --- /dev/null +++ b/dlls/mmdevapi/tests/propstore.c @@ -0,0 +1,102 @@ +/* + * Copyright 2010 Maarten Lankhorst for Codeweavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define NONAMELESSUNION +#include "wine/test.h" + +#define CINTERFACE +#define COBJMACROS + +#ifdef STANDALONE +#include "initguid.h" +#endif + +#include "unknwn.h" +#include "uuids.h" +#include "mmdeviceapi.h" + +static void test_propertystore(IPropertyStore *store) +{ + HRESULT hr; + PROPVARIANT pv = { 0 }; + char temp[40]; + + hr = IPropertyStore_GetValue(store, &PKEY_AudioEndpoint_GUID, &pv); + ok(hr == S_OK, "Failed with %08x\n", hr); + if (hr == S_OK) + { + WideCharToMultiByte(CP_ACP, 0, pv.u.pwszVal, -1, temp, sizeof(temp)-1, NULL, NULL); + temp[sizeof(temp)-1] = 0; + trace("guid: %s\n", temp); + CoTaskMemFree(pv.u.pwszVal); + } +} + +START_TEST(propstore) +{ + HRESULT hr; + IMMDeviceEnumerator *mme = NULL; + IMMDevice *dev = NULL; + IPropertyStore *store; + + CoInitializeEx(NULL, COINIT_MULTITHREADED); + hr = CoCreateInstance(&CLSID_MMDeviceEnumerator, NULL, CLSCTX_INPROC_SERVER, &IID_IMMDeviceEnumerator, (void**)&mme); + if (FAILED(hr)) + { + skip("mmdevapi not available: 0x%08x\n", hr); + goto cleanup; + } + + hr = IMMDeviceEnumerator_GetDefaultAudioEndpoint(mme, eRender, eMultimedia, &dev); + ok(hr == S_OK || hr == E_NOTFOUND, "GetDefaultAudioEndpoint failed: 0x%08x\n", hr); + if (hr != S_OK) + { + if (hr == E_NOTFOUND) + skip("No sound card available\n"); + else + skip("GetDefaultAudioEndpoint returns 0x%08x\n", hr); + goto cleanup; + } + store = NULL; + hr = IMMDevice_OpenPropertyStore(dev, 3, &store); + todo_wine ok(hr == E_INVALIDARG, "Wrong hr returned: %08x\n", hr); + if (hr != S_OK) + /* It seems on windows returning with E_INVALIDARG doesn't + * set store to NULL, so just don't set store to non-null + * before calling this function + */ + ok(!store, "Store set to non-NULL on failure: %p/%08x\n", store, hr); + else if (store) + IPropertyStore_Release(store); + hr = IMMDevice_OpenPropertyStore(dev, STGM_READ, NULL); + todo_wine ok(hr == E_POINTER, "Wrong hr returned: %08x\n", hr); + + store = NULL; + hr = IMMDevice_OpenPropertyStore(dev, STGM_READ, &store); + todo_wine ok(hr == S_OK, "Opening valid store returned %08x\n", hr); + if (store) + { + test_propertystore(store); + IPropertyStore_Release(store); + } + IMMDevice_Release(dev); +cleanup: + if (mme) + IUnknown_Release(mme); + CoUninitialize(); +}

1 0

Maarten Lankhorst : quartz: Add some tests for dsound renderer.
by Alexandre Julliard 01 Feb '10

01 Feb '10

Module: wine Branch: master Commit: 201c9a14bfb5e1cdfdca15a1a2c11a28cf48f91a URL: http://source.winehq.org/git/wine.git/?a=commit;h=201c9a14bfb5e1cdfdca15a1a… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sat Jan 30 10:41:08 2010 +0100 quartz: Add some tests for dsound renderer. --- dlls/quartz/tests/Makefile.in | 1 + dlls/quartz/tests/dsoundrender.c | 230 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 231 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/tests/Makefile.in b/dlls/quartz/tests/Makefile.in index d21f281..b98efaa 100644 --- a/dlls/quartz/tests/Makefile.in +++ b/dlls/quartz/tests/Makefile.in @@ -7,6 +7,7 @@ IMPORTS = oleaut32 ole32 advapi32 kernel32 CTESTS = \ avisplitter.c \ + dsoundrender.c \ filtergraph.c \ filtermapper.c \ memallocator.c \ diff --git a/dlls/quartz/tests/dsoundrender.c b/dlls/quartz/tests/dsoundrender.c new file mode 100644 index 0000000..2d33dc2 --- /dev/null +++ b/dlls/quartz/tests/dsoundrender.c @@ -0,0 +1,230 @@ +/* + * Unit tests for DSound Renderer functions + * + * Copyright (C) 2010 Maarten Lankhorst for Codeweavers + * Copyright (C) 2007 Google (Lei Zhang) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define NONAMELESSUNION +#define COBJMACROS + +#include "wine/test.h" +#include "dshow.h" +#include "initguid.h" +#include "dsound.h" + +#define QI_SUCCEED(iface, riid, ppv) hr = IUnknown_QueryInterface(iface, &riid, (LPVOID*)&ppv); \ + ok(hr == S_OK, "IUnknown_QueryInterface returned %x\n", hr); \ + ok(ppv != NULL, "Pointer is NULL\n"); + +#define RELEASE_EXPECT(iface, num) if (iface) { \ + hr = IUnknown_Release(iface); \ + ok(hr == num, "IUnknown_Release should return %d, got %d\n", num, hr); \ +} + +static IUnknown *pDSRender = NULL; + +static int create_dsound_renderer(void) +{ + HRESULT hr; + + hr = CoCreateInstance(&CLSID_DSoundRender, NULL, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (LPVOID*)&pDSRender); + return (hr == S_OK && pDSRender != NULL); +} + +static void release_dsound_renderer(void) +{ + HRESULT hr; + + hr = IUnknown_Release(pDSRender); + ok(hr == 0, "IUnknown_Release failed with %x\n", hr); +} + +static HRESULT WINAPI PB_QueryInterface(IPropertyBag *iface, REFIID riid, void **ppv) +{ + ok(0, "Should not be called\n"); + *ppv = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI PB_AddRef(IPropertyBag *iface) +{ + ok(0, "Should not be called\n"); + return 2; +} + +static ULONG WINAPI PB_Release(IPropertyBag *iface) +{ + ok(0, "Should not be called\n"); + return 1; +} + +static HRESULT WINAPI PB_Read(IPropertyBag *iface, LPCOLESTR name, VARIANT *var, IErrorLog *log) +{ + static const WCHAR dsguid[] = { 'D','S','G','u','i','d', 0 }; + char temp[50]; + WideCharToMultiByte(CP_ACP, 0, name, -1, temp, sizeof(temp)-1, NULL, NULL); + temp[sizeof(temp)-1] = 0; + trace("Trying to read %s, type %u\n", temp, var->n1.n2.vt); + if (!lstrcmpW(name, dsguid)) + { + static const WCHAR defaultplayback[] = + { + '{','D','E','F','0','0','0','0','0','-', + '9','C','6','D','-','4','7','E','D','-', + 'A','A','F','1','-','4','D','D','A','8', + 'F','2','B','5','C','0','3','}',0 + }; + ok(var->n1.n2.vt == VT_BSTR, "Wrong type asked: %u\n", var->n1.n2.vt); + var->n1.n2.n3.bstrVal = SysAllocString(defaultplayback); + return S_OK; + } + ok(0, "Unknown property '%s' queried\n", temp); + return E_FAIL; +} + +static HRESULT WINAPI PB_Write(IPropertyBag *iface, LPCOLESTR name, VARIANT *var) +{ + ok(0, "Should not be called\n"); + return E_FAIL; +} + +static IPropertyBagVtbl PB_Vtbl = +{ + PB_QueryInterface, + PB_AddRef, + PB_Release, + PB_Read, + PB_Write +}; + +static void test_query_interface(void) +{ + HRESULT hr; + IBaseFilter *pBaseFilter = NULL; + IBasicAudio *pBasicAudio = NULL; + IMediaPosition *pMediaPosition = NULL; + IMediaSeeking *pMediaSeeking = NULL; + IQualityControl *pQualityControl = NULL; + IPersistPropertyBag *ppb = NULL; + IDirectSound3DBuffer *ds3dbuf = NULL; + IReferenceClock *clock = NULL; + + QI_SUCCEED(pDSRender, IID_IBaseFilter, pBaseFilter); + RELEASE_EXPECT(pBaseFilter, 1); + QI_SUCCEED(pDSRender, IID_IBasicAudio, pBasicAudio); + RELEASE_EXPECT(pBasicAudio, 1); + QI_SUCCEED(pDSRender, IID_IMediaSeeking, pMediaSeeking); + RELEASE_EXPECT(pMediaSeeking, 1); + QI_SUCCEED(pDSRender, IID_IReferenceClock, clock); + RELEASE_EXPECT(clock, 1); + todo_wine { + QI_SUCCEED(pDSRender, IID_IDirectSound3DBuffer, ds3dbuf); + RELEASE_EXPECT(ds3dbuf, 1); + QI_SUCCEED(pDSRender, IID_IPersistPropertyBag, ppb); + if (ppb) + { + IPropertyBag bag = { &PB_Vtbl }; + hr = IPersistPropertyBag_Load(ppb, &bag, NULL); + ok(hr == S_OK, "Couldn't load default device: %08x\n", hr); + } + RELEASE_EXPECT(ppb, 1); + QI_SUCCEED(pDSRender, IID_IMediaPosition, pMediaPosition); + RELEASE_EXPECT(pMediaPosition, 1); + QI_SUCCEED(pDSRender, IID_IQualityControl, pQualityControl); + RELEASE_EXPECT(pQualityControl, 1); + } +} + +static void test_pin(IPin *pin) +{ + IMemInputPin *mpin = NULL; + + IPin_QueryInterface(pin, &IID_IMemInputPin, (void **)&mpin); + + ok(mpin != NULL, "No IMemInputPin found!\n"); + if (mpin) + { + ok(IMemInputPin_ReceiveCanBlock(mpin) == S_OK, "Receive can't block for pin!\n"); + ok(IMemInputPin_NotifyAllocator(mpin, NULL, 0) == E_POINTER, "NotifyAllocator likes a NULL pointer argument\n"); + IMemInputPin_Release(mpin); + } + /* TODO */ +} + +static void test_basefilter(void) +{ + IEnumPins *pin_enum = NULL; + IBaseFilter *base = NULL; + IPin *pins[2]; + ULONG ref; + HRESULT hr; + + IUnknown_QueryInterface(pDSRender, &IID_IBaseFilter, (void *)&base); + if (base == NULL) + { + /* test_query_interface handles this case */ + skip("No IBaseFilter\n"); + return; + } + + hr = IBaseFilter_EnumPins(base, NULL); + ok(hr == E_POINTER, "hr = %08x and not E_POINTER\n", hr); + + hr= IBaseFilter_EnumPins(base, &pin_enum); + ok(hr == S_OK, "hr = %08x and not S_OK\n", hr); + + hr = IEnumPins_Next(pin_enum, 1, NULL, NULL); + ok(hr == E_POINTER, "hr = %08x and not E_POINTER\n", hr); + + hr = IEnumPins_Next(pin_enum, 2, pins, NULL); + ok(hr == E_INVALIDARG, "hr = %08x and not E_INVALIDARG\n", hr); + + pins[0] = (void *)0xdead; + pins[1] = (void *)0xdeed; + + hr = IEnumPins_Next(pin_enum, 2, pins, &ref); + ok(hr == S_FALSE, "hr = %08x instead of S_FALSE\n", hr); + ok(pins[0] != (void *)0xdead && pins[0] != NULL, "pins[0] = %p\n", pins[0]); + if (pins[0] != (void *)0xdead && pins[0] != NULL) + { + test_pin(pins[0]); + IPin_Release(pins[0]); + } + + ok(pins[1] == (void *)0xdeed, "pins[1] = %p\n", pins[1]); + + ref = IEnumPins_Release(pin_enum); + ok(ref == 0, "ref is %u and not 0!\n", ref); + + IBaseFilter_Release(base); +} + +START_TEST(dsoundrender) +{ + CoInitialize(NULL); + if (!create_dsound_renderer()) + return; + + test_query_interface(); + test_basefilter(); + + release_dsound_renderer(); + + CoUninitialize(); +}

1 0

Alexandre Julliard : kernel32: Avoid truncating the output buffer length in GetCurrentDirectoryA.
by Alexandre Julliard 01 Feb '10

01 Feb '10

Module: wine Branch: master Commit: 5f9f260e426cc7de9a7548b38c9a006e1338e6fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f9f260e426cc7de9a7548b38… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 1 13:22:41 2010 +0100 kernel32: Avoid truncating the output buffer length in GetCurrentDirectoryA. --- dlls/kernel32/path.c | 2 +- dlls/kernel32/tests/path.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index a304cb2..0a02681 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -76,7 +76,7 @@ static DWORD copy_filename_WtoA( LPCWSTR nameW, LPSTR buffer, DWORD len ) ANSI_STRING str; str.Buffer = buffer; - str.MaximumLength = len; + str.MaximumLength = min( len, UNICODE_STRING_MAX_CHARS ); if (is_ansi) RtlUnicodeStringToAnsiString( &str, &strW, FALSE ); else diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 4c0aac5..e533bd0 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -423,6 +423,7 @@ static void test_InitPathA(CHAR *newdir, CHAR *curDrive, CHAR *otherDrive) static void test_CurrentDirectoryA(CHAR *origdir, CHAR *newdir) { CHAR tmpstr[MAX_PATH],tmpstr1[MAX_PATH]; + char *buffer; DWORD len,len1; /* Save the original directory, so that we can return to it at the end of the test @@ -437,6 +438,35 @@ static void test_CurrentDirectoryA(CHAR *origdir, CHAR *newdir) ok(len1==len+1, "GetCurrentDirectoryA returned %d instead of %d\n",len1,len+1); ok(lstrcmpiA(tmpstr,"aaaaaaa")==0, "GetCurrentDirectoryA should not have modified the buffer\n"); + + buffer = HeapAlloc( GetProcessHeap(), 0, 2 * 65536 ); + SetLastError( 0xdeadbeef ); + strcpy( buffer, "foo" ); + len = GetCurrentDirectoryA( 32767, buffer ); + ok( len != 0 && len < MAX_PATH, "GetCurrentDirectoryA failed %u err %u\n", len, GetLastError() ); + if (len) ok( !strcmp( buffer, origdir ), "wrong result %s\n", buffer ); + SetLastError( 0xdeadbeef ); + strcpy( buffer, "foo" ); + len = GetCurrentDirectoryA( 32768, buffer ); + ok( len != 0 && len < MAX_PATH, "GetCurrentDirectoryA failed %u err %u\n", len, GetLastError() ); + if (len) ok( !strcmp( buffer, origdir ), "wrong result %s\n", buffer ); + SetLastError( 0xdeadbeef ); + strcpy( buffer, "foo" ); + len = GetCurrentDirectoryA( 65535, buffer ); + ok( (len != 0 && len < MAX_PATH) || broken(!len), /* nt4, win2k, xp */ "GetCurrentDirectoryA failed %u err %u\n", len, GetLastError() ); + if (len) ok( !strcmp( buffer, origdir ), "wrong result %s\n", buffer ); + SetLastError( 0xdeadbeef ); + strcpy( buffer, "foo" ); + len = GetCurrentDirectoryA( 65536, buffer ); + ok( (len != 0 && len < MAX_PATH) || broken(!len), /* nt4 */ "GetCurrentDirectoryA failed %u err %u\n", len, GetLastError() ); + if (len) ok( !strcmp( buffer, origdir ), "wrong result %s\n", buffer ); + SetLastError( 0xdeadbeef ); + strcpy( buffer, "foo" ); + len = GetCurrentDirectoryA( 2 * 65536, buffer ); + ok( (len != 0 && len < MAX_PATH) || broken(!len), /* nt4 */ "GetCurrentDirectoryA failed %u err %u\n", len, GetLastError() ); + if (len) ok( !strcmp( buffer, origdir ), "wrong result %s\n", buffer ); + HeapFree( GetProcessHeap(), 0, buffer ); + /* SetCurrentDirectoryA shouldn't care whether the string has a trailing '\\' or not */

1 0