January 2012 - Wine-commits

Jörg Höhle : winealsa: Map ALSA errors to AUDCLNT_E_*.
by Alexandre Julliard 26 Jan '12

26 Jan '12

Module: wine Branch: master Commit: ef111ce1389c542a5f0b7eaa456aeecbc17dba8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef111ce1389c542a5f0b7eaa4… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Mon Jan 9 19:04:42 2012 +0100 winealsa: Map ALSA errors to AUDCLNT_E_*. --- dlls/winealsa.drv/mmdevdrv.c | 29 +++++++++++++++++------------ 1 files changed, 17 insertions(+), 12 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index af94add..5da8ec9 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -579,7 +579,12 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(const char *key, IMMDevice *dev, if(err < 0){ HeapFree(GetProcessHeap(), 0, This); WARN("Unable to open PCM \"%s\": %d (%s)\n", key, err, snd_strerror(err)); - return E_FAIL; + switch(err){ + case EBUSY: + return AUDCLNT_E_DEVICE_IN_USE; + default: + return AUDCLNT_E_ENDPOINT_CREATE_FAILED; + } } This->hw_params = HeapAlloc(GetProcessHeap(), 0, @@ -1241,7 +1246,7 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface, EnterCriticalSection(&This->lock); if((err = snd_pcm_hw_params_any(This->pcm_handle, This->hw_params)) < 0){ - hr = E_FAIL; + hr = AUDCLNT_E_DEVICE_INVALIDATED; goto exit; } @@ -1267,13 +1272,13 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface, } if((err = snd_pcm_hw_params_get_rate_min(This->hw_params, &min, NULL)) < 0){ - hr = E_FAIL; + hr = AUDCLNT_E_DEVICE_INVALIDATED; WARN("Unable to get min rate: %d (%s)\n", err, snd_strerror(err)); goto exit; } if((err = snd_pcm_hw_params_get_rate_max(This->hw_params, &max, NULL)) < 0){ - hr = E_FAIL; + hr = AUDCLNT_E_DEVICE_INVALIDATED; WARN("Unable to get max rate: %d (%s)\n", err, snd_strerror(err)); goto exit; } @@ -1284,13 +1289,13 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface, } if((err = snd_pcm_hw_params_get_channels_min(This->hw_params, &min)) < 0){ - hr = E_FAIL; + hr = AUDCLNT_E_DEVICE_INVALIDATED; WARN("Unable to get min channels: %d (%s)\n", err, snd_strerror(err)); goto exit; } if((err = snd_pcm_hw_params_get_channels_max(This->hw_params, &max)) < 0){ - hr = E_FAIL; + hr = AUDCLNT_E_DEVICE_INVALIDATED; WARN("Unable to get max channels: %d (%s)\n", err, snd_strerror(err)); goto exit; } @@ -1365,7 +1370,7 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, if((err = snd_pcm_hw_params_any(This->pcm_handle, This->hw_params)) < 0){ WARN("Unable to get hw_params: %d (%s)\n", err, snd_strerror(err)); - hr = E_FAIL; + hr = AUDCLNT_E_DEVICE_INVALIDATED; goto exit; } @@ -1389,14 +1394,14 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, fmt->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; }else{ ERR("Didn't recognize any available ALSA formats\n"); - hr = E_FAIL; + hr = AUDCLNT_E_DEVICE_INVALIDATED; goto exit; } if((err = snd_pcm_hw_params_get_channels_max(This->hw_params, &max_channels)) < 0){ WARN("Unable to get max channels: %d (%s)\n", err, snd_strerror(err)); - hr = E_FAIL; + hr = AUDCLNT_E_DEVICE_INVALIDATED; goto exit; } @@ -1410,7 +1415,7 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, if((err = snd_pcm_hw_params_get_rate_max(This->hw_params, &max_rate, NULL)) < 0){ WARN("Unable to get max rate: %d (%s)\n", err, snd_strerror(err)); - hr = E_FAIL; + hr = AUDCLNT_E_DEVICE_INVALIDATED; goto exit; } @@ -1426,7 +1431,7 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, fmt->Format.nSamplesPerSec = 8000; else{ ERR("Unknown max rate: %u\n", max_rate); - hr = E_FAIL; + hr = AUDCLNT_E_DEVICE_INVALIDATED; goto exit; } @@ -1681,7 +1686,7 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient *iface) This, 0, This->mmdev_period_rt / 10000, WT_EXECUTEINTIMERTHREAD)){ LeaveCriticalSection(&This->lock); WARN("Unable to create timer: %u\n", GetLastError()); - return E_FAIL; + return E_OUTOFMEMORY; } This->started = TRUE;

