December 2014 - Wine-commits

Michael Müller : api-ms-win-core-winrt-error-l1-1-1: Add stub dll.
by Alexandre Julliard 04 Dec '14

04 Dec '14

Module: wine Branch: master Commit: a14c4f92f3052f10e91604ea64bd736fc14724a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a14c4f92f3052f10e91604ea6… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Nov 26 20:13:34 2014 +0100 api-ms-win-core-winrt-error-l1-1-1: Add stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-winrt-error-l1-1-1/Makefile.in | 1 + .../api-ms-win-core-winrt-error-l1-1-1.spec | 19 +++++++++++++++++++ 4 files changed, 23 insertions(+) diff --git a/configure b/configure index 247f765..6d94a08 100755 --- a/configure +++ b/configure @@ -895,6 +895,7 @@ enable_api_ms_win_core_timezone_l1_1_0 enable_api_ms_win_core_url_l1_1_0 enable_api_ms_win_core_util_l1_1_0 enable_api_ms_win_core_winrt_error_l1_1_0 +enable_api_ms_win_core_winrt_error_l1_1_1 enable_api_ms_win_core_winrt_l1_1_0 enable_api_ms_win_core_winrt_string_l1_1_0 enable_api_ms_win_core_xstate_l2_1_0 @@ -16820,6 +16821,7 @@ wine_fn_config_dll api-ms-win-core-timezone-l1-1-0 enable_api_ms_win_core_timezo wine_fn_config_dll api-ms-win-core-url-l1-1-0 enable_api_ms_win_core_url_l1_1_0 wine_fn_config_dll api-ms-win-core-util-l1-1-0 enable_api_ms_win_core_util_l1_1_0 wine_fn_config_dll api-ms-win-core-winrt-error-l1-1-0 enable_api_ms_win_core_winrt_error_l1_1_0 +wine_fn_config_dll api-ms-win-core-winrt-error-l1-1-1 enable_api_ms_win_core_winrt_error_l1_1_1 wine_fn_config_dll api-ms-win-core-winrt-l1-1-0 enable_api_ms_win_core_winrt_l1_1_0 wine_fn_config_dll api-ms-win-core-winrt-string-l1-1-0 enable_api_ms_win_core_winrt_string_l1_1_0 wine_fn_config_dll api-ms-win-core-xstate-l2-1-0 enable_api_ms_win_core_xstate_l2_1_0 diff --git a/configure.ac b/configure.ac index e007f17..863f5e7 100644 --- a/configure.ac +++ b/configure.ac @@ -2687,6 +2687,7 @@ WINE_CONFIG_DLL(api-ms-win-core-timezone-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-url-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-util-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-winrt-error-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-core-winrt-error-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-winrt-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-winrt-string-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-xstate-l2-1-0) diff --git a/dlls/api-ms-win-core-winrt-error-l1-1-1/Makefile.in b/dlls/api-ms-win-core-winrt-error-l1-1-1/Makefile.in new file mode 100644 index 0000000..fe36f7b --- /dev/null +++ b/dlls/api-ms-win-core-winrt-error-l1-1-1/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-winrt-error-l1-1-1.dll diff --git a/dlls/api-ms-win-core-winrt-error-l1-1-1/api-ms-win-core-winrt-error-l1-1-1.spec b/dlls/api-ms-win-core-winrt-error-l1-1-1/api-ms-win-core-winrt-error-l1-1-1.spec new file mode 100644 index 0000000..b1ad813 --- /dev/null +++ b/dlls/api-ms-win-core-winrt-error-l1-1-1/api-ms-win-core-winrt-error-l1-1-1.spec @@ -0,0 +1,19 @@ +@ stub GetRestrictedErrorInfo +@ stub IsErrorPropagationEnabled +@ stub RoCaptureErrorContext +@ stub RoClearError +@ stub RoFailFastWithErrorContext +@ stub RoGetErrorReportingFlags +@ stub RoGetMatchingRestrictedErrorInfo +@ stub RoInspectCapturedStackBackTrace +@ stub RoInspectThreadErrorInfo +@ stub RoOriginateError +@ stub RoOriginateErrorW +@ stub RoOriginateLanguageException +@ stub RoReportFailedDelegate +@ stub RoReportUnhandledError +@ stub RoResolveRestrictedErrorInfoReference +@ stub RoSetErrorReportingFlags +@ stub RoTransformError +@ stub RoTransformErrorW +@ stub SetRestrictedErrorInfo

1 0

Michael Stefaniuc : joy.cpl: Avoid pointers to out of scope variables ( PVS-Studio).
by Alexandre Julliard 04 Dec '14

04 Dec '14

