April 2012 - Wine-commits - list.winehq.org

Christian Costa : dmsynth: Add some clock tests.
by Alexandre Julliard 30 Apr '12

30 Apr '12

Module: wine Branch: master Commit: 01e4ee0ac0515b9c9e2fb409bdcee355f54e0d86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01e4ee0ac0515b9c9e2fb409b… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Apr 30 11:43:26 2012 +0200 dmsynth: Add some clock tests. --- dlls/dmsynth/tests/dmsynth.c | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/dlls/dmsynth/tests/dmsynth.c b/dlls/dmsynth/tests/dmsynth.c index b341935..161018e 100644 --- a/dlls/dmsynth/tests/dmsynth.c +++ b/dlls/dmsynth/tests/dmsynth.c @@ -33,6 +33,8 @@ static void test_dmsynth(void) { IDirectMusicSynth *dmsynth = NULL; IDirectMusicSynthSink *dmsynth_sink = NULL; + IReferenceClock* clock = NULL; + IReferenceClock* clock_sink = NULL; HRESULT hr; hr = CoCreateInstance(&CLSID_DirectMusicSynth, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicSynth, (LPVOID*)&dmsynth); @@ -45,6 +47,25 @@ static void test_dmsynth(void) hr = CoCreateInstance(&CLSID_DirectMusicSynthSink, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicSynthSink, (LPVOID*)&dmsynth_sink); ok(hr == S_OK, "CoCreateInstance returned: %x\n", hr); + /* Synth has no default clock */ + hr = IDirectMusicSynth_GetLatencyClock(dmsynth, &clock); + todo_wine ok(hr == DMUS_E_NOSYNTHSINK, "IDirectMusicSynth_GetLatencyClock returned: %x\n", hr); + + /* SynthSink has a default clock */ + hr = IDirectMusicSynthSink_GetLatencyClock(dmsynth_sink, &clock_sink); + ok(hr == S_OK, "IDirectMusicSynth_GetLatencyClock returned: %x\n", hr); + todo_wine ok(clock_sink != NULL, "No clock returned\n"); + + /* This will set clock to Synth */ + hr = IDirectMusicSynth_SetSynthSink(dmsynth, dmsynth_sink); + ok(hr == S_OK, "IDirectMusicSynth_SetSynthSink returned: %x\n", hr); + + /* Check clocks are the same */ + hr = IDirectMusicSynth_GetLatencyClock(dmsynth, &clock); + ok(hr == S_OK, "IDirectMusicSynth_GetLatencyClock returned: %x\n", hr); + todo_wine ok(clock != NULL, "No clock returned\n"); + ok(clock == clock_sink, "Synth and SynthSink clocks are not the same\n"); + if (dmsynth_sink) IDirectMusicSynthSink_Release(dmsynth_sink); IDirectMusicSynth_Release(dmsynth);

1 0

Christian Costa : dmsynth: COM cleanup of IDirectMusicSynthSink and rename parameters.
by Alexandre Julliard 30 Apr '12

30 Apr '12

Module: wine Branch: master Commit: addf806c7cca61bcdd3ee8b9d109daf9d8975068 URL: http://source.winehq.org/git/wine.git/?a=commit;h=addf806c7cca61bcdd3ee8b9d… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Apr 30 11:43:35 2012 +0200 dmsynth: COM cleanup of IDirectMusicSynthSink and rename parameters. --- dlls/dmsynth/dmsynth_private.h | 8 ++-- dlls/dmsynth/synthsink.c | 113 ++++++++++++++++++++++++++-------------- 2 files changed, 77 insertions(+), 44 deletions(-) diff --git a/dlls/dmsynth/dmsynth_private.h b/dlls/dmsynth/dmsynth_private.h index 8cf787b..1cc24ac 100644 --- a/dlls/dmsynth/dmsynth_private.h +++ b/dlls/dmsynth/dmsynth_private.h @@ -71,11 +71,11 @@ struct IDirectMusicSynth8Impl { * IDirectMusicSynthSinkImpl implementation structure */ struct IDirectMusicSynthSinkImpl { - /* IUnknown fields */ - const IDirectMusicSynthSinkVtbl *lpVtbl; - LONG ref; + /* IUnknown fields */ + IDirectMusicSynthSink IDirectMusicSynthSink_iface; + LONG ref; - /* IDirectMusicSynthSinkImpl fields */ + /* IDirectMusicSynthSinkImpl fields */ }; /********************************************************************** diff --git a/dlls/dmsynth/synthsink.c b/dlls/dmsynth/synthsink.c index c017957..82ed894 100644 --- a/dlls/dmsynth/synthsink.c +++ b/dlls/dmsynth/synthsink.c @@ -1,4 +1,5 @@ -/* IDirectMusicSynthSink Implementation +/* + * IDirectMusicSynthSink Implementation * * Copyright (C) 2003-2004 Rok Mandeljc * @@ -21,9 +22,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmsynth); +static inline IDirectMusicSynthSinkImpl *impl_from_IDirectMusicSynthSink(IDirectMusicSynthSink *iface) +{ + return CONTAINING_RECORD(iface, IDirectMusicSynthSinkImpl, IDirectMusicSynthSink_iface); +} + /* IDirectMusicSynthSinkImpl IUnknown part: */ -static HRESULT WINAPI IDirectMusicSynthSinkImpl_QueryInterface (LPDIRECTMUSICSYNTHSINK iface, REFIID riid, LPVOID *ppobj) { - IDirectMusicSynthSinkImpl *This = (IDirectMusicSynthSinkImpl *)iface; +static HRESULT WINAPI IDirectMusicSynthSinkImpl_QueryInterface(LPDIRECTMUSICSYNTHSINK iface, REFIID riid, LPVOID *ppobj) +{ + IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface); TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); if (IsEqualIID (riid, &IID_IUnknown) || @@ -36,8 +43,9 @@ static HRESULT WINAPI IDirectMusicSynthSinkImpl_QueryInterface (LPDIRECTMUSICSYN return E_NOINTERFACE; } -static ULONG WINAPI IDirectMusicSynthSinkImpl_AddRef (LPDIRECTMUSICSYNTHSINK iface) { - IDirectMusicSynthSinkImpl *This = (IDirectMusicSynthSinkImpl *)iface; +static ULONG WINAPI IDirectMusicSynthSinkImpl_AddRef(LPDIRECTMUSICSYNTHSINK iface) +{ + IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface); ULONG refCount = InterlockedIncrement(&This->ref); TRACE("(%p)->(ref before=%u)\n", This, refCount - 1); @@ -47,8 +55,9 @@ static ULONG WINAPI IDirectMusicSynthSinkImpl_AddRef (LPDIRECTMUSICSYNTHSINK ifa return refCount; } -static ULONG WINAPI IDirectMusicSynthSinkImpl_Release (LPDIRECTMUSICSYNTHSINK iface) { - IDirectMusicSynthSinkImpl *This = (IDirectMusicSynthSinkImpl *)iface; +static ULONG WINAPI IDirectMusicSynthSinkImpl_Release(LPDIRECTMUSICSYNTHSINK iface) +{ + IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface); ULONG refCount = InterlockedDecrement(&This->ref); TRACE("(%p)->(ref before=%u)\n", This, refCount + 1); @@ -63,52 +72,76 @@ static ULONG WINAPI IDirectMusicSynthSinkImpl_Release (LPDIRECTMUSICSYNTHSINK if } /* IDirectMusicSynthSinkImpl IDirectMusicSynthSink part: */ -static HRESULT WINAPI IDirectMusicSynthSinkImpl_Init (LPDIRECTMUSICSYNTHSINK iface, IDirectMusicSynth* pSynth) { - IDirectMusicSynthSinkImpl *This = (IDirectMusicSynthSinkImpl *)iface; - FIXME("(%p, %p): stub\n", This, pSynth); - return S_OK; +static HRESULT WINAPI IDirectMusicSynthSinkImpl_Init(LPDIRECTMUSICSYNTHSINK iface, IDirectMusicSynth* synth) +{ + IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface); + + FIXME("(%p)->(%p): stub\n", This, synth); + + return S_OK; } -static HRESULT WINAPI IDirectMusicSynthSinkImpl_SetMasterClock (LPDIRECTMUSICSYNTHSINK iface, IReferenceClock* pClock) { - IDirectMusicSynthSinkImpl *This = (IDirectMusicSynthSinkImpl *)iface; - FIXME("(%p, %p): stub\n", This, pClock); - return S_OK; +static HRESULT WINAPI IDirectMusicSynthSinkImpl_SetMasterClock(LPDIRECTMUSICSYNTHSINK iface, IReferenceClock* clock) +{ + IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface); + + FIXME("(%p)->(%p): stub\n", This, clock); + + return S_OK; } -static HRESULT WINAPI IDirectMusicSynthSinkImpl_GetLatencyClock (LPDIRECTMUSICSYNTHSINK iface, IReferenceClock** ppClock) { - IDirectMusicSynthSinkImpl *This = (IDirectMusicSynthSinkImpl *)iface; - FIXME("(%p, %p): stub\n", This, ppClock); - return S_OK; +static HRESULT WINAPI IDirectMusicSynthSinkImpl_GetLatencyClock(LPDIRECTMUSICSYNTHSINK iface, IReferenceClock** clock) +{ + IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface); + + FIXME("(%p)->(%p): stub\n", This, clock); + + return S_OK; } -static HRESULT WINAPI IDirectMusicSynthSinkImpl_Activate (LPDIRECTMUSICSYNTHSINK iface, BOOL fEnable) { - IDirectMusicSynthSinkImpl *This = (IDirectMusicSynthSinkImpl *)iface; - FIXME("(%p, %d): stub\n", This, fEnable); - return S_OK; +static HRESULT WINAPI IDirectMusicSynthSinkImpl_Activate(LPDIRECTMUSICSYNTHSINK iface, BOOL enable) +{ + IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface); + + FIXME("(%p)->(%d): stub\n", This, enable); + + return S_OK; } -static HRESULT WINAPI IDirectMusicSynthSinkImpl_SampleToRefTime (LPDIRECTMUSICSYNTHSINK iface, LONGLONG llSampleTime, REFERENCE_TIME* prfTime) { - IDirectMusicSynthSinkImpl *This = (IDirectMusicSynthSinkImpl *)iface; - FIXME("(%p, 0x%s, %p): stub\n", This, wine_dbgstr_longlong(llSampleTime), prfTime); - return S_OK; +static HRESULT WINAPI IDirectMusicSynthSinkImpl_SampleToRefTime(LPDIRECTMUSICSYNTHSINK iface, LONGLONG sample_time, REFERENCE_TIME* ref_time) +{ + IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface); + + FIXME("(%p)->(0x%s, %p): stub\n", This, wine_dbgstr_longlong(sample_time), ref_time); + + return S_OK; } -static HRESULT WINAPI IDirectMusicSynthSinkImpl_RefTimeToSample (LPDIRECTMUSICSYNTHSINK iface, REFERENCE_TIME rfTime, LONGLONG* pllSampleTime) { - IDirectMusicSynthSinkImpl *This = (IDirectMusicSynthSinkImpl *)iface; - FIXME("(%p, 0x%s, %p): stub\n", This, wine_dbgstr_longlong(rfTime), pllSampleTime ); - return S_OK; +static HRESULT WINAPI IDirectMusicSynthSinkImpl_RefTimeToSample(LPDIRECTMUSICSYNTHSINK iface, REFERENCE_TIME ref_time, LONGLONG* sample_time) +{ + IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface); + + FIXME("(%p)->(0x%s, %p): stub\n", This, wine_dbgstr_longlong(ref_time), sample_time); + + return S_OK; } -static HRESULT WINAPI IDirectMusicSynthSinkImpl_SetDirectSound (LPDIRECTMUSICSYNTHSINK iface, LPDIRECTSOUND pDirectSound, LPDIRECTSOUNDBUFFER pDirectSoundBuffer) { - IDirectMusicSynthSinkImpl *This = (IDirectMusicSynthSinkImpl *)iface; - FIXME("(%p, %p, %p): stub\n", This, pDirectSound, pDirectSoundBuffer); - return S_OK; +static HRESULT WINAPI IDirectMusicSynthSinkImpl_SetDirectSound(LPDIRECTMUSICSYNTHSINK iface, LPDIRECTSOUND dsound, LPDIRECTSOUNDBUFFER dsound_buffer) +{ + IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface); + + FIXME("(%p)->(%p, %p): stub\n", This, dsound, dsound_buffer); + + return S_OK; } -static HRESULT WINAPI IDirectMusicSynthSinkImpl_GetDesiredBufferSize (LPDIRECTMUSICSYNTHSINK iface, LPDWORD pdwBufferSizeInSamples) { - IDirectMusicSynthSinkImpl *This = (IDirectMusicSynthSinkImpl *)iface; - FIXME("(%p, %p): stub\n", This, pdwBufferSizeInSamples); - return S_OK; +static HRESULT WINAPI IDirectMusicSynthSinkImpl_GetDesiredBufferSize(LPDIRECTMUSICSYNTHSINK iface, LPDWORD buffer_size_in_samples) +{ + IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface); + + FIXME("(%p)->(%p): stub\n", This, buffer_size_in_samples); + + return S_OK; } static const IDirectMusicSynthSinkVtbl DirectMusicSynthSink_Vtbl = { @@ -135,7 +168,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicSynthSinkImpl (LPCGUID lpcGUID, LPVOID* p *ppobj = NULL; return E_OUTOFMEMORY; } - obj->lpVtbl = &DirectMusicSynthSink_Vtbl; + obj->IDirectMusicSynthSink_iface.lpVtbl = &DirectMusicSynthSink_Vtbl; obj->ref = 0; return IDirectMusicSynthSinkImpl_QueryInterface((LPDIRECTMUSICSYNTHSINK)obj, lpcGUID, ppobj);

1 0

Piotr Caban : kernel32: Support multiple labels in IdnToNameprepUnicode.
by Alexandre Julliard 30 Apr '12

30 Apr '12

Module: wine Branch: master Commit: 60b25b7dd6d7fb8a1093d36a8dc673203b5f411f URL: http://source.winehq.org/git/wine.git/?a=commit;h=60b25b7dd6d7fb8a1093d36a8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 30 17:27:35 2012 +0200 kernel32: Support multiple labels in IdnToNameprepUnicode. --- dlls/kernel32/locale.c | 263 ++++++++++++++++++++++++------------------ dlls/kernel32/tests/locale.c | 10 ++ 2 files changed, 161 insertions(+), 112 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=60b25b7dd6d7fb8a1093d…

1 0

Piotr Caban : kernel32: Added IdnToAscii implementation.
by Alexandre Julliard 30 Apr '12

30 Apr '12

Module: wine Branch: master Commit: 04ad71ee05a76507906b5e4f064bf9e0d2b0bb62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04ad71ee05a76507906b5e4f0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 30 17:27:46 2012 +0200 kernel32: Added IdnToAscii implementation. --- dlls/kernel32/locale.c | 154 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 151 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index e546000..73eebd4 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -3881,16 +3881,164 @@ BOOL WINAPI IsNormalizedString(NORM_FORM NormForm, LPCWSTR lpString, INT cwLengt return FALSE; } +enum { + BASE = 36, + TMIN = 1, + TMAX = 26, + SKEW = 38, + DAMP = 700, + INIT_BIAS = 72, + INIT_N = 128 +}; + +static inline INT adapt(INT delta, INT numpoints, BOOL firsttime) +{ + INT k; + + delta /= (firsttime ? DAMP : 2); + delta += delta/numpoints; + + for(k=0; delta>((BASE-TMIN)*TMAX)/2; k+=BASE) + delta /= BASE-TMIN; + return k+((BASE-TMIN+1)*delta)/(delta+SKEW); +} + /****************************************************************************** * IdnToAscii (KERNEL32.@) + * Implementation of Punycode based on RFC 3492. */ INT WINAPI IdnToAscii(DWORD dwFlags, LPCWSTR lpUnicodeCharStr, INT cchUnicodeChar, LPWSTR lpASCIICharStr, INT cchASCIIChar) { - FIXME("%x %p %d %p %d\n", dwFlags, lpUnicodeCharStr, cchUnicodeChar, + static const WCHAR prefixW[] = {'x','n','-','-'}; + + WCHAR *norm_str; + INT i, label_start, label_end, norm_len, out_label, out = 0; + + TRACE("%x %p %d %p %d\n", dwFlags, lpUnicodeCharStr, cchUnicodeChar, lpASCIICharStr, cchASCIIChar); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + + norm_len = IdnToNameprepUnicode(dwFlags, lpUnicodeCharStr, cchUnicodeChar, NULL, 0); + if(!norm_len) + return 0; + norm_str = HeapAlloc(GetProcessHeap(), 0, norm_len*sizeof(WCHAR)); + if(!norm_str) { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return 0; + } + norm_len = IdnToNameprepUnicode(dwFlags, lpUnicodeCharStr, + cchUnicodeChar, norm_str, norm_len); + if(!norm_len) { + HeapFree(GetProcessHeap(), 0, norm_str); + return 0; + } + + for(label_start=0; label_start<norm_len;) { + INT n = INIT_N, bias = INIT_BIAS; + INT delta = 0, b = 0, h; + + out_label = out; + for(i=label_start; i<norm_len && norm_str[i]!='.' && norm_str[i]!='\0'; i++) + if(norm_str[i] < 0x80) + b++; + label_end = i; + + if(b == label_end-label_start) { + if(label_end < norm_len) + b++; + if(!lpASCIICharStr) { + out += b; + }else if(out+b <= cchASCIIChar) { + memcpy(lpASCIICharStr+out, norm_str+label_start, b*sizeof(WCHAR)); + out += b; + }else { + HeapFree(GetProcessHeap(), 0, norm_str); + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return 0; + } + label_start = label_end+1; + continue; + } + + if(!lpASCIICharStr) { + out += 5+b; /* strlen(xn--...-) */ + }else if(out+5+b <= cchASCIIChar) { + memcpy(lpASCIICharStr+out, prefixW, sizeof(prefixW)); + out += 4; + for(i=label_start; i<label_end; i++) + if(norm_str[i] < 0x80) + lpASCIICharStr[out++] = norm_str[i]; + lpASCIICharStr[out++] = '-'; + }else { + HeapFree(GetProcessHeap(), 0, norm_str); + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return 0; + } + if(!b) + out--; + + for(h=b; h<label_end-label_start;) { + INT m = 0xffff, q, k; + + for(i=label_start; i<label_end; i++) { + if(norm_str[i]>=n && m>norm_str[i]) + m = norm_str[i]; + } + delta += (m-n)*(h+1); + n = m; + + for(i=label_start; i<label_end; i++) { + if(norm_str[i] < n) { + delta++; + }else if(norm_str[i] == n) { + for(q=delta, k=BASE; ; k+=BASE) { + INT t = k<=bias ? TMIN : k>=bias+TMAX ? TMAX : k-bias; + INT disp = q<t ? q : t+(q-t)%(BASE-t); + if(!lpASCIICharStr) { + out++; + }else if(out+1 <= cchASCIIChar) { + lpASCIICharStr[out++] = disp<='z'-'a' ? + 'a'+disp : '0'+disp-'z'+'a'-1; + }else { + HeapFree(GetProcessHeap(), 0, norm_str); + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return 0; + } + if(q < t) + break; + q = (q-t)/(BASE-t); + } + bias = adapt(delta, h+1, h==b); + delta = 0; + h++; + } + } + delta++; + n++; + } + + if(out-out_label > 63) { + HeapFree(GetProcessHeap(), 0, norm_str); + SetLastError(ERROR_INVALID_NAME); + return 0; + } + + if(label_end < norm_len) { + if(!lpASCIICharStr) { + out++; + }else if(out+1 <= cchASCIIChar) { + lpASCIICharStr[out++] = norm_str[label_end]; + }else { + HeapFree(GetProcessHeap(), 0, norm_str); + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return 0; + } + } + label_start = label_end+1; + } + + HeapFree(GetProcessHeap(), 0, norm_str); + return out; } /******************************************************************************

1 0

Piotr Caban : kernel32/tests: Added IdnToAscii tests.
by Alexandre Julliard 30 Apr '12

30 Apr '12

Module: wine Branch: master Commit: 03b58f580c537f189ef0226801fbab2adac5caf1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03b58f580c537f189ef022680… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 30 17:27:56 2012 +0200 kernel32/tests: Added IdnToAscii tests. --- dlls/kernel32/locale.c | 5 ++- dlls/kernel32/tests/locale.c | 68 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 73eebd4..fbc3ae2 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -3938,7 +3938,8 @@ INT WINAPI IdnToAscii(DWORD dwFlags, LPCWSTR lpUnicodeCharStr, INT cchUnicodeCha INT delta = 0, b = 0, h; out_label = out; - for(i=label_start; i<norm_len && norm_str[i]!='.' && norm_str[i]!='\0'; i++) + for(i=label_start; i<norm_len && norm_str[i]!='.' && + norm_str[i]!=0x3002 && norm_str[i]!='\0'; i++) if(norm_str[i] < 0x80) b++; label_end = i; @@ -4027,7 +4028,7 @@ INT WINAPI IdnToAscii(DWORD dwFlags, LPCWSTR lpUnicodeCharStr, INT cchUnicodeCha if(!lpASCIICharStr) { out++; }else if(out+1 <= cchASCIIChar) { - lpASCIICharStr[out++] = norm_str[label_end]; + lpASCIICharStr[out++] = norm_str[label_end] ? '.' : 0; }else { HeapFree(GetProcessHeap(), 0, norm_str); SetLastError(ERROR_INSUFFICIENT_BUFFER); diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index bec24fa..033da36 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -77,6 +77,7 @@ static INT (WINAPI *pFoldStringA)(DWORD, LPCSTR, INT, LPSTR, INT); static INT (WINAPI *pFoldStringW)(DWORD, LPCWSTR, INT, LPWSTR, INT); static BOOL (WINAPI *pIsValidLanguageGroup)(LGRPID, DWORD); static INT (WINAPI *pIdnToNameprepUnicode)(DWORD, LPCWSTR, INT, LPWSTR, INT); +static INT (WINAPI *pIdnToAscii)(DWORD, LPCWSTR, INT, LPWSTR, INT); static void InitFunctionPointers(void) { @@ -91,6 +92,7 @@ static void InitFunctionPointers(void) pEnumUILanguagesA = (void*)GetProcAddress(hKernel32, "EnumUILanguagesA"); pEnumSystemLocalesEx = (void*)GetProcAddress(hKernel32, "EnumSystemLocalesEx"); pIdnToNameprepUnicode = (void*)GetProcAddress(hKernel32, "IdnToNameprepUnicode"); + pIdnToAscii = (void*)GetProcAddress(hKernel32, "IdnToAscii"); } #define eq(received, expected, label, type) \ @@ -2991,6 +2993,71 @@ static void test_IdnToNameprepUnicode(void) } } +static void test_IdnToAscii(void) +{ + struct { + DWORD in_len; + const WCHAR in[64]; + DWORD ret; + const WCHAR out[64]; + DWORD flags; + DWORD err; + } test_data[] = { + { + 5, {'T','e','s','t',0}, + 5, {'T','e','s','t',0}, + 0, 0xdeadbeef + }, + { + 5, {'T','e',0x017c,'s','t',0}, + 12, {'x','n','-','-','t','e','s','t','-','c','b','b',0}, + 0, 0xdeadbeef + }, + { + 12, {'t','e',0x0105,'s','t','.','t','e',0x017c,'s','t',0}, + 26, {'x','n','-','-','t','e','s','t','-','c','t','a','.','x','n','-','-','t','e','s','t','-','c','b','b',0}, + 0, 0xdeadbeef + }, + { + 3, {0x0105,'.',0}, + 9, {'x','n','-','-','2','d','a','.',0}, + 0, 0xdeadbeef + }, + { + 10, {'h','t','t','p',':','/','/','t',0x0106,0}, + 17, {'x','n','-','-','h','t','t','p',':','/','/','t','-','7','8','a',0}, + 0, 0xdeadbeef + }, + { + 10, {0x4e3a,0x8bf4,0x4e0d,0x4ed6,0x5011,0x10d,0x11b,0x305c,0x306a,0}, + 35, {'x','n','-','-','b','e','a','2','a','1','6','3','1','a','v','b','a', + 'v','4','4','t','y','h','a','3','2','b','9','1','e','g','s','2','t',0}, + 0, 0xdeadbeef + } + }; + + WCHAR buf[1024]; + DWORD i, ret, err; + + if (!pIdnToAscii) + { + win_skip("IdnToAscii is not available\n"); + return; + } + + for (i=0; i<sizeof(test_data)/sizeof(*test_data); i++) + { + SetLastError(0xdeadbeef); + ret = pIdnToAscii(test_data[i].flags, test_data[i].in, + test_data[i].in_len, buf, sizeof(buf)); + err = GetLastError(); + ok(ret == test_data[i].ret, "%d) ret = %d\n", i, ret); + ok(err == test_data[i].err, "%d) err = %d\n", i, err); + ok(!memcmp(test_data[i].out, buf, ret*sizeof(WCHAR)), + "%d) buf = %s\n", i, wine_dbgstr_wn(buf, ret)); + } +} + START_TEST(locale) { InitFunctionPointers(); @@ -3019,6 +3086,7 @@ START_TEST(locale) test_GetCPInfo(); test_GetStringTypeW(); test_IdnToNameprepUnicode(); + test_IdnToAscii(); /* this requires collation table patch to make it MS compatible */ if (0) test_sorting(); }

1 0

Jacek Caban : oleaut32: Added BSTR cache implementation.
by Alexandre Julliard 30 Apr '12

30 Apr '12

Module: wine Branch: master Commit: d53bdeca62b42b881347f7faf58932377635b3ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=d53bdeca62b42b881347f7faf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 27 17:34:28 2012 +0200 oleaut32: Added BSTR cache implementation. --- dlls/oleaut32/oleaut.c | 233 +++++++++++++++++++++++++----------------------- 1 files changed, 122 insertions(+), 111 deletions(-) diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index 0586e15..8cbc819 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -42,8 +42,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); -static BOOL BSTR_bCache = TRUE; /* Cache allocations to minimise alloc calls? */ - /****************************************************************************** * BSTR {OLEAUT32} * @@ -71,6 +69,70 @@ static BOOL BSTR_bCache = TRUE; /* Cache allocations to minimise alloc calls? */ * 'Inside OLE, second edition' by Kraig Brockshmidt. */ +static BOOL bstr_cache_enabled; + +static CRITICAL_SECTION cs_bstr_cache; +static CRITICAL_SECTION_DEBUG cs_bstr_cache_dbg = +{ + 0, 0, &cs_bstr_cache, + { &cs_bstr_cache_dbg.ProcessLocksList, &cs_bstr_cache_dbg.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": bstr_cache") } +}; +static CRITICAL_SECTION cs_bstr_cache = { &cs_bstr_cache_dbg, -1, 0, 0, 0, 0 }; + +typedef struct { + unsigned short head; + unsigned short cnt; + DWORD *buf[6]; +} bstr_cache_entry_t; + +#define BUCKET_SIZE 16 + +static bstr_cache_entry_t bstr_cache[0x10000/BUCKET_SIZE]; + +static inline size_t bstr_alloc_size(size_t size) +{ + return (size+sizeof(DWORD)+BUCKET_SIZE) & ~(BUCKET_SIZE-1); +} + +static inline bstr_cache_entry_t *get_cache_entry(size_t size) +{ + unsigned cache_idx = (size+sizeof(DWORD)-1)/BUCKET_SIZE; + return bstr_cache_enabled && cache_idx < sizeof(bstr_cache)/sizeof(*bstr_cache) + ? bstr_cache + cache_idx + : NULL; +} + +static DWORD *alloc_bstr(size_t size) +{ + bstr_cache_entry_t *cache_entry = get_cache_entry(size); + + if(cache_entry) { + DWORD *ret = NULL; + + EnterCriticalSection(&cs_bstr_cache); + + if(!cache_entry->cnt) { + cache_entry = get_cache_entry(size+BUCKET_SIZE); + if(cache_entry && !cache_entry->cnt) + cache_entry = NULL; + } + + if(cache_entry) { + ret = cache_entry->buf[cache_entry->head++]; + cache_entry->head %= sizeof(cache_entry->buf)/sizeof(*cache_entry->buf); + cache_entry->cnt--; + } + + LeaveCriticalSection(&cs_bstr_cache); + + if(ret) + return ret; + } + + return HeapAlloc(GetProcessHeap(), 0, bstr_alloc_size(size)); +} + /****************************************************************************** * SysStringLen [OLEAUT32.7] * @@ -177,24 +239,28 @@ BSTR WINAPI SysAllocString(LPCOLESTR str) */ void WINAPI SysFreeString(BSTR str) { - DWORD* bufferPointer; + bstr_cache_entry_t *cache_entry; + DWORD *ptr; - /* NULL is a valid parameter */ - if(!str) return; + if(!str) + return; - /* - * We have to be careful when we free a BSTR pointer, it points to - * the beginning of the string but it skips the byte count contained - * before the string. - */ - bufferPointer = (DWORD*)str; + ptr = (DWORD*)str-1; + cache_entry = get_cache_entry(*ptr+sizeof(WCHAR)); + if(cache_entry) { + EnterCriticalSection(&cs_bstr_cache); - bufferPointer--; + if(cache_entry->cnt < sizeof(cache_entry->buf)/sizeof(*cache_entry->buf)) { + cache_entry->buf[(cache_entry->head+cache_entry->cnt)%((sizeof(cache_entry->buf)/sizeof(*cache_entry->buf)))] = ptr; + cache_entry->cnt++; + LeaveCriticalSection(&cs_bstr_cache); + return; + } - /* - * Free the memory from its "real" origin. - */ - HeapFree(GetProcessHeap(), 0, bufferPointer); + LeaveCriticalSection(&cs_bstr_cache); + } + + HeapFree(GetProcessHeap(), 0, ptr); } /****************************************************************************** @@ -215,61 +281,28 @@ void WINAPI SysFreeString(BSTR str) */ BSTR WINAPI SysAllocStringLen(const OLECHAR *str, unsigned int len) { - DWORD bufferSize; - DWORD* newBuffer; - WCHAR* stringBuffer; + DWORD size, *ptr; + BSTR ret; /* Detect integer overflow. */ if (len >= ((UINT_MAX-sizeof(WCHAR)-sizeof(DWORD))/sizeof(WCHAR))) return NULL; - /* - * Find the length of the buffer passed-in, in bytes. - */ - bufferSize = len * sizeof (WCHAR); - - /* - * Allocate a new buffer to hold the string. - * don't forget to keep an empty spot at the beginning of the - * buffer for the character count and an extra character at the - * end for the NULL. - */ - newBuffer = HeapAlloc(GetProcessHeap(), 0, - bufferSize + sizeof(WCHAR) + sizeof(DWORD)); - /* - * If the memory allocation failed, return a null pointer. - */ - if (!newBuffer) - return NULL; - - /* - * Copy the length of the string in the placeholder. - */ - *newBuffer = bufferSize; - - /* - * Skip the byte count. - */ - newBuffer++; - - /* - * Copy the information in the buffer. - * Since it is valid to pass a NULL pointer here, we'll initialize the - * buffer to nul if it is the case. - */ - if (str != 0) - memcpy(newBuffer, str, bufferSize); - else - memset(newBuffer, 0, bufferSize); - - /* - * Make sure that there is a nul character at the end of the - * string. - */ - stringBuffer = (WCHAR*)newBuffer; - stringBuffer[len] = '\0'; + size = len*sizeof(WCHAR); + ptr = alloc_bstr(size + sizeof(WCHAR)); + if(!ptr) + return NULL; + + *ptr = size; + ret = (BSTR)(ptr+1); + if(str) { + memcpy(ret, str, size); + ret[len] = 0; + }else { + memset(ret, 0, size+sizeof(WCHAR)); + } - return stringBuffer; + return ret; } /****************************************************************************** @@ -299,12 +332,13 @@ int WINAPI SysReAllocStringLen(BSTR* old, const OLECHAR* str, unsigned int len) if (*old!=NULL) { BSTR old_copy = *old; DWORD newbytelen = len*sizeof(WCHAR); - DWORD *ptr = HeapReAlloc(GetProcessHeap(),0,((DWORD*)*old)-1,newbytelen+sizeof(WCHAR)+sizeof(DWORD)); + DWORD *ptr = HeapReAlloc(GetProcessHeap(),0,((DWORD*)*old)-1,bstr_alloc_size(newbytelen+sizeof(WCHAR))); *old = (BSTR)(ptr+1); *ptr = newbytelen; /* Subtle hidden feature: The old string data is still there * when 'in' is NULL! * Some Microsoft program needs it. + * FIXME: Is it a sideeffect of BSTR caching? */ if (str && old_copy!=str) memmove(*old, str, newbytelen); (*old)[len] = 0; @@ -340,55 +374,27 @@ int WINAPI SysReAllocStringLen(BSTR* old, const OLECHAR* str, unsigned int len) */ BSTR WINAPI SysAllocStringByteLen(LPCSTR str, UINT len) { - DWORD* newBuffer; - char* stringBuffer; + DWORD *ptr; + char *ret; /* Detect integer overflow. */ if (len >= (UINT_MAX-sizeof(WCHAR)-sizeof(DWORD))) return NULL; - /* - * Allocate a new buffer to hold the string. - * don't forget to keep an empty spot at the beginning of the - * buffer for the character count and an extra character at the - * end for the NULL. - */ - newBuffer = HeapAlloc(GetProcessHeap(), 0, - len + sizeof(WCHAR) + sizeof(DWORD)); - - /* - * If the memory allocation failed, return a null pointer. - */ - if (newBuffer==0) - return 0; - - /* - * Copy the length of the string in the placeholder. - */ - *newBuffer = len; - - /* - * Skip the byte count. - */ - newBuffer++; - - /* - * Copy the information in the buffer. - * Since it is valid to pass a NULL pointer here, we'll initialize the - * buffer to nul if it is the case. - */ - if (str != 0) - memcpy(newBuffer, str, len); - - /* - * Make sure that there is a nul character at the end of the - * string. - */ - stringBuffer = (char *)newBuffer; - stringBuffer[len] = 0; - stringBuffer[len+1] = 0; + ptr = alloc_bstr(len + sizeof(WCHAR)); + if(!ptr) + return NULL; + + *ptr = len; + ret = (char*)(ptr+1); + if(str) { + memcpy(ret, str, len); + ret[len] = ret[len+1] = 0; + }else { + memset(ret, 0, len+sizeof(WCHAR)); + } - return (LPWSTR)stringBuffer; + return (BSTR)ret; } /****************************************************************************** @@ -440,11 +446,12 @@ INT WINAPI SysReAllocString(LPBSTR old,LPCOLESTR str) * Nothing. * * NOTES - * See BSTR. + * SetOaNoCache does not release cached strings, so it leaks by design. */ void WINAPI SetOaNoCache(void) { - BSTR_bCache = FALSE; + TRACE("\n"); + bstr_cache_enabled = FALSE; } static const WCHAR _delimiter[] = {'!',0}; /* default delimiter apparently */ @@ -840,6 +847,10 @@ HRESULT WINAPI DllCanUnloadNow(void) */ BOOL WINAPI DllMain(HINSTANCE hInstDll, DWORD fdwReason, LPVOID lpvReserved) { + static const WCHAR oanocacheW[] = {'o','a','n','o','c','a','c','h','e',0}; + + bstr_cache_enabled = !GetEnvironmentVariableW(oanocacheW, NULL, 0); + return OLEAUTPS_DllMain( hInstDll, fdwReason, lpvReserved ); }