1 0

Jörg Höhle : winealsa: Log the periodic renderer callback.
by Alexandre Julliard 26 Jan '12

26 Jan '12

Module: wine Branch: master Commit: 52c88ea725b4f5e8103bf9b47b2b3b1fe6e22ba1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52c88ea725b4f5e8103bf9b47… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sun Jan 1 23:59:39 2012 +0100 winealsa: Log the periodic renderer callback. --- dlls/winealsa.drv/mmdevdrv.c | 23 ++++++++--------------- 1 files changed, 8 insertions(+), 15 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 5da8ec9..fedd040 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1173,14 +1173,13 @@ static HRESULT WINAPI AudioClient_GetCurrentPadding(IAudioClient *iface, return AUDCLNT_E_NOT_INITIALIZED; } + /* padding is solely updated at callback time in shared mode */ *out = This->held_frames; - /* call required to get accurate snd_pcm_state() */ - snd_pcm_avail_update(This->pcm_handle); - TRACE("pad: %u, state: %u\n", *out, snd_pcm_state(This->pcm_handle)); - LeaveCriticalSection(&This->lock); + TRACE("pad: %u\n", *out); + return S_OK; } @@ -1522,7 +1521,7 @@ static void alsa_write_data(ACImpl *This) if(snd_pcm_state(This->pcm_handle) == SND_PCM_STATE_XRUN || avail > This->alsa_bufsize_frames){ - TRACE("XRun state, recovering\n"); + TRACE("XRun state avail %ld, recovering\n", avail); avail = This->alsa_bufsize_frames; @@ -1534,7 +1533,8 @@ static void alsa_write_data(ACImpl *This) if((err = snd_pcm_prepare(This->pcm_handle)) < 0) WARN("snd_pcm_prepare failed: %d (%s)\n", err, snd_strerror(err)); - } + }else + TRACE("pad: %ld\n", This->alsa_bufsize_frames - avail); if(This->held_frames == 0) return; @@ -1953,8 +1953,6 @@ static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, { ACImpl *This = impl_from_IAudioRenderClient(iface); UINT32 write_pos; - UINT32 pad; - HRESULT hr; TRACE("(%p)->(%u, %p)\n", This, frames, data); @@ -1974,13 +1972,8 @@ static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, return S_OK; } - hr = IAudioClient_GetCurrentPadding(&This->IAudioClient_iface, &pad); - if(FAILED(hr)){ - LeaveCriticalSection(&This->lock); - return hr; - } - - if(pad + frames > This->bufsize_frames){ + /* held_frames == GetCurrentPadding_nolock(); */ + if(This->held_frames + frames > This->bufsize_frames){ LeaveCriticalSection(&This->lock); return AUDCLNT_E_BUFFER_TOO_LARGE; }

1 0

Jörg Höhle : mmdevapi/tests: Perform capture protocol tests in shared mode.
by Alexandre Julliard 26 Jan '12

26 Jan '12

Module: wine Branch: master Commit: f24b31fcf2047e8b4d0d8b910c54c0815c54d1cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=f24b31fcf2047e8b4d0d8b910… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Thu Jan 12 22:36:31 2012 +0100 mmdevapi/tests: Perform capture protocol tests in shared mode. --- dlls/mmdevapi/tests/capture.c | 327 +++++++++++++++++++++++++++++++++++++--- 1 files changed, 302 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f24b31fcf2047e8b4d0d8…

1 0

Jörg Höhle : mmdevapi/tests: Add a worst-case XAudio2 fragment-size writes scenario.
by Alexandre Julliard 26 Jan '12

26 Jan '12

Module: wine Branch: master Commit: 4e323ec618ec57c11e9e9f345ca6a0e36a609b3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e323ec618ec57c11e9e9f345… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Jan 24 20:54:40 2012 +0100 mmdevapi/tests: Add a worst-case XAudio2 fragment-size writes scenario. --- dlls/mmdevapi/tests/render.c | 116 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 116 insertions(+), 0 deletions(-) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index f918460..2427be7 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -1532,6 +1532,121 @@ static void test_session_creation(void) IAudioClient_Release(ac); } +static void test_worst_case(void) +{ + HANDLE event; + HRESULT hr; + IAudioClient *ac; + IAudioRenderClient *arc; + IAudioClock *acl; + WAVEFORMATEX *pwfx; + REFERENCE_TIME defp; + UINT64 freq, pos, pcpos0, pcpos; + BYTE *data; + DWORD r; + UINT32 pad, fragment, sum; + int i,j; + + hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, + NULL, (void**)&ac); + ok(hr == S_OK, "Activation failed with %08x\n", hr); + if(hr != S_OK) + return; + + hr = IAudioClient_GetMixFormat(ac, &pwfx); + ok(hr == S_OK, "GetMixFormat failed: %08x\n", hr); + + hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, + AUDCLNT_STREAMFLAGS_EVENTCALLBACK, 500000, 0, pwfx, NULL); + ok(hr == S_OK, "Initialize failed: %08x\n", hr); + if(hr != S_OK) + return; + + hr = IAudioClient_GetDevicePeriod(ac, &defp, NULL); + ok(hr == S_OK, "GetDevicePeriod failed: %08x\n", hr); + + fragment = MulDiv(defp, pwfx->nSamplesPerSec, 10000000); + + event = CreateEventW(NULL, FALSE, FALSE, NULL); + ok(event != NULL, "CreateEvent failed\n"); + + hr = IAudioClient_SetEventHandle(ac, event); + ok(hr == S_OK, "SetEventHandle failed: %08x\n", hr); + + hr = IAudioClient_GetService(ac, &IID_IAudioRenderClient, (void**)&arc); + ok(hr == S_OK, "GetService(IAudioRenderClient) failed: %08x\n", hr); + + hr = IAudioClient_GetService(ac, &IID_IAudioClock, (void**)&acl); + ok(hr == S_OK, "GetService(IAudioClock) failed: %08x\n", hr); + + hr = IAudioClock_GetFrequency(acl, &freq); + ok(hr == S_OK, "GetFrequency failed: %08x\n", hr); + + for(j = 0; j <= (winetest_interactive ? 9 : 2); j++){ + sum = 0; + trace("Should play %ums continuous tone with fragment size %u.\n", + (ULONG)(defp/100), fragment); + + hr = IAudioClock_GetPosition(acl, &pos, &pcpos0); + ok(hr == S_OK, "GetPosition failed: %08x\n", hr); + + /* XAudio2 prefills one period, we don't */ + hr = IAudioClient_Start(ac); + ok(hr == S_OK, "Start failed: %08x\n", hr); + + for(i = 0; i <= 99; i++){ /* 100 x 10ms = 1 second */ + r = WaitForSingleObject(event, 70); + ok(r == WAIT_OBJECT_0, "Wait gave %x\n", r); + + /* the app has nearly one period time to feed data */ + Sleep((i % 10) * defp / 120000); + + hr = IAudioClient_GetCurrentPadding(ac, &pad); + ok(hr == S_OK, "GetCurrentPadding failed: %08x\n", hr); + + /* XAudio2 writes only when there's little data left */ + if(pad <= fragment){ + hr = IAudioRenderClient_GetBuffer(arc, fragment, &data); + ok(hr == S_OK, "GetBuffer failed: %08x\n", hr); + + /* fixme: produce audible output */ + hr = IAudioRenderClient_ReleaseBuffer(arc, fragment, AUDCLNT_BUFFERFLAGS_SILENT); + ok(hr == S_OK, "ReleaseBuffer failed: %08x\n", hr); + if(hr == S_OK) + sum += fragment; + } + } + + hr = IAudioClient_Stop(ac); + ok(hr == S_OK, "Stop failed: %08x\n", hr); + + hr = IAudioClient_GetCurrentPadding(ac, &pad); + ok(hr == S_OK, "GetCurrentPadding failed: %08x\n", hr); + + hr = IAudioClock_GetPosition(acl, &pos, &pcpos); + ok(hr == S_OK, "GetPosition failed: %08x\n", hr); + + Sleep(100); + + trace("Released %u=%ux%u -%u frames at %u worth %ums in %ums\n", + sum, sum/fragment, fragment, pad, + pwfx->nSamplesPerSec, MulDiv(sum-pad, 1000, pwfx->nSamplesPerSec), + (ULONG)((pcpos-pcpos0)/10000)); + + ok(pos * pwfx->nSamplesPerSec == (sum-pad) * freq, + "Position %u at end vs. %u-%u submitted frames\n", (UINT)pos, sum, pad); + + hr = IAudioClient_Reset(ac); + ok(hr == S_OK, "Reset failed: %08x\n", hr); + + Sleep(250); + } + + CoTaskMemFree(pwfx); + IAudioClient_Release(ac); + IAudioRenderClient_Release(arc); +} + START_TEST(render) { HRESULT hr; @@ -1568,6 +1683,7 @@ START_TEST(render) test_simplevolume(); test_volume_dependence(); test_session_creation(); + test_worst_case(); IMMDevice_Release(dev);

1 0

Nikolay Sivov : oleaut32: Some tests for ITypeLib::FindName(), corrected parameter validation.
by Alexandre Julliard 26 Jan '12

26 Jan '12

Module: wine Branch: master Commit: a23dbc5dc559764bb3ab49d4e0745022cf322eff URL: http://source.winehq.org/git/wine.git/?a=commit;h=a23dbc5dc559764bb3ab49d4e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 26 13:42:35 2012 +0300 oleaut32: Some tests for ITypeLib::FindName(), corrected parameter validation. --- dlls/oleaut32/tests/typelib.c | 78 +++++++++++++++++++++++++++++++++++++++- dlls/oleaut32/typelib.c | 45 ++++++++++++++--------- 2 files changed, 103 insertions(+), 20 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index c7c0f93..631f6d8 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -59,6 +59,8 @@ static HRESULT WINAPI (*pRegisterTypeLibForUser)(ITypeLib*,OLECHAR*,OLECHAR*); static HRESULT WINAPI (*pUnRegisterTypeLibForUser)(REFGUID,WORD,WORD,LCID,SYSKIND); static const WCHAR wszStdOle2[] = {'s','t','d','o','l','e','2','.','t','l','b',0}; +static WCHAR wszGUID[] = {'G','U','I','D',0}; +static WCHAR wszguid[] = {'g','u','i','d',0}; static const int is_win64 = sizeof(void *) > sizeof(int); @@ -116,8 +118,6 @@ static void test_TypeComp(void) static WCHAR wszUnchecked[] = {'U','n','c','h','e','c','k','e','d',0}; static WCHAR wszIUnknown[] = {'I','U','n','k','n','o','w','n',0}; static WCHAR wszFont[] = {'F','o','n','t',0}; - static WCHAR wszGUID[] = {'G','U','I','D',0}; - static WCHAR wszguid[] = {'g','u','i','d',0}; static WCHAR wszStdPicture[] = {'S','t','d','P','i','c','t','u','r','e',0}; static WCHAR wszOLE_COLOR[] = {'O','L','E','_','C','O','L','O','R',0}; static WCHAR wszClone[] = {'C','l','o','n','e',0}; @@ -3112,6 +3112,79 @@ static void test_SetVarDocString(void) DeleteFileA(filenameA); } +static void test_FindName(void) +{ + static const WCHAR invalidW[] = {'i','n','v','a','l','i','d',0}; + WCHAR buffW[100]; + MEMBERID memid; + ITypeInfo *ti; + ITypeLib *tl; + HRESULT hr; + UINT16 c; + + hr = LoadTypeLib(wszStdOle2, &tl); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ITypeLib_FindName(tl, NULL, 0, NULL, NULL, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + lstrcpyW(buffW, wszGUID); + hr = ITypeLib_FindName(tl, buffW, 0, NULL, NULL, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + c = 0; + ti = (void*)0xdeadbeef; + hr = ITypeLib_FindName(tl, buffW, 0, &ti, NULL, &c); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(c == 0, "got %d\n", c); + ok(ti == (void*)0xdeadbeef, "got %p\n", ti); + + c = 1; + ti = (void*)0xdeadbeef; + hr = ITypeLib_FindName(tl, buffW, 0, &ti, NULL, &c); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(c == 1, "got %d\n", c); + ok(ti == (void*)0xdeadbeef, "got %p\n", ti); + + c = 1; + memid = 0; + ti = (void*)0xdeadbeef; + hr = ITypeLib_FindName(tl, buffW, 0, &ti, &memid, &c); + ok(hr == S_OK, "got 0x%08x\n", hr); +todo_wine + ok(memid == -1, "got %d\n", memid); + ok(!lstrcmpW(buffW, wszGUID), "got %s\n", wine_dbgstr_w(buffW)); + ok(c == 1, "got %d\n", c); + ITypeInfo_Release(ti); + + c = 1; + memid = 0; + lstrcpyW(buffW, wszguid); + ti = (void*)0xdeadbeef; + hr = ITypeLib_FindName(tl, buffW, 0, &ti, &memid, &c); + ok(hr == S_OK, "got 0x%08x\n", hr); +todo_wine { + ok(memid == -1, "got %d\n", memid); + ok(!lstrcmpW(buffW, wszGUID), "got %s\n", wine_dbgstr_w(buffW)); + ok(c == 1, "got %d\n", c); +} + if (c == 1) + ITypeInfo_Release(ti); + + c = 1; + memid = -1; + lstrcpyW(buffW, invalidW); + ti = (void*)0xdeadbeef; + hr = ITypeLib_FindName(tl, buffW, 0, &ti, &memid, &c); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(memid == -1, "got %d\n", memid); + ok(!lstrcmpW(buffW, invalidW), "got %s\n", wine_dbgstr_w(buffW)); + ok(c == 0, "got %d\n", c); + ok(ti == (void*)0xdeadbeef, "got %p\n", ti); + + ITypeLib_Release(tl); +} + START_TEST(typelib) { const char *filename; @@ -3131,6 +3204,7 @@ START_TEST(typelib) test_SetVarHelpContext(); test_SetFuncAndParamNames(); test_SetVarDocString(); + test_FindName(); if ((filename = create_test_typelib(2))) { diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 1cab886..07e294b 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -4587,31 +4587,41 @@ ITypeLib2_fnIsName_exit: */ static HRESULT WINAPI ITypeLib2_fnFindName( ITypeLib2 *iface, - LPOLESTR szNameBuf, - ULONG lHashVal, + LPOLESTR name, + ULONG hash, ITypeInfo **ppTInfo, - MEMBERID *rgMemId, - UINT16 *pcFound) + MEMBERID *memid, + UINT16 *found) { ITypeLibImpl *This = (ITypeLibImpl *)iface; - TLBVarDesc *pVInfo; - UINT tic, fdc, pc, count = 0; - UINT nNameBufLen = (lstrlenW(szNameBuf)+1)*sizeof(WCHAR); + UINT tic, count = 0; + UINT len; - for(tic = 0; tic < This->TypeInfoCount; ++tic){ + TRACE("(%p)->(%s %u %p %p %p)\n", This, debugstr_w(name), hash, ppTInfo, memid, found); + + if ((!name && hash == 0) || !ppTInfo || !memid || !found) + return E_INVALIDARG; + + len = (lstrlenW(name) + 1)*sizeof(WCHAR); + for(tic = 0; tic < This->TypeInfoCount; ++tic) { ITypeInfoImpl *pTInfo = This->typeinfos[tic]; - if(!memcmp(szNameBuf,pTInfo->Name, nNameBufLen)) goto ITypeLib2_fnFindName_exit; + TLBVarDesc *var; + UINT fdc; + + if(!memcmp(name, pTInfo->Name, len)) goto ITypeLib2_fnFindName_exit; for(fdc = 0; fdc < pTInfo->TypeAttr.cFuncs; ++fdc) { - TLBFuncDesc *pFInfo = &pTInfo->funcdescs[fdc]; - if(!memcmp(szNameBuf,pFInfo->Name,nNameBufLen)) goto ITypeLib2_fnFindName_exit; - for(pc = 0;pc < pFInfo->funcdesc.cParams; pc++) { - if(!memcmp(szNameBuf,pFInfo->pParamDesc[pc].Name,nNameBufLen)) + TLBFuncDesc *func = &pTInfo->funcdescs[fdc]; + UINT pc; + + if(!memcmp(name, func->Name, len)) goto ITypeLib2_fnFindName_exit; + for(pc = 0; pc < func->funcdesc.cParams; pc++) { + if(!memcmp(name, func->pParamDesc[pc].Name, len)) goto ITypeLib2_fnFindName_exit; } } - pVInfo = TLB_get_vardesc_by_name(pTInfo->vardescs, pTInfo->TypeAttr.cVars, szNameBuf); - if(pVInfo) + var = TLB_get_vardesc_by_name(pTInfo->vardescs, pTInfo->TypeAttr.cVars, name); + if (var) goto ITypeLib2_fnFindName_exit; continue; @@ -4620,10 +4630,9 @@ ITypeLib2_fnFindName_exit: ppTInfo[count]=(LPTYPEINFO)pTInfo; count++; } - TRACE("(%p)slow! search for %d with %s: found %d TypeInfos!\n", - This, *pcFound, debugstr_w(szNameBuf), count); + TRACE("found %d typeinfos\n", count); - *pcFound = count; + *found = count; return S_OK; }

1 0

Alexandre Julliard : fonts: Add some missing glyphs in the Small Fonts font .
by Alexandre Julliard 26 Jan '12

26 Jan '12

Module: wine Branch: master Commit: 3e6199904f4fc2bf1612f210e07e18435a46a38f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e6199904f4fc2bf1612f210e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 25 22:14:54 2012 +0100 fonts: Add some missing glyphs in the Small Fonts font. --- fonts/small_fonts.sfd | 735 +++++++++++++++++++++++++++++++++++++++++++++- fonts/small_fonts.ttf | Bin 15956 -> 18324 bytes fonts/small_fonts_jp.sfd | 327 +++++++++++++++++++-- fonts/small_fonts_jp.ttf | Bin 9116 -> 9908 bytes 4 files changed, 1039 insertions(+), 23 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3e6199904f4fc2bf1612f…

1 0

Alexandre Julliard : fonts: Add some missing glyphs in the System font.
by Alexandre Julliard 26 Jan '12

26 Jan '12

Module: wine Branch: master Commit: 5d2b9eb9d3e15c3787571000e6a75673a42a0c49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d2b9eb9d3e15c3787571000e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 25 18:26:11 2012 +0100 fonts: Add some missing glyphs in the System font. --- fonts/system.sfd | 611 +++++++++++++++++++++++++++++++++++++++++++++++++++++- fonts/system.ttf | Bin 24820 -> 27496 bytes 2 files changed, 604 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5d2b9eb9d3e15c3787571…

1 0

Ken Thomases : winex11: Remove some more leftover X Shm code.
by Alexandre Julliard 26 Jan '12

26 Jan '12

Module: wine Branch: master Commit: f2174155417b0493df1e3b60caf3855bb2c6c902 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2174155417b0493df1e3b60c… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Jan 25 15:53:50 2012 -0600 winex11: Remove some more leftover X Shm code. --- dlls/winex11.drv/x11drv.h | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 64129a7..8e3c4c3 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -90,13 +90,6 @@ typedef struct Pixmap pixmap; } X_PHYSBRUSH; -enum x11drv_shm_mode -{ - X11DRV_SHM_NONE = 0, - X11DRV_SHM_PIXMAP, - X11DRV_SHM_IMAGE, -}; - typedef struct { int shift; int scale;

1 0

Thomas Faber : mscoree: Fix build with MSVC.
by Alexandre Julliard 26 Jan '12

26 Jan '12

Module: wine Branch: master Commit: d3918683e6a59b4068f5d28f72a7ab6f78e2c526 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3918683e6a59b4068f5d28f7… Author: Thomas Faber <thfabba(a)gmx.de> Date: Wed Jan 25 23:27:44 2012 +0100 mscoree: Fix build with MSVC. --- dlls/mscoree/metahost.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 454a653..49fb0ee 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -1171,7 +1171,7 @@ static MonoAssembly* mono_assembly_search_hook_fn(MonoAssemblyName *aname, char MonoImageOpenStatus stat; static WCHAR fusiondll[] = {'f','u','s','i','o','n',0}; HMODULE hfusion=NULL; - static HRESULT WINAPI (*pCreateAssemblyCache)(IAssemblyCache**,DWORD); + static HRESULT (WINAPI *pCreateAssemblyCache)(IAssemblyCache**,DWORD); stringname = mono->mono_stringify_assembly_name(aname);

1 0

Henri Verbeet : wined3d: Clear the device if we' re not removing the entry from the table in wined3d_unregister_window().
by Alexandre Julliard 26 Jan '12

26 Jan '12

Module: wine Branch: master Commit: faa040cd9e9f34a6abdf80833912bfdd581b9921 URL: http://source.winehq.org/git/wine.git/?a=commit;h=faa040cd9e9f34a6abdf80833… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 26 00:21:17 2012 +0100 wined3d: Clear the device if we're not removing the entry from the table in wined3d_unregister_window(). The device may be destroyed after the window is unregistered, causing device_process_message() to access freed memory. --- dlls/wined3d/wined3d_main.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 1b7e493..ad7a5fc 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -444,7 +444,11 @@ static LRESULT CALLBACK wined3d_wndproc(HWND window, UINT message, WPARAM wparam proc = entry->proc; wined3d_wndproc_mutex_unlock(); - return device_process_message(device, window, unicode, message, wparam, lparam, proc); + if (device) + return device_process_message(device, window, unicode, message, wparam, lparam, proc); + if (unicode) + return CallWindowProcW(proc, window, message, wparam, lparam); + return CallWindowProcA(proc, window, message, wparam, lparam); } BOOL wined3d_register_window(HWND window, struct wined3d_device *device) @@ -515,6 +519,7 @@ void wined3d_unregister_window(HWND window) proc = GetWindowLongPtrW(window, GWLP_WNDPROC); if (proc != (LONG_PTR)wined3d_wndproc) { + entry->device = NULL; wined3d_wndproc_mutex_unlock(); WARN("Not unregistering window %p, window proc %#lx doesn't match wined3d window proc %p.\n", window, proc, wined3d_wndproc); @@ -528,6 +533,7 @@ void wined3d_unregister_window(HWND window) proc = GetWindowLongPtrA(window, GWLP_WNDPROC); if (proc != (LONG_PTR)wined3d_wndproc) { + entry->device = NULL; wined3d_wndproc_mutex_unlock(); WARN("Not unregistering window %p, window proc %#lx doesn't match wined3d window proc %p.\n", window, proc, wined3d_wndproc);

1 0