Module: wine Branch: master Commit: 721c502db98fe020d0cde32c3b42d4c7432e2704 URL: http://source.winehq.org/git/wine.git/?a=commit;h=721c502db98fe020d0cde32c3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Dec 4 11:00:43 2014 +0100 joy.cpl: Avoid pointers to out of scope variables (PVS-Studio). --- dlls/joy.cpl/main.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c index 53c0eae..d6ba5d5 100644 --- a/dlls/joy.cpl/main.c +++ b/dlls/joy.cpl/main.c @@ -721,6 +721,9 @@ static BOOL CALLBACK ff_effects_callback(const DIEFFECTINFOW *pdei, void *pvRef) DWORD axes[2] = {DIJOFS_X, DIJOFS_Y}; int direction[2] = {0, 0}; struct Joystick *joystick = pvRef; + DIRAMPFORCE rforce; + DICONSTANTFORCE cforce; + DIPERIODIC pforce; if (joystick->effects == NULL) { @@ -744,8 +747,6 @@ static BOOL CALLBACK ff_effects_callback(const DIEFFECTINFOW *pdei, void *pvRef) if (IsEqualGUID(&pdei->guid, &GUID_RampForce)) { - DIRAMPFORCE rforce; - rforce.lStart = 0; rforce.lEnd = DI_FFNOMINALMAX; @@ -755,8 +756,6 @@ static BOOL CALLBACK ff_effects_callback(const DIEFFECTINFOW *pdei, void *pvRef) } else if (IsEqualGUID(&pdei->guid, &GUID_ConstantForce)) { - DICONSTANTFORCE cforce; - cforce.lMagnitude = DI_FFNOMINALMAX; dieffect.cbTypeSpecificParams = sizeof(cforce); @@ -769,8 +768,6 @@ static BOOL CALLBACK ff_effects_callback(const DIEFFECTINFOW *pdei, void *pvRef) IsEqualGUID(&pdei->guid, &GUID_SawtoothUp) || IsEqualGUID(&pdei->guid, &GUID_SawtoothDown)) { - DIPERIODIC pforce; - pforce.dwMagnitude = DI_FFNOMINALMAX; pforce.lOffset = 0; pforce.dwPhase = 0;

1 0

Piotr Caban : msvcrt: Call CreateProcess with CREATE_UNICODE_ENVIRONMENT flag in exec functions family.
by Alexandre Julliard 04 Dec '14

04 Dec '14

Module: wine Branch: master Commit: a4fcba60b9a8084e8a579e503a83c5241f437135 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4fcba60b9a8084e8a579e503… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 4 11:41:30 2014 +0100 msvcrt: Call CreateProcess with CREATE_UNICODE_ENVIRONMENT flag in exec functions family. Based on a patch by Ron Yorston. --- dlls/msvcrt/process.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/process.c b/dlls/msvcrt/process.c index b782727..f3c9000 100644 --- a/dlls/msvcrt/process.c +++ b/dlls/msvcrt/process.c @@ -134,6 +134,7 @@ static MSVCRT_intptr_t msvcrt_spawn(int flags, const MSVCRT_wchar_t* exe, MSVCRT STARTUPINFOW si; PROCESS_INFORMATION pi; MSVCRT_wchar_t fullname[MAX_PATH]; + DWORD create_flags = CREATE_UNICODE_ENVIRONMENT; TRACE("%x %s %s %s %d\n", flags, debugstr_w(exe), debugstr_w(cmdline), debugstr_w(env), use_path); @@ -148,9 +149,9 @@ static MSVCRT_intptr_t msvcrt_spawn(int flags, const MSVCRT_wchar_t* exe, MSVCRT memset(&si, 0, sizeof(si)); si.cb = sizeof(si); msvcrt_create_io_inherit_block(&si.cbReserved2, &si.lpReserved2); + if (flags == MSVCRT__P_DETACH) create_flags |= DETACHED_PROCESS; if (!CreateProcessW(fullname, cmdline, NULL, NULL, TRUE, - flags == MSVCRT__P_DETACH ? DETACHED_PROCESS : 0, - env, NULL, &si, &pi)) + create_flags, env, NULL, &si, &pi)) { msvcrt_set_errno(GetLastError()); MSVCRT_free(si.lpReserved2);

1 0

Mark Harmstone : mmdevapi: Allow GetPropValue function in audio drivers.
by Alexandre Julliard 04 Dec '14

04 Dec '14

Module: wine Branch: master Commit: b1ff68b8036cd30291de7c21628ac89a81f3ed8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1ff68b8036cd30291de7c216… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Thu Dec 4 17:58:58 2014 +0000 mmdevapi: Allow GetPropValue function in audio drivers. --- dlls/mmdevapi/devenum.c | 33 +++++++++++++++++++++++++++++++++ dlls/mmdevapi/main.c | 3 +++ dlls/mmdevapi/mmdevapi.h | 2 ++ 3 files changed, 38 insertions(+) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index e2a7cc5..56f770a 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -264,6 +264,25 @@ static HRESULT MMDevice_SetPropValue(const GUID *devguid, DWORD flow, REFPROPERT return hr; } +static HRESULT set_driver_prop_value(GUID *id, const EDataFlow flow, const PROPERTYKEY *prop) +{ + HRESULT hr; + PROPVARIANT pv; + + if (!drvs.pGetPropValue) + return E_NOTIMPL; + + hr = drvs.pGetPropValue(id, prop, &pv); + + if (SUCCEEDED(hr)) + { + MMDevice_SetPropValue(id, flow, prop, &pv); + PropVariantClear(&pv); + } + + return hr; +} + /* Creates or updates the state of a device * If GUID is null, a random guid will be assigned * and the device will be created @@ -279,6 +298,10 @@ static MMDevice *MMDevice_Create(WCHAR *name, GUID *id, EDataFlow flow, DWORD st {0x233164c8, 0x1b2c, 0x4c7d, {0xbc, 0x68, 0xb6, 0x71, 0x68, 0x7a, 0x25, 0x67}}, 1 }; + static const PROPERTYKEY devicepath_key = { + {0xb3f8fa53, 0x0004, 0x438e, {0x90, 0x03, 0x51, 0xa4, 0x6e, 0x13, 0x9b, 0xfc}}, 2 + }; + for (i = 0; i < MMDevice_count; ++i) { MMDevice *device = MMDevice_head[i]; @@ -338,6 +361,16 @@ static MMDevice *MMDevice_Create(WCHAR *name, GUID *id, EDataFlow flow, DWORD st pv.u.pwszVal = guidstr; MMDevice_SetPropValue(id, flow, &deviceinterface_key, &pv); + set_driver_prop_value(id, flow, &devicepath_key); + + if (FAILED(set_driver_prop_value(id, flow, &PKEY_AudioEndpoint_FormFactor))) + { + pv.vt = VT_UI4; + pv.u.ulVal = (flow == eCapture) ? Microphone : Speakers; + + MMDevice_SetPropValue(id, flow, &PKEY_AudioEndpoint_FormFactor, &pv); + } + RegCloseKey(keyprop); } RegCloseKey(key); diff --git a/dlls/mmdevapi/main.c b/dlls/mmdevapi/main.c index 447813f..52cf6f1 100644 --- a/dlls/mmdevapi/main.c +++ b/dlls/mmdevapi/main.c @@ -97,6 +97,9 @@ static BOOL load_driver(const WCHAR *name, DriverFuncs *driver) LDFC(GetAudioSessionManager); #undef LDFC + /* optional - do not fail if not found */ + driver->pGetPropValue = (void*)GetProcAddress(driver->module, "GetPropValue"); + driver->priority = driver->pGetPriority(); lstrcpyW(driver->module_name, driver_module); diff --git a/dlls/mmdevapi/mmdevapi.h b/dlls/mmdevapi/mmdevapi.h index 2a04780..2b40a05 100644 --- a/dlls/mmdevapi/mmdevapi.h +++ b/dlls/mmdevapi/mmdevapi.h @@ -54,6 +54,8 @@ typedef struct _DriverFuncs { IAudioClient **out); HRESULT (WINAPI *pGetAudioSessionManager)(IMMDevice *device, IAudioSessionManager2 **out); + HRESULT (WINAPI *pGetPropValue)(GUID *guid, + const PROPERTYKEY *prop, PROPVARIANT *out); } DriverFuncs; extern DriverFuncs drvs DECLSPEC_HIDDEN;

