January 2012 - Wine-commits

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

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

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

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

Frédéric Delanoy : wineconsole: Don' t include spaces before colons in English strings.
by Alexandre Julliard 16 Jan '12

16 Jan '12

1 0

Jörg Höhle : winealsa: Fix AudioCaptureClient Get /ReleaseBuffer protocol.
by Alexandre Julliard 16 Jan '12

16 Jan '12

Module: wine Branch: master Commit: 18024afd9702b28d3195c5ff39056a2c98ac8c63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18024afd9702b28d3195c5ff3… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sun Jan 8 16:35:43 2012 +0100 winealsa: Fix AudioCaptureClient Get/ReleaseBuffer protocol. --- dlls/winealsa.drv/mmdevdrv.c | 63 +++++++++++++++++++++++++++-------------- 1 files changed, 41 insertions(+), 22 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 0cb7b9b..bcbe06c 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -115,7 +115,6 @@ struct ACImpl { HANDLE timer; BYTE *local_buffer, *tmp_buffer; - int buf_state; long getbuf_last; /* <0 when using tmp_buffer */ CRITICAL_SECTION lock; @@ -126,12 +125,6 @@ struct ACImpl { struct list entry; }; -enum BufferStates { - NOT_LOCKED = 0, - LOCKED_NORMAL, /* public buffer piece is from local_buffer */ - LOCKED_WRAPPED /* public buffer piece is wrapped around, in tmp_buffer */ -}; - typedef struct _SessionMgr { IAudioSessionManager2 IAudioSessionManager2_iface; @@ -1757,7 +1750,7 @@ static HRESULT WINAPI AudioClient_Reset(IAudioClient *iface) return AUDCLNT_E_NOT_STOPPED; } - if(This->buf_state != NOT_LOCKED || This->getbuf_last){ + if(This->getbuf_last){ LeaveCriticalSection(&This->lock); return AUDCLNT_E_BUFFER_OPERATION_PENDING; } @@ -2127,7 +2120,6 @@ static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, UINT64 *qpcpos) { ACImpl *This = impl_from_IAudioCaptureClient(iface); - HRESULT hr; TRACE("(%p)->(%p, %p, %p, %p, %p)\n", This, data, frames, flags, devpos, qpcpos); @@ -2137,18 +2129,18 @@ static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, EnterCriticalSection(&This->lock); - if(This->buf_state != NOT_LOCKED){ + if(This->getbuf_last){ LeaveCriticalSection(&This->lock); return AUDCLNT_E_OUT_OF_ORDER; } - hr = IAudioCaptureClient_GetNextPacketSize(iface, frames); - if(FAILED(hr)){ + /* hr = GetNextPacketSize(iface, frames); */ + if(This->held_frames < This->mmdev_period_frames){ + *frames = 0; LeaveCriticalSection(&This->lock); - return hr; + return AUDCLNT_S_BUFFER_EMPTY; } - - *flags = 0; + *frames = This->mmdev_period_frames; if(This->lcl_offs_frames + *frames > This->bufsize_frames){ UINT32 chunk_bytes, offs_bytes, frames_bytes; @@ -2175,10 +2167,17 @@ static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, *data = This->local_buffer + This->lcl_offs_frames * This->fmt->nBlockAlign; - This->buf_state = LOCKED_NORMAL; + This->getbuf_last = *frames; + *flags = 0; - if(devpos || qpcpos) - IAudioClock_GetPosition(&This->IAudioClock_iface, devpos, qpcpos); + if(devpos) + *devpos = This->written_frames; + if(qpcpos){ /* fixme: qpc of recording time */ + LARGE_INTEGER stamp, freq; + QueryPerformanceCounter(&stamp); + QueryPerformanceFrequency(&freq); + *qpcpos = (stamp.QuadPart * (INT64)10000000) / freq.QuadPart; + } LeaveCriticalSection(&This->lock); @@ -2194,16 +2193,27 @@ static HRESULT WINAPI AudioCaptureClient_ReleaseBuffer( EnterCriticalSection(&This->lock); - if(This->buf_state == NOT_LOCKED){ + if(!done){ + This->getbuf_last = 0; + LeaveCriticalSection(&This->lock); + return S_OK; + } + + if(!This->getbuf_last){ LeaveCriticalSection(&This->lock); return AUDCLNT_E_OUT_OF_ORDER; } + if(This->getbuf_last != done){ + LeaveCriticalSection(&This->lock); + return AUDCLNT_E_INVALID_SIZE; + } + + This->written_frames += done; This->held_frames -= done; This->lcl_offs_frames += done; This->lcl_offs_frames %= This->bufsize_frames; - - This->buf_state = NOT_LOCKED; + This->getbuf_last = 0; LeaveCriticalSection(&This->lock); @@ -2217,7 +2227,16 @@ static HRESULT WINAPI AudioCaptureClient_GetNextPacketSize( TRACE("(%p)->(%p)\n", This, frames); - return AudioClient_GetCurrentPadding(&This->IAudioClient_iface, frames); + if(!frames) + return E_POINTER; + + EnterCriticalSection(&This->lock); + + *frames = This->held_frames < This->mmdev_period_frames ? 0 : This->mmdev_period_frames; + + LeaveCriticalSection(&This->lock); + + return S_OK; } static const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl =

1 0

Jörg Höhle : winecoreaudio: GetNextPacketSize returns 0 when no data is available yet.
by Alexandre Julliard 16 Jan '12

16 Jan '12

Module: wine Branch: master Commit: 89eaa56a2f3e42ed3979722540930ee0c6058abf URL: http://source.winehq.org/git/wine.git/?a=commit;h=89eaa56a2f3e42ed397972254… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Mon Jan 9 22:54:54 2012 +0100 winecoreaudio: GetNextPacketSize returns 0 when no data is available yet. --- dlls/winecoreaudio.drv/mmdevdrv.c | 74 ++++++++++++++++++++----------------- 1 files changed, 40 insertions(+), 34 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 6161e51..07359c0 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -1930,11 +1930,44 @@ static ULONG WINAPI AudioCaptureClient_Release(IAudioCaptureClient *iface) return IAudioClient_Release(&This->IAudioClient_iface); } +static HRESULT AudioCaptureClient_GetNextPacket(ACImpl *This, UINT32 *frames) +{ + OSStatus sc; + for(;;){ + if(!This->public_buffer){ + struct list *head = list_head(&This->avail_buffers); + AQBuffer *buf; + + if(!head){ + *frames = 0; + return S_OK; + } + buf = LIST_ENTRY(head, AQBuffer, entry); + This->public_buffer = buf->buf; + list_remove(&buf->entry); + } + *frames = This->public_buffer->mAudioDataByteSize / This->fmt->nBlockAlign; + if(*frames) + return S_OK; + WARN("empty packet\n"); + /* fixme: for reasons not yet understood, the initially submitted + * packets are returned with 0 bytes. Resubmit them. */ + sc = AudioQueueEnqueueBuffer(This->aqueue, This->public_buffer, 0, NULL); + if(sc != noErr){ + ERR("Unable to enqueue buffer: %lx\n", sc); + /* Release will free This->public_buffer */ + return AUDCLNT_E_DEVICE_INVALIDATED; + }else + This->public_buffer = NULL; + } +} + static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, BYTE **data, UINT32 *frames, DWORD *flags, UINT64 *devpos, UINT64 *qpcpos) { ACImpl *This = impl_from_IAudioCaptureClient(iface); + HRESULT hr; TRACE("(%p)->(%p, %p, %p, %p, %p)\n", This, data, frames, flags, devpos, qpcpos); @@ -1949,27 +1982,10 @@ static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, return AUDCLNT_E_OUT_OF_ORDER; } - if(This->public_buffer){ - *frames = - This->public_buffer->mAudioDataByteSize / This->fmt->nBlockAlign; - }else{ - struct list *head = list_head(&This->avail_buffers); - if(!head){ - *frames = 0; - }else{ - AQBuffer *buf = LIST_ENTRY(head, AQBuffer, entry); - This->public_buffer = buf->buf; - *frames = - This->public_buffer->mAudioDataByteSize / This->fmt->nBlockAlign; - list_remove(&buf->entry); - if(!*frames){ - OSStatus sc = AudioQueueEnqueueBuffer(This->aqueue, This->public_buffer, 0, NULL); - if(sc != noErr) - ERR("Unable to enqueue buffer: %lx\n", sc); - This->public_buffer = NULL; - WARN("empty packet\n"); - } - } + hr = AudioCaptureClient_GetNextPacket(This, frames); + if(FAILED(hr)){ + OSSpinLockUnlock(&This->lock); + return hr; } if((This->getbuf_last = *frames)){ @@ -2036,8 +2052,7 @@ static HRESULT WINAPI AudioCaptureClient_GetNextPacketSize( IAudioCaptureClient *iface, UINT32 *frames) { ACImpl *This = impl_from_IAudioCaptureClient(iface); - struct list *head; - AQBuffer *buf; + HRESULT hr; TRACE("(%p)->(%p)\n", This, frames); @@ -2046,20 +2061,11 @@ static HRESULT WINAPI AudioCaptureClient_GetNextPacketSize( OSSpinLockLock(&This->lock); - head = list_head(&This->avail_buffers); - - if(!head){ - *frames = This->bufsize_frames / CAPTURE_BUFFERS; - OSSpinLockUnlock(&This->lock); - return S_OK; - } - - buf = LIST_ENTRY(head, AQBuffer, entry); - *frames = buf->buf->mAudioDataByteSize / This->fmt->nBlockAlign; + hr = AudioCaptureClient_GetNextPacket(This, frames); OSSpinLockUnlock(&This->lock); - return S_OK; + return hr; } static const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl =

1 0

Alexandre Julliard : ntdll: Set the thread exit code when a thread is killed inside a wait.
by Alexandre Julliard 16 Jan '12

16 Jan '12

Module: wine Branch: master Commit: 6d2063f41b5774f15ee399069962e5844357e755 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d2063f41b5774f15ee399069… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 16 14:04:39 2012 +0100 ntdll: Set the thread exit code when a thread is killed inside a wait. --- dlls/ntdll/sync.c | 4 +--- server/thread.c | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 3e27d09..f759ce6 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -807,7 +807,7 @@ static int wait_reply( void *cookie ) ret = read( ntdll_get_thread_data()->wait_fd[0], &reply, sizeof(reply) ); if (ret == sizeof(reply)) { - if (!reply.cookie) break; /* thread got killed */ + if (!reply.cookie) abort_thread( reply.signaled ); /* thread got killed */ if (wine_server_get_ptr(reply.cookie) == cookie) return reply.signaled; /* we stole another reply, wait for the real one */ signaled = wait_reply( cookie ); @@ -826,8 +826,6 @@ static int wait_reply( void *cookie ) if (errno == EINTR) continue; server_protocol_perror("wakeup read"); } - /* the server closed the connection; time to die... */ - abort_thread(0); } diff --git a/server/thread.c b/server/thread.c index f704473..f9a575e 100644 --- a/server/thread.c +++ b/server/thread.c @@ -986,7 +986,7 @@ void kill_thread( struct thread *thread, int violent_death ) if (thread->wait) { while (thread->wait) end_wait( thread ); - send_thread_wakeup( thread, 0, STATUS_PENDING ); + send_thread_wakeup( thread, 0, thread->exit_code ); /* if it is waiting on the socket, we don't need to send a SIGQUIT */ violent_death = 0; }

1 0

Alexandre Julliard : winedbg: Kill the whole target process on exit in auto mode.
by Alexandre Julliard 16 Jan '12

16 Jan '12

Module: wine Branch: master Commit: fbd08d5914336647679783465b0bf2b5ae6e85e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbd08d5914336647679783465… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 16 14:05:20 2012 +0100 winedbg: Kill the whole target process on exit in auto mode. --- programs/winedbg/tgt_active.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index 376ee22..8302e8e 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -774,7 +774,7 @@ enum dbg_start dbg_active_auto(int argc, char* argv[]) hFile = parser_generate_command_file("echo Modules:", "info share", "echo Threads:", "info threads", - "backtrace", "detach", NULL); + "kill", NULL); } else if (!strcmp(argv[0], "--minidump")) { @@ -839,7 +839,16 @@ enum dbg_start dbg_active_auto(int argc, char* argv[]) static BOOL tgt_process_active_close_process(struct dbg_process* pcs, BOOL kill) { - if (pcs == dbg_curr_process) + if (kill) + { + DWORD exit_code = 0; + + if (pcs == dbg_curr_process && dbg_curr_thread->in_exception) + exit_code = dbg_curr_thread->excpt_record.ExceptionCode; + + TerminateProcess(pcs->handle, exit_code); + } + else if (pcs == dbg_curr_process) { /* remove all set breakpoints in debuggee code */ break_set_xpoints(FALSE); @@ -853,10 +862,6 @@ static BOOL tgt_process_active_close_process(struct dbg_process* pcs, BOOL kill) ContinueDebugEvent(dbg_curr_pid, dbg_curr_tid, DBG_CONTINUE); } } - if (kill) - { - TerminateProcess(pcs->handle, 0); - } else { if (!DebugActiveProcessStop(pcs->pid)) return FALSE;

1 0

Alexandre Julliard : configure: Disable printf format checking for 64-bit Mingw builds.
by Alexandre Julliard 16 Jan '12

16 Jan '12

Module: wine Branch: master Commit: b71f83ba6485fd81f91cfe878c69b446bc3af7a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b71f83ba6485fd81f91cfe878… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 16 16:31:11 2012 +0100 configure: Disable printf format checking for 64-bit Mingw builds. --- configure | 28 ++++++++++++++++++++++++++++ configure.ac | 5 +++++ 2 files changed, 33 insertions(+), 0 deletions(-) diff --git a/configure b/configure index d6293d2..ae531d0 100755 --- a/configure +++ b/configure @@ -12192,6 +12192,34 @@ if test $ac_cv_cflags__fno_omit_frame_pointer = yes; then : fi ;; esac + case $host in + x86_64-*mingw32*|x86_64-*cygwin*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wno-format" >&5 +$as_echo_n "checking whether the compiler supports -Wno-format... " >&6; } +if ${ac_cv_cflags__Wno_format+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_wine_try_cflags_saved=$CFLAGS +CFLAGS="$CFLAGS -Wno-format" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main(int argc, char **argv) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_cflags__Wno_format=yes +else + ac_cv_cflags__Wno_format=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wno_format" >&5 +$as_echo "$ac_cv_cflags__Wno_format" >&6; } +if test $ac_cv_cflags__Wno_format = yes; then : + EXTRACFLAGS="$EXTRACFLAGS -Wno-format" +fi ;; + esac + saved_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -Wpointer-arith -Werror" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken string.h that generates warnings with -Wpointer-arith" >&5 diff --git a/configure.ac b/configure.ac index 8e6d96a..c9f6a63 100644 --- a/configure.ac +++ b/configure.ac @@ -1716,6 +1716,11 @@ then *i[[3456789]]86*) WINE_TRY_CFLAGS([-fno-omit-frame-pointer]) ;; esac + dnl mingw uses Windows 64-bit types, not Unix ones + case $host in + x86_64-*mingw32*|x86_64-*cygwin*) WINE_TRY_CFLAGS([-Wno-format]) ;; + esac + dnl Check for noisy string.h saved_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -Wpointer-arith -Werror"

1 0