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

Christian Costa : amstream: Add stubbed implementation of AudioStreamSample .
by Alexandre Julliard 26 Apr '12

26 Apr '12

Module: wine Branch: master Commit: 5c09a11e084aa90d10d3fc6da054775c7e73b3da URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c09a11e084aa90d10d3fc6da… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu Apr 26 07:58:14 2012 +0200 amstream: Add stubbed implementation of AudioStreamSample. --- dlls/amstream/mediastream.c | 150 +++++++++++++++++++++++++++++++++++++++- dlls/amstream/tests/amstream.c | 4 +- 2 files changed, 150 insertions(+), 4 deletions(-) diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c index 896d316..2aeaaa4 100644 --- a/dlls/amstream/mediastream.c +++ b/dlls/amstream/mediastream.c @@ -33,6 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(amstream); static HRESULT ddrawstreamsample_create(IDirectDrawMediaStream *parent, IDirectDrawStreamSample **ddraw_stream_sample); +static HRESULT audiostreamsample_create(IAudioMediaStream *parent, IAudioData *audio_data, IAudioStreamSample **audio_stream_sample); typedef struct { IDirectDrawMediaStream IDirectDrawMediaStream_iface; @@ -407,9 +408,12 @@ static HRESULT WINAPI IAudioMediaStreamImpl_CreateSample(IAudioMediaStream *ifac { IAudioMediaStreamImpl *This = impl_from_IAudioMediaStream(iface); - FIXME("(%p/%p)->(%p,%u,%p) stub!\n", iface, This, audio_data, flags, sample); + TRACE("(%p/%p)->(%p,%u,%p)\n", iface, This, audio_data, flags, sample); - return E_NOTIMPL; + if (!audio_data) + return E_POINTER; + + return audiostreamsample_create(iface, audio_data, sample); } static const struct IAudioMediaStreamVtbl AudioMediaStream_Vtbl = @@ -605,3 +609,145 @@ static HRESULT ddrawstreamsample_create(IDirectDrawMediaStream *parent, IDirectD return S_OK; } + +typedef struct { + IAudioStreamSample IAudioStreamSample_iface; + LONG ref; + IMediaStream *parent; + IAudioData *audio_data; +} IAudioStreamSampleImpl; + +static inline IAudioStreamSampleImpl *impl_from_IAudioStreamSample(IAudioStreamSample *iface) +{ + return CONTAINING_RECORD(iface, IAudioStreamSampleImpl, IAudioStreamSample_iface); +} + +/*** IUnknown methods ***/ +static HRESULT WINAPI IAudioStreamSampleImpl_QueryInterface(IAudioStreamSample *iface, + REFIID riid, void **ret_iface) +{ + TRACE("(%p)->(%s,%p)\n", iface, debugstr_guid(riid), ret_iface); + + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IStreamSample) || + IsEqualGUID(riid, &IID_IAudioStreamSample)) + { + IAudioStreamSample_AddRef(iface); + *ret_iface = iface; + return S_OK; + } + + *ret_iface = NULL; + + ERR("(%p)->(%s,%p),not found\n", iface, debugstr_guid(riid), ret_iface); + return E_NOINTERFACE; +} + +static ULONG WINAPI IAudioStreamSampleImpl_AddRef(IAudioStreamSample *iface) +{ + IAudioStreamSampleImpl *This = impl_from_IAudioStreamSample(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p)->(): new ref = %u\n", iface, ref); + + return ref; +} + +static ULONG WINAPI IAudioStreamSampleImpl_Release(IAudioStreamSample *iface) +{ + IAudioStreamSampleImpl *This = impl_from_IAudioStreamSample(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p)->(): new ref = %u\n", iface, ref); + + if (!ref) + HeapFree(GetProcessHeap(), 0, This); + + return ref; +} + +/*** IStreamSample methods ***/ +static HRESULT WINAPI IAudioStreamSampleImpl_GetMediaStream(IAudioStreamSample *iface, IMediaStream **media_stream) +{ + FIXME("(%p)->(%p): stub\n", iface, media_stream); + + return E_NOTIMPL; +} + +static HRESULT WINAPI IAudioStreamSampleImpl_GetSampleTimes(IAudioStreamSample *iface, STREAM_TIME *start_time, + STREAM_TIME *end_time, STREAM_TIME *current_time) +{ + FIXME("(%p)->(%p,%p,%p): stub\n", iface, start_time, end_time, current_time); + + return E_NOTIMPL; +} + +static HRESULT WINAPI IAudioStreamSampleImpl_SetSampleTimes(IAudioStreamSample *iface, const STREAM_TIME *start_time, + const STREAM_TIME *end_time) +{ + FIXME("(%p)->(%p,%p): stub\n", iface, start_time, end_time); + + return E_NOTIMPL; +} + +static HRESULT WINAPI IAudioStreamSampleImpl_Update(IAudioStreamSample *iface, DWORD flags, HANDLE event, + PAPCFUNC func_APC, DWORD APC_data) +{ + FIXME("(%p)->(%x,%p,%p,%u): stub\n", iface, flags, event, func_APC, APC_data); + + return E_NOTIMPL; +} + +static HRESULT WINAPI IAudioStreamSampleImpl_CompletionStatus(IAudioStreamSample *iface, DWORD flags, DWORD milliseconds) +{ + FIXME("(%p)->(%x,%u): stub\n", iface, flags, milliseconds); + + return E_NOTIMPL; +} + +/*** IAudioStreamSample methods ***/ +static HRESULT WINAPI IAudioStreamSampleImpl_GetAudioData(IAudioStreamSample *iface, IAudioData **audio_data) +{ + FIXME("(%p)->(%p): stub\n", iface, audio_data); + + return E_NOTIMPL; +} + +static const struct IAudioStreamSampleVtbl AudioStreamSample_Vtbl = +{ + /*** IUnknown methods ***/ + IAudioStreamSampleImpl_QueryInterface, + IAudioStreamSampleImpl_AddRef, + IAudioStreamSampleImpl_Release, + /*** IStreamSample methods ***/ + IAudioStreamSampleImpl_GetMediaStream, + IAudioStreamSampleImpl_GetSampleTimes, + IAudioStreamSampleImpl_SetSampleTimes, + IAudioStreamSampleImpl_Update, + IAudioStreamSampleImpl_CompletionStatus, + /*** IAudioStreamSample methods ***/ + IAudioStreamSampleImpl_GetAudioData +}; + +static HRESULT audiostreamsample_create(IAudioMediaStream *parent, IAudioData *audio_data, IAudioStreamSample **audio_stream_sample) +{ + IAudioStreamSampleImpl *object; + + TRACE("(%p)\n", audio_stream_sample); + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IAudioStreamSampleImpl)); + if (!object) + { + ERR("Out of memory\n"); + return E_OUTOFMEMORY; + } + + object->IAudioStreamSample_iface.lpVtbl = &AudioStreamSample_Vtbl; + object->ref = 1; + object->parent = (IMediaStream*)parent; + object->audio_data = audio_data; + + *audio_stream_sample = (IAudioStreamSample*)&object->IAudioStreamSample_iface; + + return S_OK; +} diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 6d4b601..f613c8c 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -337,9 +337,9 @@ static void test_media_streams(void) ok(hr == S_OK, "CoCreateInstance returned: %x\n", hr); hr = IAudioMediaStream_CreateSample(audio_media_stream, NULL, 0, &audio_sample); - todo_wine ok(hr == E_POINTER, "IAudioMediaStream_CreateSample returned: %x\n", hr); + ok(hr == E_POINTER, "IAudioMediaStream_CreateSample returned: %x\n", hr); hr = IAudioMediaStream_CreateSample(audio_media_stream, audio_data, 0, &audio_sample); - todo_wine ok(hr == S_OK, "IAudioMediaStream_CreateSample returned: %x\n", hr); + ok(hr == S_OK, "IAudioMediaStream_CreateSample returned: %x\n", hr); if (audio_data) IAudioData_Release(audio_data);