1 0

Mark Harmstone : winealsa: Implement GetPropValue and return device path.
by Alexandre Julliard 04 Dec '14

04 Dec '14

Module: wine Branch: master Commit: a73669aed8d21fa68cef46ec75062ca4dcdcab07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a73669aed8d21fa68cef46ec7… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Thu Dec 4 17:59:20 2014 +0000 winealsa: Implement GetPropValue and return device path. --- dlls/winealsa.drv/mmdevdrv.c | 108 ++++++++++++++++++++++++++++++++++++ dlls/winealsa.drv/winealsa.drv.spec | 1 + 2 files changed, 109 insertions(+) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 5ad72f9..827cdd8 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -3823,3 +3823,111 @@ HRESULT WINAPI AUDDRV_GetAudioSessionManager(IMMDevice *device, return S_OK; } + +enum AudioDeviceConnectionType { + AudioDeviceConnectionType_Unknown = 0, + AudioDeviceConnectionType_PCI, + AudioDeviceConnectionType_USB +}; + +HRESULT WINAPI AUDDRV_GetPropValue(GUID *guid, const PROPERTYKEY *prop, PROPVARIANT *out) +{ + static const PROPERTYKEY devicepath_key = { /* undocumented? - {b3f8fa53-0004-438e-9003-51a46e139bfc},2 */ + {0xb3f8fa53, 0x0004, 0x438e, {0x90, 0x03, 0x51, 0xa4, 0x6e, 0x13, 0x9b, 0xfc}}, 2 + }; + + TRACE("%s, (%s,%u), %p\n", wine_dbgstr_guid(guid), wine_dbgstr_guid(&prop->fmtid), prop->pid, out); + + if(IsEqualPropertyKey(*prop, devicepath_key)) + { + char name[256], uevent[MAX_PATH]; + EDataFlow flow; + FILE *fuevent; + int card, device; + + if(!get_alsa_name_by_guid(guid, name, sizeof(name), &flow)) + { + WARN("Unknown interface %s\n", debugstr_guid(guid)); + return E_NOINTERFACE; + } + + /* only implemented for identifiable devices, i.e. not "default" */ + if(!sscanf(name, "plughw:%u,%u", &card, &device)) + return E_NOTIMPL; + + sprintf(uevent, "/sys/class/sound/card%u/device/uevent", card); + fuevent = fopen(uevent, "r"); + + if(fuevent){ + enum AudioDeviceConnectionType connection = AudioDeviceConnectionType_Unknown; + USHORT vendor_id = 0, product_id = 0; + char line[256]; + + while (fgets(line, sizeof(line), fuevent)) { + char *val; + size_t val_len; + + if((val = strchr(line, '='))) { + val[0] = 0; + val++; + + val_len = strlen(val); + if(val_len > 0 && val[val_len - 1] == '\n') { val[val_len - 1] = 0; } + + if(!strcmp(line, "PCI_ID")){ + connection = AudioDeviceConnectionType_PCI; + if(sscanf(val, "%hX:%hX", &vendor_id, &product_id)<2){ + WARN("Unexpected input when reading PCI_ID in uevent file.\n"); + connection = AudioDeviceConnectionType_Unknown; + break; + } + }else if(!strcmp(line, "DEVTYPE") && !strcmp(val,"usb_interface")) + connection = AudioDeviceConnectionType_USB; + else if(!strcmp(line, "PRODUCT")) + if(sscanf(val, "%hx/%hx/", &vendor_id, &product_id)<2){ + WARN("Unexpected input when reading PRODUCT in uevent file.\n"); + connection = AudioDeviceConnectionType_Unknown; + break; + } + } + } + + fclose(fuevent); + + if(connection == AudioDeviceConnectionType_USB || connection == AudioDeviceConnectionType_PCI){ + static const WCHAR usbformatW[] = { '{','1','}','.','U','S','B','\\','V','I','D','_', + '%','0','4','X','&','P','I','D','_','%','0','4','X','\\', + '%','u','&','%','0','8','X',0 }; /* "{1}.USB\VID_%04X&PID_%04X\%u&%08X" */ + static const WCHAR pciformatW[] = { '{','1','}','.','H','D','A','U','D','I','O','\\','F','U','N','C','_','0','1','&', + 'V','E','N','_','%','0','4','X','&','D','E','V','_', + '%','0','4','X','\\','%','u','&','%','0','8','X',0 }; /* "{1}.HDAUDIO\FUNC_01&VEN_%04X&DEV_%04X\%u&%08X" */ + UINT serial_number; + + /* As hardly any audio devices have serial numbers, Windows instead + appears to use a persistent random number. We emulate this here + by instead using the last 8 hex digits of the GUID. */ + serial_number = (guid->Data4[4] << 24) | (guid->Data4[5] << 16) | (guid->Data4[6] << 8) | guid->Data4[7]; + + out->vt = VT_LPWSTR; + out->u.pwszVal = CoTaskMemAlloc(128 * sizeof(WCHAR)); + + if(!out->u.pwszVal) + return E_OUTOFMEMORY; + + if(connection == AudioDeviceConnectionType_USB) + sprintfW( out->u.pwszVal, usbformatW, vendor_id, product_id, device, serial_number); + else if(connection == AudioDeviceConnectionType_PCI) + sprintfW( out->u.pwszVal, pciformatW, vendor_id, product_id, device, serial_number); + + return S_OK; + } + }else{ + WARN("Could not open %s for reading\n", uevent); + return E_NOTIMPL; + } + } + + TRACE("Unimplemented property %s,%u\n", wine_dbgstr_guid(&prop->fmtid), prop->pid); + + return E_NOTIMPL; +} diff --git a/dlls/winealsa.drv/winealsa.drv.spec b/dlls/winealsa.drv/winealsa.drv.spec index 04fa05a..bd83ea2 100644 --- a/dlls/winealsa.drv/winealsa.drv.spec +++ b/dlls/winealsa.drv/winealsa.drv.spec @@ -8,3 +8,4 @@ @ stdcall -private GetEndpointIDs(long ptr ptr ptr ptr) AUDDRV_GetEndpointIDs @ stdcall -private GetAudioEndpoint(ptr ptr ptr) AUDDRV_GetAudioEndpoint @ stdcall -private GetAudioSessionManager(ptr ptr) AUDDRV_GetAudioSessionManager +@ stdcall -private GetPropValue(ptr ptr ptr) AUDDRV_GetPropValue

