wine-commits January 2012

wine-commits@winehq.org

2 participants
972 discussions

Alexandre Julliard : mountmgr: Create a symlink in DosDevices for cdroms.
by Alexandre Julliard 17 Jan '12

17 Jan '12

Module: wine Branch: master Commit: a6b6c0ebe58a425fe0e81b6780debf425f032cc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6b6c0ebe58a425fe0e81b678… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 17 11:41:15 2012 +0100 mountmgr: Create a symlink in DosDevices for cdroms. --- dlls/mountmgr.sys/device.c | 34 ++++++++++++++++++++-------------- 1 files changed, 20 insertions(+), 14 deletions(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index c6ba0b9..8367cba 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -195,11 +195,13 @@ static NTSTATUS create_disk_device( enum device_type type, struct disk_device ** static const WCHAR cdromW[] = {'\\','D','e','v','i','c','e','\\','C','d','R','o','m','%','u',0}; static const WCHAR floppyW[] = {'\\','D','e','v','i','c','e','\\','F','l','o','p','p','y','%','u',0}; static const WCHAR ramdiskW[] = {'\\','D','e','v','i','c','e','\\','R','a','m','d','i','s','k','%','u',0}; + static const WCHAR cdromlinkW[] = {'\\','?','?','\\','C','d','R','o','m','%','u',0}; static const WCHAR physdriveW[] = {'\\','?','?','\\','P','h','y','s','i','c','a','l','D','r','i','v','e','%','u',0}; UINT i, first = 0; NTSTATUS status = 0; const WCHAR *format = NULL; + const WCHAR *link_format = NULL; UNICODE_STRING name; DEVICE_OBJECT *dev_obj; struct disk_device *device; @@ -210,6 +212,7 @@ static NTSTATUS create_disk_device( enum device_type type, struct disk_device ** case DEVICE_HARDDISK: case DEVICE_NETWORK: /* FIXME */ format = harddiskW; + link_format = physdriveW; break; case DEVICE_HARDDISK_VOL: format = harddiskvolW; @@ -221,6 +224,7 @@ static NTSTATUS create_disk_device( enum device_type type, struct disk_device ** case DEVICE_CDROM: case DEVICE_DVD: format = cdromW; + link_format = cdromlinkW; break; case DEVICE_RAMDISK: format = ramdiskW; @@ -246,6 +250,19 @@ static NTSTATUS create_disk_device( enum device_type type, struct disk_device ** device->unix_mount = NULL; device->symlink.Buffer = NULL; + if (link_format) + { + UNICODE_STRING symlink; + + symlink.MaximumLength = (strlenW(link_format) + 10) * sizeof(WCHAR); + if ((symlink.Buffer = RtlAllocateHeap( GetProcessHeap(), 0, symlink.MaximumLength))) + { + sprintfW( symlink.Buffer, link_format, i ); + symlink.Length = strlenW(symlink.Buffer) * sizeof(WCHAR); + if (!IoCreateSymbolicLink( &symlink, &name )) device->symlink = symlink; + } + } + switch (type) { case DEVICE_FLOPPY: @@ -267,20 +284,9 @@ static NTSTATUS create_disk_device( enum device_type type, struct disk_device ** case DEVICE_UNKNOWN: case DEVICE_HARDDISK: case DEVICE_NETWORK: /* FIXME */ - { - UNICODE_STRING symlink; - - symlink.MaximumLength = sizeof(physdriveW) + 10 * sizeof(WCHAR); - if ((symlink.Buffer = RtlAllocateHeap( GetProcessHeap(), 0, symlink.MaximumLength))) - { - sprintfW( symlink.Buffer, physdriveW, i ); - symlink.Length = strlenW(symlink.Buffer) * sizeof(WCHAR); - if (!IoCreateSymbolicLink( &symlink, &name )) device->symlink = symlink; - } - device->devnum.DeviceType = FILE_DEVICE_DISK; - device->devnum.DeviceNumber = i; - device->devnum.PartitionNumber = 0; - } + device->devnum.DeviceType = FILE_DEVICE_DISK; + device->devnum.DeviceNumber = i; + device->devnum.PartitionNumber = 0; break; case DEVICE_HARDDISK_VOL: device->devnum.DeviceType = FILE_DEVICE_DISK;

1 0

Alexandre Julliard : include: Fix some typos in winioctl.h.
by Alexandre Julliard 17 Jan '12

17 Jan '12

Module: wine Branch: master Commit: 5e5cbcc841c83cc5e500b7c11d09a5bf512eb448 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e5cbcc841c83cc5e500b7c11… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 17 11:39:45 2012 +0100 include: Fix some typos in winioctl.h. --- include/winioctl.h | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/winioctl.h b/include/winioctl.h index 36d6e24..fb78821 100644 --- a/include/winioctl.h +++ b/include/winioctl.h @@ -226,9 +226,9 @@ #define IOCTL_STORAGE_RESET_BUS CTL_CODE(IOCTL_STORAGE_BASE, 0x0400, METHOD_BUFFERED, FILE_READ_ACCESS) #define IOCTL_STORAGE_RESET_DEVICE CTL_CODE(IOCTL_STORAGE_BASE, 0x0401, METHOD_BUFFERED, FILE_READ_ACCESS) -#define IOCTL_STORAGE_BREAK_RESERCATION CTL_CODE(IOCTL_STORAGE_BASE, 0x0405, METHOD_BUFFERED, FILE_READ_ACCESS); -#define IOCTL_STORAGE_PERSISTENT_RESERVE_IN CTL_CODE(IOCTL_STORAGE_BASE, 0x0406, METHOD_BUFFERED, FILE_READ_ACCESS); -#define IOCTL_STORAGE_PERSISTENT_RESERVE_OUT CTL_CODE(IOCTL_STORAGE_BASE, 0x0407, METHOD_BUFFERED, FILE_READ_ACCESS|FILE_WRITE_ACCESS); +#define IOCTL_STORAGE_BREAK_RESERVATION CTL_CODE(IOCTL_STORAGE_BASE, 0x0405, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_STORAGE_PERSISTENT_RESERVE_IN CTL_CODE(IOCTL_STORAGE_BASE, 0x0406, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_STORAGE_PERSISTENT_RESERVE_OUT CTL_CODE(IOCTL_STORAGE_BASE, 0x0407, METHOD_BUFFERED, FILE_READ_ACCESS|FILE_WRITE_ACCESS) #define IOCTL_STORAGE_GET_DEVICE_NUMBER CTL_CODE(IOCTL_STORAGE_BASE, 0x0420, METHOD_BUFFERED, FILE_ANY_ACCESS)

1 0

Łukasz Wojniłowicz : Polish translation for release 1.3.37
by Jeremy Newman 16 Jan '12

16 Jan '12

Module: website Branch: master Commit: 8de779a9bfaeaa27afa4ef9a64baa98d9dd3d7a7 URL: http://source.winehq.org/git/website.git/?a=commit;h=8de779a9bfaeaa27afa4ef… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sun Jan 15 13:43:43 2012 +0100 Polish translation for release 1.3.37 --- news/pl/2012011301.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/pl/2012011301.xml b/news/pl/2012011301.xml new file mode 100644 index 0000000..322dc8a --- /dev/null +++ b/news/pl/2012011301.xml @@ -0,0 +1,17 @@ +<news> +<date>Styczeń 13, 2012</date> +<title>Wydano Wine 1.3.37</title> +<body> + Wydanie rozwojowe Wine 1.3.37 jest już dostępne. + <a href="{$root}/announce/1.3.37">Co nowego</a> w tym wydaniu: +<ul> + <li>Ukończenie silnika DIB.</li> + <li>Ulepszenia do biblioteki uruchomieniowej C++.</li> + <li>Kilka poprawek w sterownikach dźwiękowych.</li> + <li>Usunięto niepotrzebne opcje Direct3D z WineCfg.</li> + <li>Kilka poprawek we wbudowanym Internet Explorer.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.37.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Andrew Eikum : dsound: Don' t launch a separate thread for the mmdevapi enumerator.
by Alexandre Julliard 16 Jan '12

16 Jan '12

Module: wine Branch: master Commit: 6d391df4aaefaef1e13ff2dd3571f96fdff6405d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d391df4aaefaef1e13ff2dd3… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Jan 16 10:44:38 2012 -0600 dsound: Don't launch a separate thread for the mmdevapi enumerator. --- dlls/dsound/dsound_main.c | 133 +++++++++++++++------------------------------ 1 files changed, 43 insertions(+), 90 deletions(-) diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c index cc9f44c..c0d2b33 100644 --- a/dlls/dsound/dsound_main.c +++ b/dlls/dsound/dsound_main.c @@ -88,17 +88,6 @@ CRITICAL_SECTION DSOUND_capturers_lock = { &DSOUND_capturers_lock_debug, -1, 0, GUID DSOUND_renderer_guids[MAXWAVEDRIVERS]; GUID DSOUND_capture_guids[MAXWAVEDRIVERS]; -static IMMDeviceEnumerator *g_devenum; -static CRITICAL_SECTION g_devenum_lock; -static CRITICAL_SECTION_DEBUG g_devenum_lock_debug = -{ - 0, 0, &g_devenum_lock, - { &g_devenum_lock_debug.ProcessLocksList, &g_devenum_lock_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": g_devenum_lock") } -}; -static CRITICAL_SECTION g_devenum_lock = { &g_devenum_lock_debug, -1, 0, 0, 0, 0 }; -static HANDLE g_devenum_thread; - WCHAR wine_vxd_drv[] = { 'w','i','n','e','m','m','.','v','x','d', 0 }; /* All default settings, you most likely don't want to touch these, see wiki on UsefulRegistryKeys */ @@ -190,83 +179,29 @@ static const char * get_device_id(LPCGUID pGuid) return debugstr_guid(pGuid); } -/* The MMDeviceEnumerator object has to be created & destroyed - * from the same thread. */ -static DWORD WINAPI devenum_thread_proc(void *arg) +static HRESULT get_mmdevenum(IMMDeviceEnumerator **devenum) { - HANDLE evt = arg; - HRESULT hr; - MSG msg; + HRESULT hr, init_hr; - hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); - if(FAILED(hr)){ - ERR("CoInitializeEx failed: %08x\n", hr); - return 1; - } + init_hr = CoInitialize(NULL); hr = CoCreateInstance(&CLSID_MMDeviceEnumerator, NULL, - CLSCTX_INPROC_SERVER, &IID_IMMDeviceEnumerator, (void**)&g_devenum); + CLSCTX_INPROC_SERVER, &IID_IMMDeviceEnumerator, (void**)devenum); if(FAILED(hr)){ - ERR("CoCreateInstance failed: %08x\n", hr); CoUninitialize(); - return 1; - } - - SetEvent(evt); - - PeekMessageW(&msg, NULL, WM_USER, WM_USER, PM_NOREMOVE); - - while(GetMessageW(&msg, NULL, 0, 0)){ - if(msg.hwnd) - DispatchMessageW(&msg); - else - ERR("Unknown message: %04x\n", msg.message); + *devenum = NULL; + ERR("CoCreateInstance failed: %08x\n", hr); + return hr; } - IMMDeviceEnumerator_Release(g_devenum); - g_devenum = NULL; - CoUninitialize(); - - return 0; + return init_hr; } -static IMMDeviceEnumerator *get_mmdevenum(void) +static void release_mmdevenum(IMMDeviceEnumerator *devenum, HRESULT init_hr) { - HANDLE events[2]; - DWORD wait; - - EnterCriticalSection(&g_devenum_lock); - - if(g_devenum){ - LeaveCriticalSection(&g_devenum_lock); - return g_devenum; - } - - events[0] = CreateEventW(NULL, FALSE, FALSE, NULL); - - g_devenum_thread = CreateThread(NULL, 0, devenum_thread_proc, - events[0], 0, NULL); - if(!g_devenum_thread){ - LeaveCriticalSection(&g_devenum_lock); - CloseHandle(events[0]); - return NULL; - } - - events[1] = g_devenum_thread; - wait = WaitForMultipleObjects(2, events, FALSE, INFINITE); - CloseHandle(events[0]); - if(wait != WAIT_OBJECT_0){ - if(wait == 1 + WAIT_OBJECT_0){ - CloseHandle(g_devenum_thread); - g_devenum_thread = NULL; - } - LeaveCriticalSection(&g_devenum_lock); - return NULL; - } - - LeaveCriticalSection(&g_devenum_lock); - - return g_devenum; + IMMDeviceEnumerator_Release(devenum); + if(SUCCEEDED(init_hr)) + CoUninitialize(); } static HRESULT get_mmdevice_guid(IMMDevice *device, IPropertyStore *ps, @@ -326,16 +261,16 @@ HRESULT WINAPI GetDeviceID(LPCGUID pGuidSrc, LPGUID pGuidDest) IMMDeviceEnumerator *devenum; EDataFlow flow = (EDataFlow)-1; ERole role = (ERole)-1; - HRESULT hr; + HRESULT hr, init_hr; TRACE("(%s,%p)\n", get_device_id(pGuidSrc),pGuidDest); if(!pGuidSrc || !pGuidDest) return DSERR_INVALIDPARAM; - devenum = get_mmdevenum(); + init_hr = get_mmdevenum(&devenum); if(!devenum) - return DSERR_GENERIC; + return init_hr; if(IsEqualGUID(&DSDEVID_DefaultPlayback, pGuidSrc)){ role = eMultimedia; @@ -358,15 +293,20 @@ HRESULT WINAPI GetDeviceID(LPCGUID pGuidSrc, LPGUID pGuidDest) flow, role, &device); if(FAILED(hr)){ WARN("GetDefaultAudioEndpoint failed: %08x\n", hr); + release_mmdevenum(devenum, init_hr); return DSERR_NODRIVER; } hr = get_mmdevice_guid(device, NULL, pGuidDest); IMMDevice_Release(device); + release_mmdevenum(devenum, init_hr); + return (hr == S_OK) ? DS_OK : hr; } + release_mmdevenum(devenum, init_hr); + *pGuidDest = *pGuidSrc; return DS_OK; @@ -424,22 +364,24 @@ HRESULT get_mmdevice(EDataFlow flow, const GUID *tgt, IMMDevice **device) IMMDeviceEnumerator *devenum; IMMDeviceCollection *coll; UINT count, i; - HRESULT hr; + HRESULT hr, init_hr; - devenum = get_mmdevenum(); + init_hr = get_mmdevenum(&devenum); if(!devenum) - return DSERR_GENERIC; + return init_hr; hr = IMMDeviceEnumerator_EnumAudioEndpoints(devenum, flow, DEVICE_STATE_ACTIVE, &coll); if(FAILED(hr)){ WARN("EnumAudioEndpoints failed: %08x\n", hr); + release_mmdevenum(devenum, init_hr); return hr; } hr = IMMDeviceCollection_GetCount(coll, &count); if(FAILED(hr)){ IMMDeviceCollection_Release(coll); + release_mmdevenum(devenum, init_hr); WARN("GetCount failed: %08x\n", hr); return hr; } @@ -457,14 +399,20 @@ HRESULT get_mmdevice(EDataFlow flow, const GUID *tgt, IMMDevice **device) continue; } - if(IsEqualGUID(&guid, tgt)) + if(IsEqualGUID(&guid, tgt)){ + IMMDeviceCollection_Release(coll); + release_mmdevenum(devenum, init_hr); return DS_OK; + } IMMDevice_Release(*device); } WARN("No device with GUID %s found!\n", wine_dbgstr_guid(tgt)); + IMMDeviceCollection_Release(coll); + release_mmdevenum(devenum, init_hr); + return DSERR_INVALIDPARAM; } @@ -519,19 +467,20 @@ HRESULT enumerate_mmdevices(EDataFlow flow, GUID *guids, IMMDevice *defdev = NULL; UINT count, i, n; BOOL keep_going; - HRESULT hr; + HRESULT hr, init_hr; static const WCHAR primary_desc[] = {'P','r','i','m','a','r','y',' ', 'S','o','u','n','d',' ','D','r','i','v','e','r',0}; static const WCHAR empty_drv[] = {0}; - devenum = get_mmdevenum(); + init_hr = get_mmdevenum(&devenum); if(!devenum) - return DS_OK; + return init_hr; - hr = IMMDeviceEnumerator_EnumAudioEndpoints(g_devenum, flow, + hr = IMMDeviceEnumerator_EnumAudioEndpoints(devenum, flow, DEVICE_STATE_ACTIVE, &coll); if(FAILED(hr)){ + release_mmdevenum(devenum, init_hr); WARN("EnumAudioEndpoints failed: %08x\n", hr); return DS_OK; } @@ -539,12 +488,15 @@ HRESULT enumerate_mmdevices(EDataFlow flow, GUID *guids, hr = IMMDeviceCollection_GetCount(coll, &count); if(FAILED(hr)){ IMMDeviceCollection_Release(coll); + release_mmdevenum(devenum, init_hr); WARN("GetCount failed: %08x\n", hr); return DS_OK; } - if(count == 0) + if(count == 0){ + release_mmdevenum(devenum, init_hr); return DS_OK; + } TRACE("Calling back with NULL (%s)\n", wine_dbgstr_w(primary_desc)); keep_going = cb(NULL, primary_desc, empty_drv, user); @@ -583,6 +535,8 @@ HRESULT enumerate_mmdevices(EDataFlow flow, GUID *guids, IMMDevice_Release(defdev); IMMDeviceCollection_Release(coll); + release_mmdevenum(devenum, init_hr); + return (keep_going == TRUE) ? S_OK : S_FALSE; } @@ -862,7 +816,6 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpvReserved) TRACE("DLL_PROCESS_DETACH\n"); DeleteCriticalSection(&DSOUND_renderers_lock); DeleteCriticalSection(&DSOUND_capturers_lock); - DeleteCriticalSection(&g_devenum_lock); break; default: TRACE("UNKNOWN REASON\n");

1 0

Andrew Eikum : winmm: Only start the devices thread when necessary.
by Alexandre Julliard 16 Jan '12

16 Jan '12

Module: wine Branch: master Commit: 04ab858fefdd64380594c545f288df805c2d58ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=04ab858fefdd64380594c545f… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Jan 16 10:44:02 2012 -0600 winmm: Only start the devices thread when necessary. --- dlls/winmm/lolvldrv.c | 2 +- dlls/winmm/waveform.c | 94 ++++++++++++++++++++++++++++++++++-------------- 2 files changed, 67 insertions(+), 29 deletions(-) diff --git a/dlls/winmm/lolvldrv.c b/dlls/winmm/lolvldrv.c index b8f1b54..9ee0235 100644 --- a/dlls/winmm/lolvldrv.c +++ b/dlls/winmm/lolvldrv.c @@ -531,7 +531,7 @@ static void MMDRV_Init(void) TRACE("()\n"); - init_hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + init_hr = CoInitialize(NULL); hr = CoCreateInstance(&CLSID_MMDeviceEnumerator, NULL, CLSCTX_INPROC_SERVER, &IID_IMMDeviceEnumerator, (void**)&devenum); diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 383c75f..59fc0a2 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -464,12 +464,12 @@ static HRESULT WINMM_InitMMDevice(EDataFlow flow, IMMDevice *device, } static HRESULT WINMM_EnumDevices(WINMM_MMDevice **devices, UINT *devcount, - EDataFlow flow) + EDataFlow flow, IMMDeviceEnumerator *devenum) { IMMDeviceCollection *devcoll; HRESULT hr; - hr = IMMDeviceEnumerator_EnumAudioEndpoints(g_devenum, flow, + hr = IMMDeviceEnumerator_EnumAudioEndpoints(devenum, flow, DEVICE_STATE_ACTIVE, &devcoll); if(FAILED(hr)) return hr; @@ -494,7 +494,7 @@ static HRESULT WINMM_EnumDevices(WINMM_MMDevice **devices, UINT *devcount, count = 0; /* make sure that device 0 is the default device */ - hr = IMMDeviceEnumerator_GetDefaultAudioEndpoint(g_devenum, + hr = IMMDeviceEnumerator_GetDefaultAudioEndpoint(devenum, flow, eConsole, &def_dev); if(SUCCEEDED(hr)){ WINMM_InitMMDevice(flow, def_dev, &(*devices)[0], 0); @@ -528,27 +528,39 @@ static HRESULT WINMM_EnumDevices(WINMM_MMDevice **devices, UINT *devcount, static HRESULT WINMM_InitMMDevices(void) { - HRESULT hr; + HRESULT hr, init_hr; + IMMDeviceEnumerator *devenum = NULL; + + if(g_outmmdevices_count || g_inmmdevices_count) + return S_FALSE; + + init_hr = CoInitialize(NULL); hr = CoCreateInstance(&CLSID_MMDeviceEnumerator, NULL, - CLSCTX_INPROC_SERVER, &IID_IMMDeviceEnumerator, (void**)&g_devenum); + CLSCTX_INPROC_SERVER, &IID_IMMDeviceEnumerator, (void**)&devenum); if(FAILED(hr)) - return hr; + goto exit; - hr = WINMM_EnumDevices(&g_out_mmdevices, &g_outmmdevices_count, eRender); + hr = WINMM_EnumDevices(&g_out_mmdevices, &g_outmmdevices_count, eRender, devenum); if(FAILED(hr)){ g_outmmdevices_count = 0; g_inmmdevices_count = 0; - return hr; + goto exit; } - hr = WINMM_EnumDevices(&g_in_mmdevices, &g_inmmdevices_count, eCapture); + hr = WINMM_EnumDevices(&g_in_mmdevices, &g_inmmdevices_count, eCapture, devenum); if(FAILED(hr)){ g_inmmdevices_count = 0; - return hr; + goto exit; } - return S_OK; +exit: + if(devenum) + IMMDeviceEnumerator_Release(devenum); + if(SUCCEEDED(init_hr)) + CoUninitialize(); + + return hr; } static inline BOOL WINMM_IsMapper(UINT device) @@ -2040,10 +2052,19 @@ static DWORD WINAPI WINMM_DevicesThreadProc(void *arg) return 1; } + hr = CoCreateInstance(&CLSID_MMDeviceEnumerator, NULL, + CLSCTX_INPROC_SERVER, &IID_IMMDeviceEnumerator, (void**)&g_devenum); + if(FAILED(hr)){ + ERR("CoCreateInstance failed: %08x\n", hr); + CoUninitialize(); + return 1; + } + g_devices_hwnd = CreateWindowW(messageW, NULL, 0, 0, 0, 0, 0, HWND_MESSAGE, NULL, NULL, NULL); if(!g_devices_hwnd){ ERR("CreateWindow failed: %d\n", GetLastError()); + IMMDeviceEnumerator_Release(g_devenum); CoUninitialize(); return 1; } @@ -2076,6 +2097,8 @@ static DWORD WINAPI WINMM_DevicesThreadProc(void *arg) DestroyWindow(g_devices_hwnd); + IMMDeviceEnumerator_Release(g_devenum); + CoUninitialize(); return 0; @@ -2140,7 +2163,8 @@ static BOOL WINMM_StartDevicesThread(void) */ UINT WINAPI waveOutGetNumDevs(void) { - if(!WINMM_StartDevicesThread()) + HRESULT hr = WINMM_InitMMDevices(); + if(FAILED(hr)) return 0; TRACE("count: %u\n", g_outmmdevices_count); @@ -2159,9 +2183,6 @@ UINT WINAPI waveOutGetDevCapsA(UINT_PTR uDeviceID, LPWAVEOUTCAPSA lpCaps, TRACE("(%lu, %p, %u)\n", uDeviceID, lpCaps, uSize); - if(!WINMM_StartDevicesThread()) - return MMSYSERR_ERROR; - if(!lpCaps) return MMSYSERR_INVALPARAM; @@ -2189,10 +2210,12 @@ UINT WINAPI waveOutGetDevCapsW(UINT_PTR uDeviceID, LPWAVEOUTCAPSW lpCaps, UINT uSize) { WAVEOUTCAPSW mapper_caps, *caps; + HRESULT hr; TRACE("(%lu, %p, %u)\n", uDeviceID, lpCaps, uSize); - if(!WINMM_StartDevicesThread()) + hr = WINMM_InitMMDevices(); + if(FAILED(hr)) return MMSYSERR_ERROR; if (lpCaps == NULL) return MMSYSERR_INVALPARAM; @@ -2784,7 +2807,8 @@ UINT WINAPI waveOutMessage(HWAVEOUT hWaveOut, UINT uMessage, */ UINT WINAPI waveInGetNumDevs(void) { - if(!WINMM_StartDevicesThread()) + HRESULT hr = WINMM_InitMMDevices(); + if(FAILED(hr)) return 0; TRACE("count: %u\n", g_inmmdevices_count); @@ -2798,10 +2822,12 @@ UINT WINAPI waveInGetNumDevs(void) UINT WINAPI waveInGetDevCapsW(UINT_PTR uDeviceID, LPWAVEINCAPSW lpCaps, UINT uSize) { WAVEINCAPSW mapper_caps, *caps; + HRESULT hr; TRACE("(%lu, %p, %u)\n", uDeviceID, lpCaps, uSize); - if(!WINMM_StartDevicesThread()) + hr = WINMM_InitMMDevices(); + if(FAILED(hr)) return MMSYSERR_ERROR; if(!lpCaps) @@ -2843,9 +2869,6 @@ UINT WINAPI waveInGetDevCapsA(UINT_PTR uDeviceID, LPWAVEINCAPSA lpCaps, UINT uSi TRACE("(%lu, %p, %u)\n", uDeviceID, lpCaps, uSize); - if(!WINMM_StartDevicesThread()) - return MMSYSERR_ERROR; - if(!lpCaps) return MMSYSERR_INVALPARAM; @@ -3155,9 +3178,12 @@ UINT WINAPI waveInMessage(HWAVEIN hWaveIn, UINT uMessage, UINT WINAPI mixerGetNumDevs(void) { + HRESULT hr; + TRACE("\n"); - if(!WINMM_StartDevicesThread()) + hr = WINMM_InitMMDevices(); + if(FAILED(hr)) return 0; return g_outmmdevices_count + g_inmmdevices_count; @@ -3199,10 +3225,12 @@ UINT WINAPI mixerGetDevCapsW(UINT_PTR uDeviceID, LPMIXERCAPSW lpCaps, UINT uSize { WINMM_MMDevice *mmdevice; MIXERCAPSW caps; + HRESULT hr; TRACE("(%lu, %p, %u)\n", uDeviceID, lpCaps, uSize); - if(!WINMM_StartDevicesThread()) + hr = WINMM_InitMMDevices(); + if(FAILED(hr)) return MMSYSERR_ERROR; if(!lpCaps) @@ -3241,11 +3269,13 @@ UINT WINAPI mixerOpen(LPHMIXER lphMix, UINT uDeviceID, DWORD_PTR dwCallback, { WINMM_MMDevice *mmdevice; MMRESULT mr; + HRESULT hr; TRACE("(%p, %d, %lx, %lx, %x)\n", lphMix, uDeviceID, dwCallback, dwInstance, fdwOpen); - if(!WINMM_StartDevicesThread()) + hr = WINMM_InitMMDevices(); + if(FAILED(hr)) return MMSYSERR_ERROR; if(!lphMix) @@ -3289,10 +3319,12 @@ UINT WINAPI mixerClose(HMIXER hMix) UINT WINAPI mixerGetID(HMIXEROBJ hmix, LPUINT lpid, DWORD fdwID) { WINMM_MMDevice *mmdevice; + HRESULT hr; TRACE("(%p, %p, %x)\n", hmix, lpid, fdwID); - if(!WINMM_StartDevicesThread()) + hr = WINMM_InitMMDevices(); + if(FAILED(hr)) return MMSYSERR_ERROR; if(!lpid) @@ -3315,10 +3347,12 @@ UINT WINAPI mixerGetControlDetailsW(HMIXEROBJ hmix, LPMIXERCONTROLDETAILS lpmcdW DWORD fdwDetails) { WINMM_ControlDetails details; + HRESULT hr; TRACE("(%p, %p, %x)\n", hmix, lpmcdW, fdwDetails); - if(!WINMM_StartDevicesThread()) + hr = WINMM_InitMMDevices(); + if(FAILED(hr)) return MMSYSERR_ERROR; if(!lpmcdW) @@ -3500,10 +3534,12 @@ UINT WINAPI mixerGetLineControlsW(HMIXEROBJ hmix, LPMIXERLINECONTROLSW lpmlcW, DWORD fdwControls) { WINMM_MMDevice *mmdevice; + HRESULT hr; TRACE("(%p, %p, %08x)\n", hmix, lpmlcW, fdwControls); - if(!WINMM_StartDevicesThread()) + hr = WINMM_InitMMDevices(); + if(FAILED(hr)) return MMSYSERR_ERROR; if(fdwControls & ~(MIXER_GETLINECONTROLSF_ALL | @@ -3716,10 +3752,12 @@ UINT WINAPI mixerGetLineInfoW(HMIXEROBJ hmix, LPMIXERLINEW lpmliW, DWORD fdwInfo { UINT mmdev_index; WINMM_MMDevice *mmdevice; + HRESULT hr; TRACE("(%p, %p, %x)\n", hmix, lpmliW, fdwInfo); - if(!WINMM_StartDevicesThread()) + hr = WINMM_InitMMDevices(); + if(FAILED(hr)) return MMSYSERR_ERROR; if(!lpmliW || lpmliW->cbStruct < sizeof(MIXERLINEW))

1 0

Dmitry Timoshkov : kernel32: Test MapViewOfFile and NtMapViewOfSection side by side.
by Alexandre Julliard 16 Jan '12

16 Jan '12

Module: wine Branch: master Commit: 9bd55bc2f5363e3302bc0e390746b98b8603b243 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bd55bc2f5363e3302bc0e390… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jan 16 21:50:35 2012 +0800 kernel32: Test MapViewOfFile and NtMapViewOfSection side by side. --- dlls/kernel32/tests/virtual.c | 118 +++++++++++++++++++++++++++++++++++++---- 1 files changed, 108 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 203a400..6a135c8 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -38,6 +38,8 @@ static BOOL (WINAPI *pVirtualFreeEx)(HANDLE, LPVOID, SIZE_T, DWORD); static UINT (WINAPI *pGetWriteWatch)(DWORD,LPVOID,SIZE_T,LPVOID*,ULONG_PTR*,ULONG*); static UINT (WINAPI *pResetWriteWatch)(LPVOID,SIZE_T); static NTSTATUS (WINAPI *pNtAreMappedFilesTheSame)(PVOID,PVOID); +static NTSTATUS (WINAPI *pNtMapViewOfSection)(HANDLE, HANDLE, PVOID *, ULONG, SIZE_T, const LARGE_INTEGER *, SIZE_T *, ULONG, ULONG, ULONG); +static DWORD (WINAPI *pNtUnmapViewOfSection)(HANDLE, PVOID); /* ############################### */ @@ -778,12 +780,6 @@ static void test_MapViewOfFile(void) ok( VirtualFree(addr, 0, MEM_RELEASE), "VirtualFree failed\n" ); } -static DWORD (WINAPI *pNtMapViewOfSection)( HANDLE handle, HANDLE process, PVOID *addr_ptr, - ULONG zero_bits, SIZE_T commit_size, - const LARGE_INTEGER *offset_ptr, SIZE_T *size_ptr, - ULONG inherit, ULONG alloc_type, ULONG protect ); -static DWORD (WINAPI *pNtUnmapViewOfSection)( HANDLE process, PVOID addr ); - static void test_NtMapViewOfSection(void) { HANDLE hProcess; @@ -798,8 +794,6 @@ static void test_NtMapViewOfSection(void) SIZE_T size, result; LARGE_INTEGER offset; - pNtMapViewOfSection = (void *)GetProcAddress( GetModuleHandle("ntdll.dll"), "NtMapViewOfSection" ); - pNtUnmapViewOfSection = (void *)GetProcAddress( GetModuleHandle("ntdll.dll"), "NtUnmapViewOfSection" ); if (!pNtMapViewOfSection || !pNtUnmapViewOfSection) { win_skip( "NtMapViewOfSection not available\n" ); @@ -1943,6 +1937,59 @@ static BOOL is_compatible_access(DWORD map_prot, DWORD view_prot) return (view_prot & access) == view_prot; } +static void *map_view_of_file(HANDLE handle, DWORD access) +{ + NTSTATUS status; + LARGE_INTEGER offset; + SIZE_T count; + ULONG protect; + BOOL exec; + void *addr; + + if (!pNtMapViewOfSection) return NULL; + + count = 0; + offset.u.LowPart = 0; + offset.u.HighPart = 0; + + exec = access & FILE_MAP_EXECUTE; + access &= ~FILE_MAP_EXECUTE; + + if (access == FILE_MAP_COPY) + { + if (exec) + protect = PAGE_EXECUTE_WRITECOPY; + else + protect = PAGE_WRITECOPY; + } + else if (access & FILE_MAP_WRITE) + { + if (exec) + protect = PAGE_EXECUTE_READWRITE; + else + protect = PAGE_READWRITE; + } + else if (access & FILE_MAP_READ) + { + if (exec) + protect = PAGE_EXECUTE_READ; + else + protect = PAGE_READONLY; + } + else protect = PAGE_NOACCESS; + + addr = NULL; + status = pNtMapViewOfSection(handle, GetCurrentProcess(), &addr, 0, 0, &offset, + &count, 1 /* ViewShare */, 0, protect); + if (status) + { + /* for simplicity */ + SetLastError(ERROR_ACCESS_DENIED); + addr = NULL; + } + return addr; +} + static void test_mapping(void) { static const DWORD page_prot[] = @@ -1988,13 +2035,13 @@ static void test_mapping(void) { FILE_MAP_EXECUTE | SECTION_MAP_EXECUTE | FILE_MAP_READ | FILE_MAP_WRITE, PAGE_EXECUTE_READWRITE }, /* 0x2e */ { FILE_MAP_EXECUTE | SECTION_MAP_EXECUTE | FILE_MAP_READ | FILE_MAP_WRITE | FILE_MAP_COPY, PAGE_EXECUTE_READWRITE } /* 0x2f */ }; - void *base; + void *base, *nt_base; DWORD i, j, k, ret, old_prot, prev_prot; SYSTEM_INFO si; char temp_path[MAX_PATH]; char file_name[MAX_PATH]; HANDLE hfile, hmap; - MEMORY_BASIC_INFORMATION info; + MEMORY_BASIC_INFORMATION info, nt_info; GetSystemInfo(&si); trace("system page size %#x\n", si.dwPageSize); @@ -2053,9 +2100,30 @@ static void test_mapping(void) for (j = 0; j < sizeof(view)/sizeof(view[0]); j++) { + nt_base = map_view_of_file(hmap, view[j].access); + if (nt_base) + { + SetLastError(0xdeadbeef); + ret = VirtualQuery(nt_base, &nt_info, sizeof(nt_info)); + ok(ret, "%d: VirtualQuery failed %d\n", j, GetLastError()); + UnmapViewOfFile(nt_base); + } + SetLastError(0xdeadbeef); base = MapViewOfFile(hmap, view[j].access, 0, 0, 0); + /* FIXME: completely remove the condition below once Wine is fixed */ + if (!nt_base != !base) + todo_wine + /* Vista+ supports FILE_MAP_EXECUTE properly, earlier versions don't */ + ok(!nt_base == !base || + broken((view[j].access & FILE_MAP_EXECUTE) && !nt_base != !base), + "%d: (%04x/%04x) NT %p kernel %p\n", j, page_prot[i], view[j].access, nt_base, base); + else + ok(!nt_base == !base || + broken((view[j].access & FILE_MAP_EXECUTE) && !nt_base != !base), + "%d: (%04x/%04x) NT %p kernel %p\n", j, page_prot[i], view[j].access, nt_base, base); + if (!is_compatible_access(page_prot[i], view[j].access)) { ok(!base, "%d: MapViewOfFile(%04x/%04x) should fail\n", j, page_prot[i], view[j].access); @@ -2096,6 +2164,33 @@ static void test_mapping(void) ok(info.State == MEM_COMMIT, "%d: (%04x) got %#x, expected MEM_COMMIT\n", j, view[j].access, info.State); ok(info.Type == MEM_MAPPED, "%d: (%04x) got %#x, expected MEM_MAPPED\n", j, view[j].access, info.Type); + if (nt_base && base) + { + ok(nt_info.RegionSize == info.RegionSize, "%d: (%04x) got %#lx != expected %#lx\n", j, view[j].access, nt_info.RegionSize, info.RegionSize); + /* FIXME: completely remove the condition below once Wine is fixed */ + if (nt_info.Protect != info.Protect) + todo_wine + ok(nt_info.Protect == info.Protect /* Vista+ */ || + broken(nt_info.AllocationProtect == PAGE_EXECUTE_WRITECOPY && info.Protect == PAGE_NOACCESS), /* XP */ + "%d: (%04x) got %#x, expected %#x\n", j, view[j].access, nt_info.Protect, info.Protect); + else + ok(nt_info.Protect == info.Protect /* Vista+ */ || + broken(nt_info.AllocationProtect == PAGE_EXECUTE_WRITECOPY && info.Protect == PAGE_NOACCESS), /* XP */ + "%d: (%04x) got %#x, expected %#x\n", j, view[j].access, nt_info.Protect, info.Protect); + /* FIXME: completely remove the condition below once Wine is fixed */ + if (nt_info.AllocationProtect != info.AllocationProtect) + todo_wine + ok(nt_info.AllocationProtect == info.AllocationProtect /* Vista+ */ || + broken(nt_info.AllocationProtect == PAGE_EXECUTE_WRITECOPY && info.Protect == PAGE_NOACCESS), /* XP */ + "%d: (%04x) got %#x, expected %#x\n", j, view[j].access, nt_info.AllocationProtect, info.AllocationProtect); + else + ok(nt_info.AllocationProtect == info.AllocationProtect /* Vista+ */ || + broken(nt_info.AllocationProtect == PAGE_EXECUTE_WRITECOPY && info.Protect == PAGE_NOACCESS), /* XP */ + "%d: (%04x) got %#x, expected %#x\n", j, view[j].access, nt_info.AllocationProtect, info.AllocationProtect); + ok(nt_info.State == info.State, "%d: (%04x) got %#x, expected %#x\n", j, view[j].access, nt_info.State, info.State); + ok(nt_info.Type == info.Type, "%d: (%04x) got %#x, expected %#x\n", j, view[j].access, nt_info.Type, info.Type); + } + prev_prot = info.Protect; for (k = 0; k < sizeof(page_prot)/sizeof(page_prot[0]); k++) @@ -2197,6 +2292,9 @@ START_TEST(virtual) pResetWriteWatch = (void *) GetProcAddress(hkernel32, "ResetWriteWatch"); pNtAreMappedFilesTheSame = (void *)GetProcAddress( GetModuleHandle("ntdll.dll"), "NtAreMappedFilesTheSame" ); + pNtMapViewOfSection = (void *)GetProcAddress(GetModuleHandle("ntdll.dll"), "NtMapViewOfSection"); + pNtUnmapViewOfSection = (void *)GetProcAddress(GetModuleHandle("ntdll.dll"), "NtUnmapViewOfSection"); + test_mapping(); test_CreateFileMapping_protection(); test_VirtualAlloc_protection();

1 0

Aric Stewart : wineqtdecoder: Include cbAlign in the requested buffer size.
by Alexandre Julliard 16 Jan '12

16 Jan '12

Module: wine Branch: master Commit: 40220e7205f16eba941613b37bef2c309c252592 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40220e7205f16eba941613b37… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jan 16 11:35:13 2012 -0600 wineqtdecoder: Include cbAlign in the requested buffer size. --- dlls/wineqtdecoder/qtvdecoder.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wineqtdecoder/qtvdecoder.c b/dlls/wineqtdecoder/qtvdecoder.c index 553a486..3690087 100644 --- a/dlls/wineqtdecoder/qtvdecoder.c +++ b/dlls/wineqtdecoder/qtvdecoder.c @@ -492,7 +492,7 @@ static HRESULT WINAPI QTVDecoder_DecideBufferSize(TransformFilter *tf, IMemAlloc ppropInputRequest->cbAlign = 1; if (ppropInputRequest->cbBuffer < This->outputSize) - ppropInputRequest->cbBuffer = This->outputSize; + ppropInputRequest->cbBuffer = This->outputSize + ppropInputRequest->cbAlign; if (!ppropInputRequest->cBuffers) ppropInputRequest->cBuffers = 1;

1 0

Aric Stewart : wineqtdecoder: Improve and differentiate Sample Time and MediaTime.
by Alexandre Julliard 16 Jan '12

16 Jan '12

Module: wine Branch: master Commit: 2ea8f8a4a062b2f2832d60afce377bcc1da7725c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ea8f8a4a062b2f2832d60afc… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jan 16 10:13:12 2012 -0600 wineqtdecoder: Improve and differentiate Sample Time and MediaTime. --- dlls/wineqtdecoder/qtsplitter.c | 18 ++++++++---------- 1 files changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index a42f984..17f173c 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -467,6 +467,7 @@ static DWORD WINAPI QTSplitter_thread(LPVOID data) do { LONGLONG tStart=0, tStop=0; + LONGLONG mStart=0, mStop=0; float time; GetMovieNextInterestingTime(This->pQTMovie, nextTimeStep, 0, NULL, movie_time, 1, &next_time, NULL); @@ -485,6 +486,9 @@ static DWORD WINAPI QTSplitter_thread(LPVOID data) TRACE("In loop at time %ld\n",movie_time); TRACE("In Next time %ld\n",next_time); + mStart = movie_time; + mStop = next_time; + time = (float)movie_time / tr.scale; tStart = time * 10000000; time = (float)next_time / tr.scale; @@ -539,11 +543,8 @@ static DWORD WINAPI QTSplitter_thread(LPVOID data) IMediaSample_SetActualDataLength(sample, frames * pvi->nBlockAlign); - IMediaSample_SetMediaTime(sample, &tStart, &tStop); - if (tStart) - IMediaSample_SetTime(sample, &tStart, &tStop); - else - IMediaSample_SetTime(sample, NULL, NULL); + IMediaSample_SetMediaTime(sample, &mStart, &mStop); + IMediaSample_SetTime(sample, &tStart, &tStop); hr = OutputQueue_Receive(This->pAudio_Pin->queue, sample); TRACE("Audio Delivered (%x)\n",hr); @@ -597,11 +598,8 @@ audio_error: IMediaSample_SetActualDataLength(sample, This->outputSize); - IMediaSample_SetMediaTime(sample, &tStart, &tStop); - if (tStart) - IMediaSample_SetTime(sample, &tStart, &tStop); - else - IMediaSample_SetTime(sample, NULL, NULL); + IMediaSample_SetMediaTime(sample, &mStart, &mStop); + IMediaSample_SetTime(sample, &tStart, &tStop); hr = OutputQueue_Receive(This->pVideo_Pin->queue, sample); TRACE("Video Delivered (%x)\n",hr);

1 0

Aric Stewart : wineqtdecoder: Zero out the whole QTSplitter structure on creation.
by Alexandre Julliard 16 Jan '12

16 Jan '12

Module: wine Branch: master Commit: 3ef34d77996914e55e9aef3ca6518db36dc8a0a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ef34d77996914e55e9aef3ca… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jan 16 10:11:47 2012 -0600 wineqtdecoder: Zero out the whole QTSplitter structure on creation. --- dlls/wineqtdecoder/qtsplitter.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index 06709c3..a42f984 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -233,6 +233,7 @@ IUnknown * CALLBACK QTSplitter_create(IUnknown *punkout, HRESULT *phr) *phr = E_OUTOFMEMORY; return NULL; } + ZeroMemory(This,sizeof(*This)); BaseFilter_Init(&This->filter, &QT_Vtbl, &CLSID_QTSplitter, (DWORD_PTR)(__FILE__ ": QTSplitter.csFilter"), &BaseFuncTable); @@ -250,7 +251,6 @@ IUnknown * CALLBACK QTSplitter_create(IUnknown *punkout, HRESULT *phr) This->pInputPin.pin.refCount = 1; This->pInputPin.pin.pConnectedTo = NULL; This->pInputPin.pin.pCritSec = &This->filter.csFilter; - ZeroMemory(&This->pInputPin.pin.mtCurrent, sizeof(AM_MEDIA_TYPE)); *phr = S_OK; return obj; }

1 0

Aric Stewart : quartz: Implement IObjectWithSite and IAMGraphBuilderCallback for the FilterGraph.
by Alexandre Julliard 16 Jan '12

16 Jan '12

Module: wine Branch: master Commit: 8c91f1bf5e5a22ad90e7c1723b62342c3734fda8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c91f1bf5e5a22ad90e7c1723… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jan 16 08:12:23 2012 -0600 quartz: Implement IObjectWithSite and IAMGraphBuilderCallback for the FilterGraph. --- dlls/quartz/filtergraph.c | 105 +++++++++++++++++++++++++++++++++++++++++++++ include/axextend.idl | 16 +++++++ 2 files changed, 121 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 64c2d06..32aa569 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -160,6 +160,7 @@ typedef struct _IFilterGraphImpl { IMediaEventSink IMediaEventSink_iface; IGraphConfig IGraphConfig_iface; IMediaPosition IMediaPosition_iface; + IObjectWithSite IObjectWithSite_iface; const IUnknownVtbl * IInner_vtbl; /* IAMGraphStreams */ /* IAMStats */ @@ -204,6 +205,7 @@ typedef struct _IFilterGraphImpl { REFERENCE_TIME pause_time; LONGLONG stop_position; LONG recursioncount; + IUnknown *pSite; } IFilterGraphImpl; static HRESULT Filtergraph_QueryInterface(IFilterGraphImpl *This, @@ -261,6 +263,9 @@ static HRESULT WINAPI FilterGraphInner_QueryInterface(IUnknown * iface, } else if (IsEqualGUID(&IID_IMediaPosition, riid)) { *ppvObj = &This->IMediaPosition_iface; TRACE(" returning IMediaPosition interface (%p)\n", *ppvObj); + } else if (IsEqualGUID(&IID_IObjectWithSite, riid)) { + *ppvObj = &This->IObjectWithSite_iface; + TRACE(" returning IObjectWithSite interface (%p)\n", *ppvObj); } else if (IsEqualGUID(&IID_IFilterMapper, riid)) { TRACE(" requesting IFilterMapper interface from aggregated filtermapper (%p)\n", *ppvObj); return IUnknown_QueryInterface(This->punkFilterMapper2, riid, ppvObj); @@ -327,6 +332,8 @@ static ULONG WINAPI FilterGraphInner_Release(IUnknown * iface) IFilterMapper2_Release(This->pFilterMapper2); IUnknown_Release(This->punkFilterMapper2); + if (This->pSite) IUnknown_Release(This->pSite); + CloseHandle(This->hEventCompletion); EventsQueue_Destroy(&This->evqueue); This->cs.DebugInfo->Spare[0] = 0; @@ -1020,6 +1027,7 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, IPin *ppinOut, IPin** ppins; IPin* ppinfilter = NULL; IBaseFilter* pfilter = NULL; + IAMGraphBuilderCallback *callback = NULL; hr = GetFilterInfo(pMoniker, &clsid, &var); IMoniker_Release(pMoniker); @@ -1033,12 +1041,42 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, IPin *ppinOut, goto error; } + if (This->pSite) + { + IUnknown_QueryInterface(This->pSite, &IID_IAMGraphBuilderCallback, (LPVOID*)&callback); + if (callback) + { + HRESULT rc; + rc = IAMGraphBuilderCallback_SelectedFilter(callback, pMoniker); + if (FAILED(rc)) + { + TRACE("Filter rejected by IAMGraphBuilderCallback_SelectedFilter\n"); + IUnknown_Release(callback); + goto error; + } + } + } + hr = CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (LPVOID*)&pfilter); if (FAILED(hr)) { WARN("Unable to create filter (%x), trying next one\n", hr); goto error; } + if (callback) + { + HRESULT rc; + rc = IAMGraphBuilderCallback_CreatedFilter(callback, pfilter); + IUnknown_Release(callback); + if (FAILED(rc)) + { + IBaseFilter_Release(pfilter); + pfilter = NULL; + TRACE("Filter rejected by IAMGraphBuilderCallback_CreatedFilter\n"); + goto error; + } + } + hr = IFilterGraph2_AddFilter(iface, pfilter, V_UNION(&var, bstrVal)); if (FAILED(hr)) { WARN("Unable to add filter (%x)\n", hr); @@ -2768,6 +2806,71 @@ static const IMediaPositionVtbl IMediaPosition_VTable = MediaPosition_CanSeekBackward }; +static inline IFilterGraphImpl *impl_from_IObjectWithSite(IObjectWithSite *iface) +{ + return CONTAINING_RECORD(iface, IFilterGraphImpl, IObjectWithSite_iface); +} + +/*** IUnknown methods ***/ +static HRESULT WINAPI ObjectWithSite_QueryInterface(IObjectWithSite* iface, REFIID riid, void** ppvObj) +{ + IFilterGraphImpl *This = impl_from_IObjectWithSite( iface ); + + TRACE("(%p/%p)->(%s (%p), %p)\n", This, iface, debugstr_guid(riid), riid, ppvObj); + return Filtergraph_QueryInterface(This, riid, ppvObj); +} + +static ULONG WINAPI ObjectWithSite_AddRef(IObjectWithSite *iface) +{ + IFilterGraphImpl *This = impl_from_IObjectWithSite( iface ); + + TRACE("(%p/%p)->()\n", This, iface); + return Filtergraph_AddRef(This); +} + +static ULONG WINAPI ObjectWithSite_Release(IObjectWithSite *iface) +{ + IFilterGraphImpl *This = impl_from_IObjectWithSite( iface ); + + TRACE("(%p/%p)->()\n", This, iface); + return Filtergraph_Release(This); +} + +/*** IObjectWithSite methods ***/ + +static HRESULT WINAPI ObjectWithSite_SetSite(IObjectWithSite *iface, IUnknown *pUnkSite) +{ + IFilterGraphImpl *This = impl_from_IObjectWithSite( iface ); + + TRACE("(%p/%p)->()\n", This, iface); + if (This->pSite) IUnknown_Release(This->pSite); + This->pSite = pUnkSite; + IUnknown_AddRef(This->pSite); + return S_OK; +} + +static HRESULT WINAPI ObjectWithSite_GetSite(IObjectWithSite *iface, REFIID riid, PVOID *ppvSite) +{ + IFilterGraphImpl *This = impl_from_IObjectWithSite( iface ); + + TRACE("(%p/%p)->(%s)\n", This, iface,debugstr_guid(riid)); + + *ppvSite = NULL; + if (!This->pSite) + return E_FAIL; + else + return IUnknown_QueryInterface(This->pSite, riid, ppvSite); +} + +static const IObjectWithSiteVtbl IObjectWithSite_VTable = +{ + ObjectWithSite_QueryInterface, + ObjectWithSite_AddRef, + ObjectWithSite_Release, + ObjectWithSite_SetSite, + ObjectWithSite_GetSite, +}; + static HRESULT GetTargetInterface(IFilterGraphImpl* pGraph, REFIID riid, LPVOID* ppvObj) { HRESULT hr = E_NOINTERFACE; @@ -5506,6 +5609,7 @@ HRESULT FilterGraph_create(IUnknown *pUnkOuter, LPVOID *ppObj) fimpl->IMediaEventSink_iface.lpVtbl = &IMediaEventSink_VTable; fimpl->IGraphConfig_iface.lpVtbl = &IGraphConfig_VTable; fimpl->IMediaPosition_iface.lpVtbl = &IMediaPosition_VTable; + fimpl->IObjectWithSite_iface.lpVtbl = &IObjectWithSite_VTable; fimpl->ref = 1; fimpl->ppFiltersInGraph = NULL; fimpl->pFilterNames = NULL; @@ -5523,6 +5627,7 @@ HRESULT FilterGraph_create(IUnknown *pUnkOuter, LPVOID *ppObj) fimpl->EcCompleteCount = 0; fimpl->refClockProvider = NULL; fimpl->state = State_Stopped; + fimpl->pSite = NULL; EventsQueue_Init(&fimpl->evqueue); InitializeCriticalSection(&fimpl->cs); fimpl->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": IFilterGraphImpl.cs"); diff --git a/include/axextend.idl b/include/axextend.idl index c546a7e..bf87731 100644 --- a/include/axextend.idl +++ b/include/axextend.idl @@ -45,6 +45,7 @@ interface IAMVfwCompressDialogs; interface IAMVideoCompression; interface IAMVideoDecimationProperties; interface IAMVideoProcAmp; +interface IAMGraphBuilderCallback; interface ICaptureGraphBuilder; interface ICaptureGraphBuilder2; interface IConfigAviMux; @@ -1010,3 +1011,18 @@ interface IAMFilterMiscFlags : IUnknown { ULONG GetMiscFlags(); }; + +[ + local, + object, + uuid(4995f511-9ddb-4f12-bd3b-f04611807b79), + pointer_default(unique) +] +interface IAMGraphBuilderCallback : IUnknown +{ + HRESULT SelectedFilter( + [in] IMoniker *pMon); + + HRESULT CreatedFilter( + [in] IBaseFilter *pFil); +};

1 0

← Newer
1
...
47
48
49
50
51
52
53
...
98
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 January 2012