1 0

Piotr Caban : make_unicode: Create tables with data needed by nameprep algorithm.
by Alexandre Julliard 26 Apr '12

26 Apr '12

Module: wine Branch: master Commit: 047793e1aab100d8d64d6b252535ca20f7b6de98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=047793e1aab100d8d64d6b252… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 25 17:56:33 2012 +0200 make_unicode: Create tables with data needed by nameprep algorithm. --- dlls/kernel32/Makefile.in | 1 + dlls/kernel32/nameprep.c | 1430 +++++++++++++++++++++++++++++++++++++++++++++ tools/make_unicode | 190 ++++++ 3 files changed, 1621 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=047793e1aab100d8d64d6…

1 0

Piotr Caban : kernel32: Added IdnToNameprepUnicode implementation.
by Alexandre Julliard 26 Apr '12

26 Apr '12

Module: wine Branch: master Commit: a08710f3d042ecc950723c8bdbd4b34b71dbbe9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a08710f3d042ecc950723c8bd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 24 16:10:53 2012 +0200 kernel32: Added IdnToNameprepUnicode implementation. --- dlls/kernel32/locale.c | 174 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 171 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 20451ff..02a351c 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -172,6 +172,10 @@ static inline void strcpynAtoW( WCHAR *dst, const char *src, size_t n ) if (n) *dst = 0; } +static inline unsigned short get_table_entry( const unsigned short *table, WCHAR ch ) +{ + return table[table[table[ch >> 8] + ((ch >> 4) & 0x0f)] + (ch & 0xf)]; +} /*********************************************************************** * get_lcid_codepage @@ -3895,10 +3899,174 @@ INT WINAPI IdnToAscii(DWORD dwFlags, LPCWSTR lpUnicodeCharStr, INT cchUnicodeCha INT WINAPI IdnToNameprepUnicode(DWORD dwFlags, LPCWSTR lpUnicodeCharStr, INT cchUnicodeChar, LPWSTR lpNameprepCharStr, INT cchNameprepChar) { - FIXME("%x %p %d %p %d\n", dwFlags, lpUnicodeCharStr, cchUnicodeChar, + enum { + UNASSIGNED = 0x1, + PROHIBITED = 0x2, + BIDI_RAL = 0x4, + BIDI_L = 0x8 + }; + + extern const unsigned short nameprep_char_type[]; + extern const WCHAR nameprep_mapping[]; + const WCHAR *ptr; + WORD flags; + WCHAR *map_str, *norm_str, ch; + DWORD i, map_len, norm_len, mask; + BOOL have_bidi_ral = FALSE, prohibit_bidi_ral = FALSE, ascii_only = TRUE; + + TRACE("%x %p %d %p %d\n", dwFlags, lpUnicodeCharStr, cchUnicodeChar, lpNameprepCharStr, cchNameprepChar); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + + if(dwFlags & ~(IDN_ALLOW_UNASSIGNED|IDN_USE_STD3_ASCII_RULES)) { + SetLastError(ERROR_INVALID_FLAGS); + return 0; + } + + if(!lpUnicodeCharStr || cchUnicodeChar<-1) { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + + if(cchUnicodeChar == -1) + cchUnicodeChar = strlenW(lpUnicodeCharStr)+1; + if(!cchUnicodeChar || (cchUnicodeChar==1 && lpUnicodeCharStr[0]==0)) { + SetLastError(ERROR_INVALID_NAME); + return 0; + } + + for(i=0; i<cchUnicodeChar; i++) { + ch = lpUnicodeCharStr[i]; + if(ch > 0x8f) { + ascii_only = FALSE; + continue; + } + + if(i==cchUnicodeChar-1 && !ch) + continue; + if(!ch) { + SetLastError(ERROR_INVALID_NAME); + return 0; + } + + if((dwFlags&IDN_USE_STD3_ASCII_RULES) == 0) + continue; + if((ch>='a' && ch<='z') || (ch>='A' && ch<='Z') + || (ch>='0' && ch<='9') || ch=='-') + continue; + + SetLastError(ERROR_INVALID_NAME); + return 0; + } + + if((dwFlags&IDN_USE_STD3_ASCII_RULES) && + (lpUnicodeCharStr[0]=='-' || lpUnicodeCharStr[cchUnicodeChar-1]=='-' || + (cchUnicodeChar>1 && lpUnicodeCharStr[cchUnicodeChar-1]==0 && + lpUnicodeCharStr[cchUnicodeChar-2]=='-'))) { + SetLastError(ERROR_INVALID_NAME); + return 0; + } + + if(ascii_only) { + if(!lpNameprepCharStr) + return cchUnicodeChar; + if(cchNameprepChar < cchUnicodeChar) { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return 0; + } + memcpy(lpNameprepCharStr, lpUnicodeCharStr, cchUnicodeChar*sizeof(WCHAR)); + return cchUnicodeChar; + } + + map_len = 0; + for(i=0; i<cchUnicodeChar; i++) { + ch = lpUnicodeCharStr[i]; + ptr = nameprep_mapping + nameprep_mapping[ch>>8]; + ptr = nameprep_mapping + ptr[(ch>>4)&0x0f] + 3*(ch&0x0f); + + if(!ptr[0]) map_len++; + else if(!ptr[1]) map_len++; + else if(!ptr[2]) map_len += 2; + else if(ptr[0]!=0xffff || ptr[1]!=0xffff || ptr[2]!=0xffff) map_len += 3; + } + map_str = HeapAlloc(GetProcessHeap(), 0, map_len*sizeof(WCHAR)); + if(!map_str) { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return 0; + } + map_len = 0; + for(i=0; i<cchUnicodeChar; i++) { + ch = lpUnicodeCharStr[i]; + ptr = nameprep_mapping + nameprep_mapping[ch>>8]; + ptr = nameprep_mapping + ptr[(ch>>4)&0x0f] + 3*(ch&0x0f); + + if(!ptr[0]) { + map_str[map_len++] = ch; + }else if(!ptr[1]) { + map_str[map_len++] = ptr[0]; + }else if(!ptr[2]) { + map_str[map_len++] = ptr[0]; + map_str[map_len++] = ptr[1]; + }else if(ptr[0]!=0xffff || ptr[1]!=0xffff || ptr[2]!=0xffff) { + map_str[map_len++] = ptr[0]; + map_str[map_len++] = ptr[1]; + map_str[map_len++] = ptr[2]; + } + } + + norm_len = FoldStringW(MAP_FOLDCZONE, map_str, map_len, lpNameprepCharStr, cchNameprepChar); + if(lpNameprepCharStr) { + norm_str = lpNameprepCharStr; + }else { + norm_str = HeapAlloc(GetProcessHeap(), 0, norm_len*sizeof(WCHAR)); + if(!norm_str) { + HeapFree(GetProcessHeap(), 0, map_str); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return 0; + } + FoldStringW(MAP_FOLDCZONE, map_str, map_len, norm_str, norm_len); + } + HeapFree(GetProcessHeap(), 0, map_str); + + mask = PROHIBITED; + if((dwFlags&IDN_ALLOW_UNASSIGNED) == 0) + mask |= UNASSIGNED; + for(i=0; i<norm_len; i++) { + ch = norm_str[i]; + flags = get_table_entry( nameprep_char_type, ch ); + + if(flags & mask) { + if(norm_str != lpNameprepCharStr) + HeapFree(GetProcessHeap(), 0, norm_str); + SetLastError((flags & PROHIBITED) ? ERROR_INVALID_NAME : ERROR_NO_UNICODE_TRANSLATION); + return 0; + } + + if(flags & BIDI_RAL) + have_bidi_ral = TRUE; + if(flags & BIDI_L) + prohibit_bidi_ral = TRUE; + } + + if(have_bidi_ral) { + ch = norm_str[0]; + flags = get_table_entry( nameprep_char_type, ch ); + if((flags & BIDI_RAL) == 0) + prohibit_bidi_ral = TRUE; + + ch = norm_str[norm_len-1]; + flags = get_table_entry( nameprep_char_type, ch ); + if((flags & BIDI_RAL) == 0) + prohibit_bidi_ral = TRUE; + } + + if(norm_str != lpNameprepCharStr) + HeapFree(GetProcessHeap(), 0, norm_str); + + if(have_bidi_ral && prohibit_bidi_ral) { + SetLastError(ERROR_INVALID_NAME); + return 0; + } + return norm_len; } /******************************************************************************

1 0

Piotr Caban : kernel32/tests: Added more FoldString tests.
by Alexandre Julliard 26 Apr '12

26 Apr '12

Module: wine Branch: master Commit: 4242fc94a5aace8126b87dc03b40cf1dde237db7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4242fc94a5aace8126b87dc03… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 24 16:11:12 2012 +0200 kernel32/tests: Added more FoldString tests. --- dlls/kernel32/tests/locale.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 49678ce..79653ba 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -2102,6 +2102,18 @@ static void test_FoldStringW(void) { 'W','i','n','e',0x0348,0x0551,0x1323,0x280d,'W','i','n','e','\0' }; + static const WCHAR foldczone_todo_src[] = + { + 0x3c5,0x308,0x6a,0x30c,0xa0,0xaa,0 + }; + static const WCHAR foldczone_todo_dst[] = + { + 0x3cb,0x1f0,' ','a',0 + }; + static const WCHAR foldczone_todo_broken_dst[] = + { + 0x3cb,0x1f0,0xa0,0xaa,0 + }; static const WCHAR ligatures_src[] = { 'W', 'i', 'n', 'e', 0x03a6, 0x03b9, 0x03bd, 0x03b5, @@ -2246,6 +2258,13 @@ static void test_FoldStringW(void) ok(!memcmp(dst, foldczone_dst, sizeof(foldczone_dst)), "MAP_FOLDCZONE: Expanded incorrectly\n"); + ret = pFoldStringW(MAP_FOLDCZONE|MAP_PRECOMPOSED, foldczone_todo_src, -1, dst, 256); + todo_wine ok(ret == sizeof(foldczone_todo_dst)/sizeof(foldczone_todo_dst[0]), + "Got %d, error %d\n", ret, GetLastError()); + todo_wine ok(!memcmp(dst, foldczone_todo_dst, sizeof(foldczone_todo_dst)) + || broken(!memcmp(dst, foldczone_todo_broken_dst, sizeof(foldczone_todo_broken_dst))), + "MAP_FOLDCZONE: Expanded incorrectly (%s)\n", wine_dbgstr_w(dst)); + /* MAP_EXPAND_LIGATURES */ SetLastError(0); ret = pFoldStringW(MAP_EXPAND_LIGATURES, ligatures_src, -1, dst, 256);