1 0

Andrew Eikum : Revert "winmm: Increase mmdevapi buffer sizes.".
by Alexandre Julliard 04 Dec '14

04 Dec '14

Module: wine Branch: master Commit: 5b7e49e84a44be9b837716d60961646e4cee0933 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b7e49e84a44be9b837716d60… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Dec 3 13:56:53 2014 -0600 Revert "winmm: Increase mmdevapi buffer sizes.". This reverts commit fdfff7cf6013a030f2b240b13b02831e502d49e7. In theory, this commit should have had no affect on winmm-using applications and just prevented underruns on the mmdevapi side. But Patrol Falcon abuses the winmm API by modifying the buffer after passing it to waveOutWrite, and this patch breaks that behavior. We've improved the winecoreaudio driver since this patch was sent, and so large buffers should no longer be necessary to avoid underruns. --- dlls/winmm/waveform.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 8d7f8ad..32083b8 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -68,8 +68,8 @@ static const WCHAR muteW[] = {'M','u','t','e',0}; * - We must be able to identify bad devices without crashing. */ -/* buffer size = 100 * 100000 (100 ns) = 1 second */ -#define AC_BUFLEN (100 * 100000) +/* buffer size = 10 * 100000 (100 ns) = 0.1 seconds */ +#define AC_BUFLEN (10 * 100000) #define MAX_DEVICES 256 #define MAPPER_INDEX 0x3F

1 0

Andrew Eikum : dsound: Report buffer notifications in offset order.
by Alexandre Julliard 04 Dec '14

04 Dec '14