1 0

Aric Stewart : strmbase: Implement BasicAudio.
by Alexandre Julliard 30 Apr '12

30 Apr '12

Module: wine Branch: master Commit: a01d6be69fb33d91eae1d03bcac3ae6eb1095870 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a01d6be69fb33d91eae1d03bc… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Apr 27 13:47:39 2012 -0500 strmbase: Implement BasicAudio. --- dlls/strmbase/Makefile.in | 1 + dlls/strmbase/audio.c | 86 +++++++++++++++++++++++++++++++++++++++++++++ include/wine/strmbase.h | 16 ++++++++ 3 files changed, 103 insertions(+), 0 deletions(-) diff --git a/dlls/strmbase/Makefile.in b/dlls/strmbase/Makefile.in index f89c2c0..3ac7c56 100644 --- a/dlls/strmbase/Makefile.in +++ b/dlls/strmbase/Makefile.in @@ -1,6 +1,7 @@ MODULE = libstrmbase.a C_SRCS = \ + audio.c \ dispatch.c \ dllfunc.c \ enumpins.c \ diff --git a/dlls/strmbase/audio.c b/dlls/strmbase/audio.c new file mode 100644 index 0000000..be99583 --- /dev/null +++ b/dlls/strmbase/audio.c @@ -0,0 +1,86 @@ +/* + * Generic Implementation of strmbase audio classes + * + * Copyright 2012 Aric Stewart, CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include <assert.h> +#include "dshow.h" +#include "uuids.h" +#include "vfwmsgs.h" +#include "wine/debug.h" +#include "wine/unicode.h" +#include "wine/strmbase.h" + +WINE_DEFAULT_DEBUG_CHANNEL(strmbase); + +static inline BasicAudio *impl_from_IBasicAudio(IBasicAudio *iface) +{ + return CONTAINING_RECORD(iface, BasicAudio, IBasicAudio_iface); +} + +HRESULT WINAPI BasicAudio_Init(BasicAudio *pBasicAudio, const IBasicAudioVtbl *lpVtbl) +{ + pBasicAudio->IBasicAudio_iface.lpVtbl = lpVtbl; + BaseDispatch_Init(&pBasicAudio->baseDispatch, &IID_IBasicAudio); + + return S_OK; +} + +HRESULT WINAPI BasicAudio_Destroy(BasicAudio *pBasicAudio) +{ + return BaseDispatch_Destroy(&pBasicAudio->baseDispatch); +} + +HRESULT WINAPI BasicAudioImpl_GetTypeInfoCount(IBasicAudio *iface, UINT *pctinfo) +{ + BasicAudio *This = impl_from_IBasicAudio(iface); + + return BaseDispatchImpl_GetTypeInfoCount(&This->baseDispatch, pctinfo); +} + +HRESULT WINAPI BasicAudioImpl_GetTypeInfo(IBasicAudio *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) +{ + BasicAudio *This = impl_from_IBasicAudio(iface); + + return BaseDispatchImpl_GetTypeInfo(&This->baseDispatch, &IID_NULL, iTInfo, lcid, ppTInfo); +} + +HRESULT WINAPI BasicAudioImpl_GetIDsOfNames(IBasicAudio *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + BasicAudio *This = impl_from_IBasicAudio(iface); + + return BaseDispatchImpl_GetIDsOfNames(&This->baseDispatch, riid, rgszNames, cNames, lcid, rgDispId); +} + +HRESULT WINAPI BasicAudioImpl_Invoke(IBasicAudio *iface, DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExepInfo, UINT *puArgErr) +{ + BasicAudio *This = impl_from_IBasicAudio(iface); + HRESULT hr = S_OK; + ITypeInfo *pTypeInfo; + + hr = BaseDispatchImpl_GetTypeInfo(&This->baseDispatch, riid, 1, lcid, &pTypeInfo); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke(pTypeInfo, &This->IBasicAudio_iface, dispIdMember, wFlags, pDispParams, pVarResult, pExepInfo, puArgErr); + ITypeInfo_Release(pTypeInfo); + } + + return hr; +} diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 3e749a5..da6475d 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -635,6 +635,22 @@ HRESULT WINAPI BaseRendererImpl_ClearPendingSample(BaseRenderer *iface); HRESULT WINAPI BaseRenderer_Init(BaseRenderer *This, const IBaseFilterVtbl *Vtbl, IUnknown *pUnkOuter, const CLSID *pClsid, DWORD_PTR DebugInfo, const BaseRendererFuncTable* pBaseFuncsTable); +#ifdef __IBasicAudio_FWD_DEFINED__ +typedef struct tagBasicAudio +{ + IBasicAudio IBasicAudio_iface; + BaseDispatch baseDispatch; +} BasicAudio; + +HRESULT WINAPI BasicAudio_Init(BasicAudio *This, const IBasicAudioVtbl *Vtbl); +HRESULT WINAPI BasicAudio_Destroy(BasicAudio *pBasicAudio); + +HRESULT WINAPI BasicAudioImpl_GetTypeInfoCount(IBasicAudio *iface, UINT*pctinfo); +HRESULT WINAPI BasicAudioImpl_GetTypeInfo(IBasicAudio *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); +HRESULT WINAPI BasicAudioImpl_GetIDsOfNames(IBasicAudio *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId); +HRESULT WINAPI BasicAudioImpl_Invoke(IBasicAudio *iface, DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExepInfo, UINT *puArgErr); +#endif + /* Dll Functions */ BOOL WINAPI STRMBASE_DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv); HRESULT WINAPI STRMBASE_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv);