1 0

Piotr Caban : kernel32/tests: Added IdnToNameprepUnicode tests.
by Alexandre Julliard 26 Apr '12

26 Apr '12

Module: wine Branch: master Commit: 6cda3776f6d19877196f8abff2b4c28a1e6e669c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cda3776f6d19877196f8abff… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 24 16:11:52 2012 +0200 kernel32/tests: Added IdnToNameprepUnicode tests. --- dlls/kernel32/tests/locale.c | 156 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 156 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 79653ba..63cace1 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -76,6 +76,7 @@ static INT (WINAPI *pLCIDToLocaleName)(LCID, LPWSTR, INT, DWORD); 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 void InitFunctionPointers(void) { @@ -89,6 +90,7 @@ static void InitFunctionPointers(void) pIsValidLanguageGroup = (void*)GetProcAddress(hKernel32, "IsValidLanguageGroup"); pEnumUILanguagesA = (void*)GetProcAddress(hKernel32, "EnumUILanguagesA"); pEnumSystemLocalesEx = (void*)GetProcAddress(hKernel32, "EnumSystemLocalesEx"); + pIdnToNameprepUnicode = (void*)GetProcAddress(hKernel32, "IdnToNameprepUnicode"); } #define eq(received, expected, label, type) \ @@ -2826,6 +2828,159 @@ static void test_GetStringTypeW(void) ok(types[i] & C1_SPACE || broken(types[i] == C1_CNTRL) || broken(types[i] == 0), "incorrect types returned for %x -> (%x does not have %x)\n",space_special[i], types[i], C1_SPACE ); } +static void test_IdnToNameprepUnicode(void) +{ + struct { + DWORD in_len; + const WCHAR in[64]; + DWORD ret; + const WCHAR out[64]; + DWORD flags; + DWORD err; + DWORD todo; + } test_data[] = { + { + 5, {'t','e','s','t',0}, + 5, {'t','e','s','t',0}, + 0, 0xdeadbeef + }, + { + 3, {'a',0xe111,'b'}, + 0, {0}, + 0, ERROR_INVALID_NAME + }, + { + 4, {'t',0,'e',0}, + 0, {0}, + 0, ERROR_INVALID_NAME + }, + { + 1, {'T',0}, + 1, {'T',0}, + 0, 0xdeadbeef + }, + { + 1, {0}, + 0, {0}, + 0, ERROR_INVALID_NAME + }, + { + 6, {' ','-','/','[',']',0}, + 6, {' ','-','/','[',']',0}, + 0, 0xdeadbeef + }, + { + 3, {'a','-','a'}, + 3, {'a','-','a'}, + IDN_USE_STD3_ASCII_RULES, 0xdeadbeef + }, + { + 3, {'a','a','-'}, + 0, {0}, + IDN_USE_STD3_ASCII_RULES, ERROR_INVALID_NAME + }, + { /* FoldString is not working as expected when MAP_FOLDCZONE is specified (composition+compatibility) */ + 10, {'T',0xdf,0x130,0x143,0x37a,0x6a,0x30c,' ',0xaa,0}, + 12, {'t','s','s','i',0x307,0x144,' ',0x3b9,0x1f0,' ','a',0}, + 0, 0xdeadbeef, TRUE + }, + { + 11, {'t',0xad,0x34f,0x1806,0x180b,0x180c,0x180d,0x200b,0x200c,0x200d,0}, + 2, {'t',0}, + 0, 0xdeadbeef + }, + { /* Another example of incorrectly working FoldString (composition) */ + 2, {0x3b0, 0}, + 2, {0x3b0, 0}, + 0, 0xdeadbeef, TRUE + }, + { + 2, {0x221, 0}, + 0, {0}, + 0, ERROR_NO_UNICODE_TRANSLATION + }, + { + 2, {0x221, 0}, + 2, {0x221, 0}, + IDN_ALLOW_UNASSIGNED, 0xdeadbeef + }, + }; + + WCHAR buf[1024]; + DWORD i, ret, err; + + if (!pIdnToNameprepUnicode) + { + win_skip("IdnToNameprepUnicode is not available\n"); + return; + } + + ret = pIdnToNameprepUnicode(0, test_data[0].in, + test_data[0].in_len, NULL, 0); + ok(ret == test_data[0].ret, "ret = %d\n", ret); + + SetLastError(0xdeadbeef); + ret = pIdnToNameprepUnicode(0, test_data[1].in, + test_data[1].in_len, NULL, 0); + err = GetLastError(); + ok(ret == test_data[1].ret, "ret = %d\n", ret); + ok(err == test_data[1].err, "err = %d\n", err); + + SetLastError(0xdeadbeef); + ret = pIdnToNameprepUnicode(0, test_data[0].in, -1, + buf, sizeof(buf)/sizeof(WCHAR)); + err = GetLastError(); + ok(ret == test_data[0].ret, "ret = %d\n", ret); + ok(err == 0xdeadbeef, "err = %d\n", err); + + SetLastError(0xdeadbeef); + ret = pIdnToNameprepUnicode(0, test_data[0].in, -2, + buf, sizeof(buf)/sizeof(WCHAR)); + err = GetLastError(); + ok(ret == 0, "ret = %d\n", ret); + ok(err == ERROR_INVALID_PARAMETER, "err = %d\n", err); + + SetLastError(0xdeadbeef); + ret = pIdnToNameprepUnicode(0, test_data[0].in, 0, + buf, sizeof(buf)/sizeof(WCHAR)); + err = GetLastError(); + ok(ret == 0, "ret = %d\n", ret); + ok(err == ERROR_INVALID_NAME, "err = %d\n", err); + + ret = pIdnToNameprepUnicode(IDN_ALLOW_UNASSIGNED|IDN_USE_STD3_ASCII_RULES, + test_data[0].in, -1, buf, sizeof(buf)/sizeof(WCHAR)); + ok(ret == test_data[0].ret, "ret = %d\n", ret); + + SetLastError(0xdeadbeef); + ret = pIdnToNameprepUnicode(0, NULL, 0, NULL, 0); + err = GetLastError(); + ok(ret == 0, "ret = %d\n", ret); + ok(err == ERROR_INVALID_PARAMETER, "err = %d\n", err); + + SetLastError(0xdeadbeef); + ret = pIdnToNameprepUnicode(4, NULL, 0, NULL, 0); + err = GetLastError(); + ok(ret == 0, "ret = %d\n", ret); + ok(err == ERROR_INVALID_FLAGS, "err = %d\n", err); + + for (i=0; i<sizeof(test_data)/sizeof(*test_data); i++) + { + SetLastError(0xdeadbeef); + ret = pIdnToNameprepUnicode(test_data[i].flags, test_data[i].in, + test_data[i].in_len, buf, sizeof(buf)/sizeof(WCHAR)); + err = GetLastError(); + if(!test_data[i].todo) { + 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)); + }else { + todo_wine ok(!memcmp(test_data[i].out, buf, ret*sizeof(WCHAR)), + "%d) buf = %s\n", i, wine_dbgstr_wn(buf, ret)); + } + } +} + START_TEST(locale) { InitFunctionPointers(); @@ -2853,6 +3008,7 @@ START_TEST(locale) test_EnumUILanguageA(); test_GetCPInfo(); test_GetStringTypeW(); + test_IdnToNameprepUnicode(); /* this requires collation table patch to make it MS compatible */ if (0) test_sorting(); }