Module: wine Branch: master Commit: ee126c96f128fdd52aca763ce89f08bc156556d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee126c96f128fdd52aca763ce… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Dec 3 14:06:38 2014 -0600 dsound: Report buffer notifications in offset order. --- dlls/dsound/buffer.c | 22 +++++++++++ dlls/dsound/mixer.c | 99 +++++++++++++++++++++++++++------------------- dlls/dsound/tests/dsound.c | 84 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 165 insertions(+), 40 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index e8fc5f3..9794b84 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -81,6 +81,27 @@ static ULONG WINAPI IDirectSoundNotifyImpl_Release(IDirectSoundNotify *iface) return ref; } +static int notify_compar(const void *l, const void *r) +{ + const DSBPOSITIONNOTIFY *left = l; + const DSBPOSITIONNOTIFY *right = r; + + /* place DSBPN_OFFSETSTOP at the start of the sorted array */ + if(left->dwOffset == DSBPN_OFFSETSTOP){ + if(right->dwOffset != DSBPN_OFFSETSTOP) + return -1; + }else if(right->dwOffset == DSBPN_OFFSETSTOP) + return 1; + + if(left->dwOffset == right->dwOffset) + return 0; + + if(left->dwOffset < right->dwOffset) + return -1; + + return 1; +} + static HRESULT WINAPI IDirectSoundNotifyImpl_SetNotificationPositions(IDirectSoundNotify *iface, DWORD howmuch, const DSBPOSITIONNOTIFY *notify) { @@ -113,6 +134,7 @@ static HRESULT WINAPI IDirectSoundNotifyImpl_SetNotificationPositions(IDirectSou } CopyMemory(This->notifies, notify, howmuch * sizeof(DSBPOSITIONNOTIFY)); This->nrofnotifies = howmuch; + qsort(This->notifies, howmuch, sizeof(DSBPOSITIONNOTIFY), notify_compar); } else { HeapFree(GetProcessHeap(), 0, This->notifies); This->notifies = NULL; diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 43b7dca..8d6b379 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -183,48 +183,67 @@ void DSOUND_RecalcFormat(IDirectSoundBufferImpl *dsb) */ void DSOUND_CheckEvent(const IDirectSoundBufferImpl *dsb, DWORD playpos, int len) { - int i; - DWORD offset; - LPDSBPOSITIONNOTIFY event; - TRACE("(%p,%d)\n",dsb,len); + int first, left, right, check; - if (dsb->nrofnotifies == 0) - return; + if(dsb->nrofnotifies == 0) + return; - TRACE("(%p) buflen = %d, playpos = %d, len = %d\n", - dsb, dsb->buflen, playpos, len); - for (i = 0; i < dsb->nrofnotifies ; i++) { - event = dsb->notifies + i; - offset = event->dwOffset; - TRACE("checking %d, position %d, event = %p\n", - i, offset, event->hEventNotify); - /* DSBPN_OFFSETSTOP has to be the last element. So this is */ - /* OK. [Inside DirectX, p274] */ - /* Windows does not seem to enforce this, and some apps rely */ - /* on that, so we can't stop there. */ - /* */ - /* This also means we can't sort the entries by offset, */ - /* because DSBPN_OFFSETSTOP == -1 */ - if (offset == DSBPN_OFFSETSTOP) { - if (dsb->state == STATE_STOPPED) { - SetEvent(event->hEventNotify); - TRACE("signalled event %p (%d)\n", event->hEventNotify, i); - } - continue; - } - if ((playpos + len) >= dsb->buflen) { - if ((offset < ((playpos + len) % dsb->buflen)) || - (offset >= playpos)) { - TRACE("signalled event %p (%d)\n", event->hEventNotify, i); - SetEvent(event->hEventNotify); - } - } else { - if ((offset >= playpos) && (offset < (playpos + len))) { - TRACE("signalled event %p (%d)\n", event->hEventNotify, i); - SetEvent(event->hEventNotify); - } - } - } + if(dsb->state == STATE_STOPPED){ + TRACE("Stopped...\n"); + /* DSBPN_OFFSETSTOP notifies are always at the start of the sorted array */ + for(left = 0; left < dsb->nrofnotifies; ++left){ + if(dsb->notifies[left].dwOffset != DSBPN_OFFSETSTOP) + break; + + TRACE("Signalling %p\n", dsb->notifies[left].hEventNotify); + SetEvent(dsb->notifies[left].hEventNotify); + } + return; + } + + for(first = 0; first < dsb->nrofnotifies && dsb->notifies[first].dwOffset == DSBPN_OFFSETSTOP; ++first) + ; + + if(first == dsb->nrofnotifies) + return; + + check = left = first; + right = dsb->nrofnotifies - 1; + + /* find leftmost notify that is greater than playpos */ + while(left != right){ + check = left + (right - left) / 2; + if(dsb->notifies[check].dwOffset < playpos) + left = check + 1; + else if(dsb->notifies[check].dwOffset > playpos) + right = check; + else{ + left = check; + break; + } + } + + TRACE("Not stopped: first notify: %u (%u), range: [%u,%u)\n", first, + dsb->notifies[check].dwOffset, playpos, (playpos + len) % dsb->buflen); + + /* send notifications in range */ + for(check = left; check < dsb->nrofnotifies; ++check){ + if(dsb->notifies[check].dwOffset >= playpos + len) + break; + + TRACE("Signalling %p (%u)\n", dsb->notifies[check].hEventNotify, dsb->notifies[check].dwOffset); + SetEvent(dsb->notifies[check].hEventNotify); + } + + if(playpos + len > dsb->buflen){ + for(check = first; check < left; ++check){ + if(dsb->notifies[check].dwOffset >= (playpos + len) % dsb->buflen) + break; + + TRACE("Signalling %p (%u)\n", dsb->notifies[check].hEventNotify, dsb->notifies[check].dwOffset); + SetEvent(dsb->notifies[check].hEventNotify); + } + } } static inline float get_current_sample(const IDirectSoundBufferImpl *dsb, diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index 10a1032..1df7ce4 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -1486,6 +1486,89 @@ done: return S_OK; } +static void test_notifications(LPGUID lpGuid) +{ + HRESULT rc; + IDirectSound *dso; + IDirectSoundBuffer *buf; + IDirectSoundNotify *buf_notif; + DSBUFFERDESC bufdesc; + WAVEFORMATEX wfx; + DSBPOSITIONNOTIFY notifies[2]; + HANDLE handles[2]; + DWORD expect; + int cycles; + + rc = pDirectSoundCreate(lpGuid, &dso, NULL); + ok(rc == DS_OK || rc == DSERR_NODRIVER || rc == DSERR_ALLOCATED, + "DirectSoundCreate() failed: %08x\n", rc); + if(rc != DS_OK) + return; + + rc = IDirectSound_SetCooperativeLevel(dso, get_hwnd(), DSSCL_PRIORITY); + ok(rc == DS_OK, "IDirectSound_SetCooperativeLevel() failed: %08x\n", rc); + if(rc != DS_OK){ + IDirectSound_Release(dso); + return; + } + + wfx.wFormatTag = WAVE_FORMAT_PCM; + wfx.nChannels = 1; + wfx.nSamplesPerSec = 44100; + wfx.wBitsPerSample = 16; + wfx.nBlockAlign = wfx.nChannels * wfx.wBitsPerSample / 8; + wfx.nAvgBytesPerSec = wfx.nSamplesPerSec * wfx.nBlockAlign; + wfx.cbSize = 0; + + ZeroMemory(&bufdesc, sizeof(bufdesc)); + bufdesc.dwSize = sizeof(bufdesc); + bufdesc.dwFlags = DSBCAPS_CTRLPOSITIONNOTIFY; + bufdesc.dwBufferBytes = wfx.nSamplesPerSec * wfx.nBlockAlign / 2; /* 0.5s */ + bufdesc.lpwfxFormat = &wfx; + rc = IDirectSound_CreateSoundBuffer(dso, &bufdesc, &buf, NULL); + ok(rc == DS_OK && buf != NULL, "IDirectSound_CreateSoundBuffer() failed " + "to create a buffer %08x\n", rc); + + rc = IDirectSoundBuffer_QueryInterface(buf, &IID_IDirectSoundNotify, (void**)&buf_notif); + ok(rc == DS_OK, "QueryInterface(IID_IDirectSoundNotify): %08x\n", rc); + + /* create notifications at each end of the buffer */ + notifies[0].dwOffset = 0; + handles[0] = notifies[0].hEventNotify = CreateEventW(NULL, FALSE, FALSE, NULL); + notifies[1].dwOffset = bufdesc.dwBufferBytes - 1; + handles[1] = notifies[1].hEventNotify = CreateEventW(NULL, FALSE, FALSE, NULL); + + rc = IDirectSoundNotify_SetNotificationPositions(buf_notif, 2, notifies); + ok(rc == DS_OK, "SetNotificationPositions: %08x\n", rc); + + IDirectSoundNotify_Release(buf_notif); + + rc = IDirectSoundBuffer_Play(buf, 0, 0, DSBPLAY_LOOPING); + ok(rc == DS_OK, "Play: %08x\n", rc); + + expect = 0; + for(cycles = 0; cycles < 6 /* 1.5s */; ++cycles){ + DWORD wait; + + /* since the notifications are on opposite ends of the entire buffer, + * they should arrive well-ordered in an alternating sequence. */ + wait = WaitForMultipleObjects(2, handles, FALSE, 1000); + ok(wait <= WAIT_OBJECT_0 + 1 && wait - WAIT_OBJECT_0 == expect, + "Got unexpected notification order or timeout: %u\n", wait); + + expect = !expect; + } + + rc = IDirectSoundBuffer_Stop(buf); + ok(rc == DS_OK, "Stop: %08x\n", rc); + + CloseHandle(notifies[0].hEventNotify); + CloseHandle(notifies[1].hEventNotify); + + IDirectSoundBuffer_Release(buf); + IDirectSound_Release(dso); +} + static unsigned int number; static BOOL WINAPI dsenum_callback(LPGUID lpGuid, LPCSTR lpcstrDescription, @@ -1516,6 +1599,7 @@ static BOOL WINAPI dsenum_callback(LPGUID lpGuid, LPCSTR lpcstrDescription, test_frequency(lpGuid); test_duplicate(lpGuid); test_invalid_fmts(lpGuid); + test_notifications(lpGuid); } return TRUE;

1 0

André Hentschel : winedbg: Remove unused code (Clang) .
by Alexandre Julliard 04 Dec '14

04 Dec '14

Module: wine Branch: master Commit: 657933e135265ffd221c9003603fa147ba0da3d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=657933e135265ffd221c90036… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Dec 3 23:53:31 2014 +0100 winedbg: Remove unused code (Clang). --- programs/winedbg/break.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/programs/winedbg/break.c b/programs/winedbg/break.c index eed03d9..c0d5663 100644 --- a/programs/winedbg/break.c +++ b/programs/winedbg/break.c @@ -492,14 +492,6 @@ void break_delete_xpoint(int num) bp[num].skipcount = 0; } -static inline BOOL module_is_container(const IMAGEHLP_MODULE* wmod_cntnr, - const IMAGEHLP_MODULE* wmod_child) -{ - return wmod_cntnr->BaseOfImage <= wmod_child->BaseOfImage && - wmod_cntnr->BaseOfImage + wmod_cntnr->ImageSize >= - wmod_child->BaseOfImage + wmod_child->ImageSize; -} - /****************************************************************** * break_delete_xpoints_from_module *

1 0

André Hentschel : wintrust: Remove unused variable ( Clang).
by Alexandre Julliard 04 Dec '14

04 Dec '14

Module: wine Branch: master Commit: dc4d32953fd0fde76974c798e22cf18b174bd260 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc4d32953fd0fde76974c798e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Dec 3 23:53:35 2014 +0100 wintrust: Remove unused variable (Clang). --- dlls/wintrust/tests/asn.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/wintrust/tests/asn.c b/dlls/wintrust/tests/asn.c index a9955ac..82feac6 100644 --- a/dlls/wintrust/tests/asn.c +++ b/dlls/wintrust/tests/asn.c @@ -305,8 +305,6 @@ static void test_decodeSPCLink(void) static const BYTE emptySequence[] = { 0x30,0x00 }; static BYTE flags[] = { 1 }; static const BYTE onlyFlagsPEImage[] = { 0x30,0x04,0x03,0x02,0x00,0x01 }; -static const BYTE moreFlagsPEImage[] = { -0x30,0x06,0x03,0x04,0x04,0xff,0x80,0x10 }; static const BYTE onlyEmptyFilePEImage[] = { 0x30,0x06,0xa0,0x04,0xa2,0x02,0x80,0x00 }; static const BYTE flagsAndEmptyFilePEImage[] = {

1 0

André Hentschel : user32/tests: Remove unused variables (Clang).
by Alexandre Julliard 04 Dec '14

04 Dec '14

Module: wine Branch: master Commit: f5f0b8bbc6d49d9c9cc449fc80de1a4145b68088 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5f0b8bbc6d49d9c9cc449fc8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Dec 3 23:53:38 2014 +0100 user32/tests: Remove unused variables (Clang). --- dlls/user32/tests/msg.c | 112 ------------------------------------------------ 1 file changed, 112 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 778b3cf..b243a74 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -1172,51 +1172,6 @@ static const struct message WmDestroyInvisibleChildSeq[] = { { WM_NCDESTROY, sent }, { 0 } }; -/* Moving the mouse in nonclient area */ -static const struct message WmMouseMoveInNonClientAreaSeq[] = { /* FIXME: add */ - { WM_NCHITTEST, sent }, - { WM_SETCURSOR, sent }, - { WM_NCMOUSEMOVE, posted }, - { 0 } -}; -/* Moving the mouse in client area */ -static const struct message WmMouseMoveInClientAreaSeq[] = { /* FIXME: add */ - { WM_NCHITTEST, sent }, - { WM_SETCURSOR, sent }, - { WM_MOUSEMOVE, posted }, - { 0 } -}; -/* Moving by dragging the title bar (after WM_NCHITTEST and WM_SETCURSOR) (outline move) */ -static const struct message WmDragTitleBarSeq[] = { /* FIXME: add */ - { WM_NCLBUTTONDOWN, sent|wparam, HTCAPTION }, - { WM_SYSCOMMAND, sent|defwinproc|wparam, SC_MOVE+2 }, - { WM_GETMINMAXINFO, sent|defwinproc }, - { WM_ENTERSIZEMOVE, sent|defwinproc }, - { WM_WINDOWPOSCHANGING, sent|wparam|defwinproc, 0 }, - { WM_WINDOWPOSCHANGED, sent|wparam|defwinproc, 0 }, - { WM_MOVE, sent|defwinproc }, - { WM_EXITSIZEMOVE, sent|defwinproc }, - { 0 } -}; -/* Sizing by dragging the thick borders (after WM_NCHITTEST and WM_SETCURSOR) (outline move) */ -static const struct message WmDragThickBordersBarSeq[] = { /* FIXME: add */ - { WM_NCLBUTTONDOWN, sent|wparam, 0xd }, - { WM_SYSCOMMAND, sent|defwinproc|wparam, 0xf004 }, - { WM_GETMINMAXINFO, sent|defwinproc }, - { WM_ENTERSIZEMOVE, sent|defwinproc }, - { WM_SIZING, sent|defwinproc|wparam, 4}, /* one for each mouse movement */ - { WM_WINDOWPOSCHANGING, sent|wparam|defwinproc, 0 }, - { WM_GETMINMAXINFO, sent|defwinproc }, - { WM_NCCALCSIZE, sent|defwinproc|wparam, 1 }, - { WM_NCPAINT, sent|defwinproc|wparam, 1 }, - { WM_GETTEXT, sent|defwinproc }, - { WM_ERASEBKGND, sent|defwinproc }, - { WM_WINDOWPOSCHANGED, sent|wparam|defwinproc, 0 }, - { WM_MOVE, sent|defwinproc }, - { WM_SIZE, sent|defwinproc|wparam, SIZE_RESTORED }, - { WM_EXITSIZEMOVE, sent|defwinproc }, - { 0 } -}; /* Resizing child window with MoveWindow (32) */ static const struct message WmResizingChildWithMoveWindowSeq[] = { { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOACTIVATE }, @@ -1229,41 +1184,6 @@ static const struct message WmResizingChildWithMoveWindowSeq[] = { { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, { 0 } }; -/* Clicking on inactive button */ -static const struct message WmClickInactiveButtonSeq[] = { /* FIXME: add */ - { WM_NCHITTEST, sent }, - { WM_PARENTNOTIFY, sent|parent|wparam, WM_LBUTTONDOWN }, - { WM_MOUSEACTIVATE, sent }, - { WM_MOUSEACTIVATE, sent|parent|defwinproc }, - { WM_SETCURSOR, sent }, - { WM_SETCURSOR, sent|parent|defwinproc }, - { WM_LBUTTONDOWN, posted }, - { WM_KILLFOCUS, posted|parent }, - { WM_SETFOCUS, posted }, - { WM_CTLCOLORBTN, posted|parent }, - { BM_SETSTATE, posted }, - { WM_CTLCOLORBTN, posted|parent }, - { WM_LBUTTONUP, posted }, - { BM_SETSTATE, posted }, - { WM_CTLCOLORBTN, posted|parent }, - { WM_COMMAND, posted|parent }, - { 0 } -}; -/* Reparenting a button (16/32) */ -/* The last child (button) reparented gets topmost for its new parent. */ -static const struct message WmReparentButtonSeq[] = { /* FIXME: add */ - { WM_SHOWWINDOW, sent|wparam, 0 }, - { WM_WINDOWPOSCHANGING, sent|wparam, SWP_HIDEWINDOW|SWP_NOACTIVATE|SWP_NOMOVE|SWP_NOSIZE }, - { EVENT_OBJECT_HIDE, winevent_hook|wparam|lparam, 0, 0 }, - { WM_ERASEBKGND, sent|parent }, - { WM_WINDOWPOSCHANGED, sent|wparam, SWP_HIDEWINDOW|SWP_NOACTIVATE|SWP_NOMOVE|SWP_NOSIZE }, - { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE }, - { WM_CHILDACTIVATE, sent }, - { WM_WINDOWPOSCHANGED, sent|wparam, SWP_NOSIZE|SWP_NOREDRAW }, - { WM_MOVE, sent|defwinproc }, - { WM_SHOWWINDOW, sent|wparam, 1 }, - { 0 } -}; /* Creation of a custom dialog (32) */ static const struct message WmCreateCustomDialogSeq[] = { { HCBT_CREATEWND, hook }, @@ -1464,35 +1384,6 @@ static const struct message WmModalDialogSeq[] = { { WM_NCDESTROY, sent }, { 0 } }; -/* Creation of a modal dialog that is resized inside WM_INITDIALOG (32) */ -static const struct message WmCreateModalDialogResizeSeq[] = { /* FIXME: add */ - /* (inside dialog proc, handling WM_INITDIALOG) */ - { WM_WINDOWPOSCHANGING, sent|wparam, 0 }, - { WM_NCCALCSIZE, sent }, - { WM_NCACTIVATE, sent|parent|wparam, 0 }, - { WM_GETTEXT, sent|defwinproc }, - { WM_ACTIVATE, sent|parent|wparam, 0 }, - { WM_WINDOWPOSCHANGING, sent|wparam, 0 }, - { WM_WINDOWPOSCHANGING, sent|parent }, - { WM_NCACTIVATE, sent|wparam, 1 }, - { WM_ACTIVATE, sent|wparam, 1 }, - { WM_WINDOWPOSCHANGED, sent|wparam, 0 }, - { WM_SIZE, sent|defwinproc|wparam, SIZE_RESTORED }, - /* (setting focus) */ - { WM_SHOWWINDOW, sent|wparam, 1 }, - { WM_WINDOWPOSCHANGING, sent|wparam, 0 }, - { WM_NCPAINT, sent }, - { WM_GETTEXT, sent|defwinproc }, - { WM_ERASEBKGND, sent }, - { WM_CTLCOLORDLG, sent|defwinproc }, - { WM_WINDOWPOSCHANGED, sent|wparam, 0 }, - { WM_PAINT, sent }, - /* (bunch of WM_CTLCOLOR* for each control) */ - { WM_PAINT, sent|parent }, - { WM_ENTERIDLE, sent|parent|wparam, 0 }, - { WM_SETCURSOR, sent|parent }, - { 0 } -}; /* SetMenu for NonVisible windows with size change*/ static const struct message WmSetMenuNonVisibleSizeChangeSeq[] = { { WM_WINDOWPOSCHANGING, sent|wparam, SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE }, @@ -14107,9 +13998,6 @@ static const struct message WmSetFocus_3[] = { { HCBT_SETFOCUS, hook }, /* child */ { 0 } }; -static const struct message WmSetFocus_4[] = { - { 0 } -}; static void test_SetFocus(void) {

1 0