1 0

Aric Stewart : quartz: Have DSoundRenderer use strmbase BasicAudio.
by Alexandre Julliard 30 Apr '12

30 Apr '12

Module: wine Branch: master Commit: f58c9661a46e89b9f2e7d8541b7ce8c9f510ca9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f58c9661a46e89b9f2e7d8541… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Apr 27 13:47:47 2012 -0500 quartz: Have DSoundRenderer use strmbase BasicAudio. --- dlls/quartz/dsoundrender.c | 69 ++++++-------------------------------------- 1 files changed, 9 insertions(+), 60 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 5d6dac2..071d702 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -53,8 +53,8 @@ static const IAMFilterMiscFlagsVtbl IAMFilterMiscFlags_Vtbl; typedef struct DSoundRenderImpl { BaseRenderer renderer; + BasicAudio basicAudio; - IBasicAudio IBasicAudio_iface; IReferenceClock IReferenceClock_iface; IAMDirectSound IAMDirectSound_iface; IAMFilterMiscFlags IAMFilterMiscFlags_iface; @@ -88,7 +88,7 @@ static inline DSoundRenderImpl *impl_from_IBaseFilter(IBaseFilter *iface) static inline DSoundRenderImpl *impl_from_IBasicAudio(IBasicAudio *iface) { - return CONTAINING_RECORD(iface, DSoundRenderImpl, IBasicAudio_iface); + return CONTAINING_RECORD(iface, DSoundRenderImpl, basicAudio.IBasicAudio_iface); } static inline DSoundRenderImpl *impl_from_IReferenceClock(IReferenceClock *iface) @@ -666,7 +666,7 @@ HRESULT DSoundRender_create(IUnknown * pUnkOuter, LPVOID * ppv) hr = BaseRenderer_Init(&pDSoundRender->renderer, &DSoundRender_Vtbl, (IUnknown*)pDSoundRender, &CLSID_DSoundRender, (DWORD_PTR)(__FILE__ ": DSoundRenderImpl.csFilter"), &BaseFuncTable); - pDSoundRender->IBasicAudio_iface.lpVtbl = &IBasicAudio_Vtbl; + BasicAudio_Init(&pDSoundRender->basicAudio,&IBasicAudio_Vtbl); pDSoundRender->IReferenceClock_iface.lpVtbl = &IReferenceClock_Vtbl; pDSoundRender->IAMDirectSound_iface.lpVtbl = &IAMDirectSound_Vtbl; pDSoundRender->IAMFilterMiscFlags_iface.lpVtbl = &IAMFilterMiscFlags_Vtbl; @@ -722,7 +722,7 @@ static HRESULT WINAPI DSoundRender_QueryInterface(IBaseFilter * iface, REFIID ri *ppv = NULL; if (IsEqualIID(riid, &IID_IBasicAudio)) - *ppv = &This->IBasicAudio_iface; + *ppv = &This->basicAudio.IBasicAudio_iface; else if (IsEqualIID(riid, &IID_IReferenceClock)) *ppv = &This->IReferenceClock_iface; else if (IsEqualIID(riid, &IID_IAMDirectSound)) @@ -771,8 +771,7 @@ static ULONG WINAPI DSoundRender_Release(IBaseFilter * iface) IDirectSound_Release(This->dsound); This->dsound = NULL; - This->IBasicAudio_iface.lpVtbl = NULL; - + BasicAudio_Destroy(&This->basicAudio); CloseHandle(This->blocked); TRACE("Destroying Audio Renderer\n"); @@ -830,56 +829,6 @@ static ULONG WINAPI Basicaudio_Release(IBasicAudio *iface) { return DSoundRender_Release(&This->renderer.filter.IBaseFilter_iface); } -/*** IDispatch methods ***/ -static HRESULT WINAPI Basicaudio_GetTypeInfoCount(IBasicAudio *iface, - UINT*pctinfo) { - DSoundRenderImpl *This = impl_from_IBasicAudio(iface); - - TRACE("(%p/%p)->(%p): stub !!!\n", This, iface, pctinfo); - - return S_OK; -} - -static HRESULT WINAPI Basicaudio_GetTypeInfo(IBasicAudio *iface, - UINT iTInfo, - LCID lcid, - ITypeInfo**ppTInfo) { - DSoundRenderImpl *This = impl_from_IBasicAudio(iface); - - TRACE("(%p/%p)->(%d, %d, %p): stub !!!\n", This, iface, iTInfo, lcid, ppTInfo); - - return S_OK; -} - -static HRESULT WINAPI Basicaudio_GetIDsOfNames(IBasicAudio *iface, - REFIID riid, - LPOLESTR*rgszNames, - UINT cNames, - LCID lcid, - DISPID*rgDispId) { - DSoundRenderImpl *This = impl_from_IBasicAudio(iface); - - TRACE("(%p/%p)->(%s (%p), %p, %d, %d, %p): stub !!!\n", This, iface, debugstr_guid(riid), riid, rgszNames, cNames, lcid, rgDispId); - - return S_OK; -} - -static HRESULT WINAPI Basicaudio_Invoke(IBasicAudio *iface, - DISPID dispIdMember, - REFIID riid, - LCID lcid, - WORD wFlags, - DISPPARAMS*pDispParams, - VARIANT*pVarResult, - EXCEPINFO*pExepInfo, - UINT*puArgErr) { - DSoundRenderImpl *This = impl_from_IBasicAudio(iface); - - TRACE("(%p/%p)->(%d, %s (%p), %d, %04x, %p, %p, %p, %p): stub !!!\n", This, iface, dispIdMember, debugstr_guid(riid), riid, lcid, wFlags, pDispParams, pVarResult, pExepInfo, puArgErr); - - return S_OK; -} - /*** IBasicAudio methods ***/ static HRESULT WINAPI Basicaudio_put_Volume(IBasicAudio *iface, LONG lVolume) { @@ -948,10 +897,10 @@ static const IBasicAudioVtbl IBasicAudio_Vtbl = Basicaudio_QueryInterface, Basicaudio_AddRef, Basicaudio_Release, - Basicaudio_GetTypeInfoCount, - Basicaudio_GetTypeInfo, - Basicaudio_GetIDsOfNames, - Basicaudio_Invoke, + BasicAudioImpl_GetTypeInfoCount, + BasicAudioImpl_GetTypeInfo, + BasicAudioImpl_GetIDsOfNames, + BasicAudioImpl_Invoke, Basicaudio_put_Volume, Basicaudio_get_Volume, Basicaudio_put_Balance,

1 0

Thomas Faber : jscript: Add missing port.h include for isnan.
by Alexandre Julliard 30 Apr '12

30 Apr '12

Module: wine Branch: master Commit: 58ad6fcf1fafb379b76c0fd66a5021ad9806bcaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=58ad6fcf1fafb379b76c0fd66… Author: Thomas Faber <thfabba(a)gmx.de> Date: Sat Apr 28 09:08:21 2012 +0200 jscript: Add missing port.h include for isnan. --- dlls/jscript/array.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index 54dc347..fe8d751 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" +#include "wine/port.h" + #include <math.h> #include "jscript.h"

1 0

Nikolay Sivov : msxml3: Use dispex support for IDispatch implementation of process instruction node .
by Alexandre Julliard 30 Apr '12

30 Apr '12

Module: wine Branch: master Commit: 9756cbf70f2a04f97a261425c1a1c1777ea26dfe URL: http://source.winehq.org/git/wine.git/?a=commit;h=9756cbf70f2a04f97a261425c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 28 11:38:03 2012 +0400 msxml3: Use dispex support for IDispatch implementation of process instruction node. --- dlls/msxml3/pi.c | 49 +++++++------------------------------------------ 1 files changed, 7 insertions(+), 42 deletions(-) diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index 36ff563..a6034bb 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -126,12 +126,7 @@ static HRESULT WINAPI dom_pi_GetTypeInfoCount( UINT* pctinfo ) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - - TRACE("(%p)->(%p)\n", This, pctinfo); - - *pctinfo = 1; - - return S_OK; + return IDispatchEx_GetTypeInfoCount(&This->node.dispex.IDispatchEx_iface, pctinfo); } static HRESULT WINAPI dom_pi_GetTypeInfo( @@ -140,10 +135,8 @@ static HRESULT WINAPI dom_pi_GetTypeInfo( ITypeInfo** ppTInfo ) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - - TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); - - return get_typeinfo(IXMLDOMProcessingInstruction_tid, ppTInfo); + return IDispatchEx_GetTypeInfo(&This->node.dispex.IDispatchEx_iface, + iTInfo, lcid, ppTInfo); } static HRESULT WINAPI dom_pi_GetIDsOfNames( @@ -152,23 +145,8 @@ static HRESULT WINAPI dom_pi_GetIDsOfNames( UINT cNames, LCID lcid, DISPID* rgDispId ) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - ITypeInfo *typeinfo; - HRESULT hr; - - TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, - lcid, rgDispId); - - if(!rgszNames || cNames == 0 || !rgDispId) - return E_INVALIDARG; - - hr = get_typeinfo(IXMLDOMProcessingInstruction_tid, &typeinfo); - if(SUCCEEDED(hr)) - { - hr = ITypeInfo_GetIDsOfNames(typeinfo, rgszNames, cNames, rgDispId); - ITypeInfo_Release(typeinfo); - } - - return hr; + return IDispatchEx_GetIDsOfNames(&This->node.dispex.IDispatchEx_iface, + riid, rgszNames, cNames, lcid, rgDispId); } static HRESULT WINAPI dom_pi_Invoke( @@ -178,21 +156,8 @@ static HRESULT WINAPI dom_pi_Invoke( EXCEPINFO* pExcepInfo, UINT* puArgErr ) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - ITypeInfo *typeinfo; - HRESULT hr; - - TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - - hr = get_typeinfo(IXMLDOMProcessingInstruction_tid, &typeinfo); - if(SUCCEEDED(hr)) - { - hr = ITypeInfo_Invoke(typeinfo, &This->IXMLDOMProcessingInstruction_iface, dispIdMember, - wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - ITypeInfo_Release(typeinfo); - } - - return hr; + return IDispatchEx_Invoke(&This->node.dispex.IDispatchEx_iface, + dispIdMember, riid, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); } static HRESULT WINAPI dom_pi_get_nodeName(

1 0