1 0

Henri Verbeet : d3d9: Properly retrieve an interface pointer in IDirect3DDevice9Impl_GetRenderTarget ().
by Alexandre Julliard 26 Apr '12

26 Apr '12

Module: wine Branch: master Commit: 6a03dbf111720a52712034f6c579a45444915457 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a03dbf111720a52712034f6c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 25 21:24:18 2012 +0200 d3d9: Properly retrieve an interface pointer in IDirect3DDevice9Impl_GetRenderTarget(). --- dlls/d3d9/device.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 943c608..a88dc73 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1188,6 +1188,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetRenderTarget(IDirect3DDevice9Ex *i { IDirect3DDevice9Impl *This = impl_from_IDirect3DDevice9Ex(iface); struct wined3d_surface *wined3d_surface; + IDirect3DSurface9Impl *surface_impl; HRESULT hr; TRACE("iface %p, idx %u, surface %p.\n", iface, RenderTargetIndex, ppRenderTarget); @@ -1206,7 +1207,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetRenderTarget(IDirect3DDevice9Ex *i hr = wined3d_device_get_render_target(This->wined3d_device, RenderTargetIndex, &wined3d_surface); if (SUCCEEDED(hr)) { - *ppRenderTarget = wined3d_surface_get_parent(wined3d_surface); + surface_impl = wined3d_surface_get_parent(wined3d_surface); + *ppRenderTarget = &surface_impl->IDirect3DSurface9_iface; IDirect3DSurface9_AddRef(*ppRenderTarget); wined3d_surface_decref(wined3d_surface); }

1 0

Henri Verbeet : d3d9: Properly retrieve an interface pointer in IDirect3DDevice9Impl_GetDepthStencilSurface ().
by Alexandre Julliard 26 Apr '12

26 Apr '12

Module: wine Branch: master Commit: e333334450eaf6f4c984e5d3fbb17f4f7a5583e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e333334450eaf6f4c984e5d3f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 25 21:24:19 2012 +0200 d3d9: Properly retrieve an interface pointer in IDirect3DDevice9Impl_GetDepthStencilSurface(). --- dlls/d3d9/device.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index a88dc73..812de68 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1244,6 +1244,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetDepthStencilSurface(IDirect3DDevic { IDirect3DDevice9Impl *This = impl_from_IDirect3DDevice9Ex(iface); struct wined3d_surface *wined3d_surface; + IDirect3DSurface9Impl *surface_impl; HRESULT hr; TRACE("iface %p, depth_stencil %p.\n", iface, ppZStencilSurface); @@ -1256,7 +1257,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetDepthStencilSurface(IDirect3DDevic hr = wined3d_device_get_depth_stencil(This->wined3d_device, &wined3d_surface); if (SUCCEEDED(hr)) { - *ppZStencilSurface = wined3d_surface_get_parent(wined3d_surface); + surface_impl = wined3d_surface_get_parent(wined3d_surface); + *ppZStencilSurface = &surface_impl->IDirect3DSurface9_iface; IDirect3DSurface9_AddRef(*ppZStencilSurface); wined3d_surface_decref(wined3d_surface); }

1 0

Henri Verbeet : d3d9: Properly retrieve an interface pointer in IDirect3DDevice9Impl_GetTexture( ).
by Alexandre Julliard 26 Apr '12

26 Apr '12

Module: wine Branch: master Commit: 3e2d9462909558e2261000eab10936deea20a0b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e2d9462909558e2261000eab… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 25 21:24:20 2012 +0200 d3d9: Properly retrieve an interface pointer in IDirect3DDevice9Impl_GetTexture(). --- dlls/d3d9/device.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 812de68..c5dc834 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1691,6 +1691,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetTexture(IDirect3DDevice9Ex *iface, { IDirect3DDevice9Impl *This = impl_from_IDirect3DDevice9Ex(iface); struct wined3d_texture *wined3d_texture = NULL; + struct d3d9_texture *texture_impl; HRESULT hr; TRACE("iface %p, stage %u, texture %p.\n", iface, Stage, ppTexture); @@ -1703,7 +1704,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetTexture(IDirect3DDevice9Ex *iface, hr = wined3d_device_get_texture(This->wined3d_device, Stage, &wined3d_texture); if (SUCCEEDED(hr) && wined3d_texture) { - *ppTexture = wined3d_texture_get_parent(wined3d_texture); + texture_impl = wined3d_texture_get_parent(wined3d_texture); + *ppTexture = &texture_impl->IDirect3DBaseTexture9_iface; IDirect3DBaseTexture9_AddRef(*ppTexture); wined3d_texture_decref(wined3d_texture); }

1 0

Henri Verbeet : ddraw: Get rid of IClassFactoryImpl.
by Alexandre Julliard 26 Apr '12

26 Apr '12

Module: wine Branch: master Commit: 9fd2d34d6887aef5e7f9d2b3b87a0f78780cbdfa URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fd2d34d6887aef5e7f9d2b3b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 25 21:24:21 2012 +0200 ddraw: Get rid of IClassFactoryImpl. --- dlls/ddraw/main.c | 65 ++++++++++++++++++++++++---------------------------- 1 files changed, 30 insertions(+), 35 deletions(-) diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 400bb30..db79184 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -511,21 +511,17 @@ static const struct object_creation_info object_creation[] = { &CLSID_DirectDrawClipper, CF_CreateDirectDrawClipper } }; - -/****************************************************************************** - * DirectDraw ClassFactory implementation - ******************************************************************************/ -typedef struct +struct ddraw_class_factory { IClassFactory IClassFactory_iface; LONG ref; HRESULT (*pfnCreateInstance)(IUnknown *pUnkOuter, REFIID iid, LPVOID *ppObj); -} IClassFactoryImpl; +}; -static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) +static inline struct ddraw_class_factory *impl_from_IClassFactory(IClassFactory *iface) { - return CONTAINING_RECORD(iface, IClassFactoryImpl, IClassFactory_iface); + return CONTAINING_RECORD(iface, struct ddraw_class_factory, IClassFactory_iface); } /******************************************************************************* @@ -542,16 +538,15 @@ static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) * Failure: E_NOINTERFACE * *******************************************************************************/ -static HRESULT WINAPI IDirectDrawClassFactoryImpl_QueryInterface(IClassFactory *iface, REFIID riid, - void **obj) +static HRESULT WINAPI ddraw_class_factory_QueryInterface(IClassFactory *iface, REFIID riid, void **out) { - TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), obj); + TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IClassFactory)) { IClassFactory_AddRef(iface); - *obj = iface; + *out = iface; return S_OK; } @@ -569,12 +564,12 @@ static HRESULT WINAPI IDirectDrawClassFactoryImpl_QueryInterface(IClassFactory * * The new refcount * *******************************************************************************/ -static ULONG WINAPI IDirectDrawClassFactoryImpl_AddRef(IClassFactory *iface) +static ULONG WINAPI ddraw_class_factory_AddRef(IClassFactory *iface) { - IClassFactoryImpl *This = impl_from_IClassFactory(iface); - ULONG ref = InterlockedIncrement(&This->ref); + struct ddraw_class_factory *factory = impl_from_IClassFactory(iface); + ULONG ref = InterlockedIncrement(&factory->ref); - TRACE("%p increasing refcount to %u.\n", This, ref); + TRACE("%p increasing refcount to %u.\n", factory, ref); return ref; } @@ -589,15 +584,15 @@ static ULONG WINAPI IDirectDrawClassFactoryImpl_AddRef(IClassFactory *iface) * The new refcount * *******************************************************************************/ -static ULONG WINAPI IDirectDrawClassFactoryImpl_Release(IClassFactory *iface) +static ULONG WINAPI ddraw_class_factory_Release(IClassFactory *iface) { - IClassFactoryImpl *This = impl_from_IClassFactory(iface); - ULONG ref = InterlockedDecrement(&This->ref); + struct ddraw_class_factory *factory = impl_from_IClassFactory(iface); + ULONG ref = InterlockedDecrement(&factory->ref); - TRACE("%p decreasing refcount to %u.\n", This, ref); + TRACE("%p decreasing refcount to %u.\n", factory, ref); - if (ref == 0) - HeapFree(GetProcessHeap(), 0, This); + if (!ref) + HeapFree(GetProcessHeap(), 0, factory); return ref; } @@ -615,15 +610,15 @@ static ULONG WINAPI IDirectDrawClassFactoryImpl_Release(IClassFactory *iface) * ??? * *******************************************************************************/ -static HRESULT WINAPI IDirectDrawClassFactoryImpl_CreateInstance(IClassFactory *iface, - IUnknown *UnkOuter, REFIID riid, void **obj) +static HRESULT WINAPI ddraw_class_factory_CreateInstance(IClassFactory *iface, + IUnknown *outer_unknown, REFIID riid, void **out) { - IClassFactoryImpl *This = impl_from_IClassFactory(iface); + struct ddraw_class_factory *factory = impl_from_IClassFactory(iface); - TRACE("iface %p, outer_unknown %p, riid %s, object %p.\n", - iface, UnkOuter, debugstr_guid(riid), obj); + TRACE("iface %p, outer_unknown %p, riid %s, out %p.\n", + iface, outer_unknown, debugstr_guid(riid), out); - return This->pfnCreateInstance(UnkOuter, riid, obj); + return factory->pfnCreateInstance(outer_unknown, riid, out); } /******************************************************************************* @@ -638,7 +633,7 @@ static HRESULT WINAPI IDirectDrawClassFactoryImpl_CreateInstance(IClassFactory * * S_OK, because it's a stub * *******************************************************************************/ -static HRESULT WINAPI IDirectDrawClassFactoryImpl_LockServer(IClassFactory *iface, BOOL dolock) +static HRESULT WINAPI ddraw_class_factory_LockServer(IClassFactory *iface, BOOL dolock) { FIXME("iface %p, dolock %#x stub!\n", iface, dolock); @@ -650,11 +645,11 @@ static HRESULT WINAPI IDirectDrawClassFactoryImpl_LockServer(IClassFactory *ifac *******************************************************************************/ static const IClassFactoryVtbl IClassFactory_Vtbl = { - IDirectDrawClassFactoryImpl_QueryInterface, - IDirectDrawClassFactoryImpl_AddRef, - IDirectDrawClassFactoryImpl_Release, - IDirectDrawClassFactoryImpl_CreateInstance, - IDirectDrawClassFactoryImpl_LockServer + ddraw_class_factory_QueryInterface, + ddraw_class_factory_AddRef, + ddraw_class_factory_Release, + ddraw_class_factory_CreateInstance, + ddraw_class_factory_LockServer }; /******************************************************************************* @@ -676,8 +671,8 @@ static const IClassFactoryVtbl IClassFactory_Vtbl = */ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { + struct ddraw_class_factory *factory; unsigned int i; - IClassFactoryImpl *factory; TRACE("rclsid %s, riid %s, object %p.\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv);

1 0

Henri Verbeet : wined3d: Move the resource bind_count field up to wined3d_resource.
by Alexandre Julliard 26 Apr '12

26 Apr '12

Module: wine Branch: master Commit: de43de510ac9042970f16591b6a30e8f8c7bd43a URL: http://source.winehq.org/git/wine.git/?a=commit;h=de43de510ac9042970f16591b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 25 21:24:22 2012 +0200 wined3d: Move the resource bind_count field up to wined3d_resource. --- dlls/wined3d/buffer.c | 6 +++--- dlls/wined3d/device.c | 12 ++++++------ dlls/wined3d/texture.c | 4 ++-- dlls/wined3d/wined3d_private.h | 3 +-- 4 files changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 495fe2f..e4f3668 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -767,7 +767,7 @@ void CDECL wined3d_buffer_preload(struct wined3d_buffer *buffer) } /* Reading the declaration makes only sense if the stateblock is finalized and the buffer bound to a stream */ - if (device->isInDraw && buffer->bind_count > 0) + if (device->isInDraw && buffer->resource.bind_count > 0) { decl_changed = buffer_find_decl(buffer); buffer->flags |= WINED3D_BUFFER_HASDESC; @@ -836,7 +836,7 @@ void CDECL wined3d_buffer_preload(struct wined3d_buffer *buffer) FIXME("Too many full buffer conversions, stopping converting.\n"); buffer_unload(&buffer->resource); buffer->flags &= ~WINED3D_BUFFER_CREATEBO; - if (buffer->bind_count) + if (buffer->resource.bind_count) device_invalidate_state(device, STATE_STREAMSRC); return; } @@ -1063,7 +1063,7 @@ HRESULT CDECL wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UIN TRACE("Dynamic buffer, dropping VBO\n"); buffer_unload(&buffer->resource); buffer->flags &= ~WINED3D_BUFFER_CREATEBO; - if (buffer->bind_count) + if (buffer->resource.bind_count) device_invalidate_state(device, STATE_STREAMSRC); } else diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ad30afa..e477021 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1696,12 +1696,12 @@ HRESULT CDECL wined3d_device_set_stream_source(struct wined3d_device *device, UI if (buffer) { - InterlockedIncrement(&buffer->bind_count); + InterlockedIncrement(&buffer->resource.bind_count); wined3d_buffer_incref(buffer); } if (prev_buffer) { - InterlockedDecrement(&prev_buffer->bind_count); + InterlockedDecrement(&prev_buffer->resource.bind_count); wined3d_buffer_decref(prev_buffer); } @@ -2328,12 +2328,12 @@ HRESULT CDECL wined3d_device_set_index_buffer(struct wined3d_device *device, device_invalidate_state(device, STATE_INDEXBUFFER); if (buffer) { - InterlockedIncrement(&buffer->bind_count); + InterlockedIncrement(&buffer->resource.bind_count); wined3d_buffer_incref(buffer); } if (prev_buffer) { - InterlockedDecrement(&prev_buffer->bind_count); + InterlockedDecrement(&prev_buffer->resource.bind_count); wined3d_buffer_decref(prev_buffer); } } @@ -3669,7 +3669,7 @@ HRESULT CDECL wined3d_device_set_texture(struct wined3d_device *device, if (texture) { - LONG bind_count = InterlockedIncrement(&texture->bind_count); + LONG bind_count = InterlockedIncrement(&texture->resource.bind_count); wined3d_texture_incref(texture); @@ -3691,7 +3691,7 @@ HRESULT CDECL wined3d_device_set_texture(struct wined3d_device *device, if (prev) { - LONG bind_count = InterlockedDecrement(&prev->bind_count); + LONG bind_count = InterlockedDecrement(&prev->resource.bind_count); wined3d_texture_decref(prev); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index cc7edb0..94589ae 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -502,7 +502,7 @@ DWORD CDECL wined3d_texture_set_lod(struct wined3d_texture *texture, DWORD lod) texture->texture_rgb.states[WINED3DTEXSTA_MAXMIPLEVEL] = ~0U; texture->texture_srgb.states[WINED3DTEXSTA_MAXMIPLEVEL] = ~0U; - if (texture->bind_count) + if (texture->resource.bind_count) device_invalidate_state(texture->resource.device, STATE_SAMPLER(texture->sampler)); } @@ -1056,7 +1056,7 @@ static void texture3d_preload(struct wined3d_texture *texture, enum WINED3DSRGB /* TODO: Use already acquired context when possible. */ context = context_acquire(device, NULL); - if (texture->bind_count > 0) + if (texture->resource.bind_count > 0) { BOOL texture_srgb = texture->flags & WINED3D_TEXTURE_IS_SRGB; BOOL sampler_srgb = texture_srgb_mode(texture, srgb); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0a110f8..92b259e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1837,6 +1837,7 @@ struct wined3d_resource_ops struct wined3d_resource { LONG ref; + LONG bind_count; struct wined3d_device *device; enum wined3d_resource_type type; const struct wined3d_format *format; @@ -1929,7 +1930,6 @@ struct wined3d_texture float pow2_matrix[16]; UINT lod; enum wined3d_texture_filter_type filter_type; - LONG bind_count; DWORD sampler; DWORD flags; const struct min_lookup *min_mip_lookup; @@ -2408,7 +2408,6 @@ struct wined3d_buffer GLenum buffer_object_usage; GLenum buffer_type_hint; UINT buffer_object_size; - LONG bind_count; DWORD flags; LONG lock_count;

1 0