September 2012 - Wine-commits

Marcus Meissner : shlwapi: Fixed incorrect buffer size.
by Alexandre Julliard 25 Sep '12

25 Sep '12

Module: wine Branch: master Commit: 73dfc3d46222be6a788e5fd4439773e786e1325b URL: http://source.winehq.org/git/wine.git/?a=commit;h=73dfc3d46222be6a788e5fd44… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Sep 25 08:13:02 2012 +0200 shlwapi: Fixed incorrect buffer size. --- dlls/shlwapi/tests/url.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index ee3adf6..b24a277 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -1062,7 +1062,7 @@ static void test_UrlCanonicalizeW(void) BOOL choped; int pos; - MultiByteToWideChar(CP_ACP, 0, "http://www.winehq.org/X", -1, szUrl, sizeof(szUrl)); + MultiByteToWideChar(CP_ACP, 0, "http://www.winehq.org/X", -1, szUrl, sizeof(szUrl)/sizeof(szUrl[0])); pos = lstrlenW(szUrl) - 1; szUrl[pos] = i; urllen = INTERNET_MAX_URL_LENGTH;

1 0

Nikolay Sivov : mlang: Implemented IMLangConvertCharset_DoConversionToUnicode.
by Alexandre Julliard 25 Sep '12

25 Sep '12

Module: wine Branch: master Commit: 406c4311098721ae1d2beeeb527ca76aeebe115f URL: http://source.winehq.org/git/wine.git/?a=commit;h=406c4311098721ae1d2beeeb5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 25 11:42:59 2012 +0400 mlang: Implemented IMLangConvertCharset_DoConversionToUnicode. --- dlls/mlang/mlang.c | 6 +++- dlls/mlang/tests/mlang.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+), 2 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index caae2c2..37102a3 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -3635,6 +3635,7 @@ static HRESULT WINAPI MLangConvertCharset_GetSourceCodePage(IMLangConvertCharset TRACE("(%p)->(%p)\n", This, src_cp); + if (!src_cp) return E_INVALIDARG; *src_cp = This->src_cp; return S_OK; } @@ -3645,6 +3646,7 @@ static HRESULT WINAPI MLangConvertCharset_GetDestinationCodePage(IMLangConvertCh TRACE("(%p)->(%p)\n", This, dst_cp); + if (!dst_cp) return E_INVALIDARG; *dst_cp = This->dst_cp; return S_OK; } @@ -3668,8 +3670,8 @@ static HRESULT WINAPI MLangConvertCharset_DoConversionToUnicode(IMLangConvertCha UINT *src_size, WCHAR *dest, UINT *dest_size) { struct convert_charset *This = impl_from_IMLangConvertCharset(iface); - FIXME("(%p)->(%p %p %p %p): stub\n", This, src, src_size, dest, dest_size); - return E_NOTIMPL; + TRACE("(%p)->(%p %p %p %p)\n", This, src, src_size, dest, dest_size); + return ConvertINetMultiByteToUnicode(NULL, This->src_cp, src, (INT*)src_size, dest, (INT*)dest_size); } static HRESULT WINAPI MLangConvertCharset_DoConversionFromUnicode(IMLangConvertCharset *iface, diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index 91463f9..fb37e27 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -1914,6 +1914,68 @@ todo_wine { } } +static void test_IMLangConvertCharset(IMultiLanguage *ml) +{ + IMLangConvertCharset *convert; + WCHAR strW[] = {'a','b','c','d',0}; + UINT cp, src_size, dst_size; + char strA[] = "abcd"; + WCHAR buffW[20]; + HRESULT hr; + + hr = IMultiLanguage_CreateConvertCharset(ml, CP_ACP, CP_UTF8, 0, &convert); +todo_wine + ok(hr == S_FALSE, "expected S_FALSE got 0x%08x\n", hr); + + hr = IMLangConvertCharset_GetSourceCodePage(convert, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + cp = CP_UTF8; + hr = IMLangConvertCharset_GetSourceCodePage(convert, &cp); + ok(hr == S_OK, "expected S_OK got 0x%08x\n", hr); + ok(cp == CP_ACP, "got %d\n", cp); + + hr = IMLangConvertCharset_GetDestinationCodePage(convert, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + cp = CP_ACP; + hr = IMLangConvertCharset_GetDestinationCodePage(convert, &cp); + ok(hr == S_OK, "expected S_OK got 0x%08x\n", hr); + ok(cp == CP_UTF8, "got %d\n", cp); + + /* DoConversionToUnicode */ + hr = IMLangConvertCharset_Initialize(convert, CP_UTF8, CP_UNICODE, 0); + ok(hr == S_OK, "expected S_OK got 0x%08x\n", hr); + + hr = IMLangConvertCharset_DoConversionToUnicode(convert, NULL, NULL, NULL, NULL); + ok(hr == E_FAIL || broken(hr == S_OK) /* win2k */, "got 0x%08x\n", hr); + + src_size = -1; + dst_size = 20; + buffW[0] = 0; + buffW[4] = 4; + hr = IMLangConvertCharset_DoConversionToUnicode(convert, strA, &src_size, buffW, &dst_size); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!memcmp(buffW, strW, 4*sizeof(WCHAR)), "got converted string %s\n", wine_dbgstr_wn(buffW, dst_size)); + ok(dst_size == 4, "got %d\n", dst_size); + ok(buffW[4] == 4, "got %d\n", buffW[4]); + ok(src_size == 4, "got %d\n", src_size); + + src_size = -1; + dst_size = 0; + buffW[0] = 1; + hr = IMLangConvertCharset_DoConversionToUnicode(convert, strA, &src_size, buffW, &dst_size); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(buffW[0] == 1, "got %d\n", buffW[0]); + ok(dst_size == 4, "got %d\n", dst_size); + ok(src_size == 4, "got %d\n", src_size); + + hr = IMLangConvertCharset_Initialize(convert, CP_UNICODE, CP_UNICODE, 0); + ok(hr == S_OK, "expected S_OK got 0x%08x\n", hr); + + IMLangConvertCharset_Release(convert); +} + START_TEST(mlang) { IMultiLanguage *iML = NULL; @@ -1940,6 +2002,7 @@ START_TEST(mlang) if (ret != S_OK || !iML) return; test_GetNumberOfCodePageInfo((IMultiLanguage2 *)iML); + test_IMLangConvertCharset(iML); IMultiLanguage_Release(iML);

1 0

Nikolay Sivov : mlang: Move IUnknown implementation to IMultiLanguage3 interface implementation and forward to it .
by Alexandre Julliard 25 Sep '12

25 Sep '12

Module: wine Branch: master Commit: fdaf6df67a8cfaf2b21cb4ea6274dd2a3c94f0e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdaf6df67a8cfaf2b21cb4ea6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 25 11:44:15 2012 +0400 mlang: Move IUnknown implementation to IMultiLanguage3 interface implementation and forward to it. --- dlls/mlang/mlang.c | 161 ++++++++++++++++++++-------------------------------- 1 files changed, 61 insertions(+), 100 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 37102a3..31d9985 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -1433,88 +1433,6 @@ typedef struct tagMLang_impl DWORD total_cp, total_scripts; } MLang_impl; -static ULONG MLang_AddRef( MLang_impl* This) -{ - return InterlockedIncrement(&This->ref); -} - -static ULONG MLang_Release( MLang_impl* This ) -{ - ULONG ref = InterlockedDecrement(&This->ref); - - TRACE("%p ref = %d\n", This, ref); - if (ref == 0) - { - TRACE("Destroying %p\n", This); - HeapFree(GetProcessHeap(), 0, This); - UnlockModule(); - } - - return ref; -} - -static HRESULT MLang_QueryInterface( - MLang_impl* This, - REFIID riid, - void** ppvObject) -{ - TRACE("%p -> %s\n", This, debugstr_guid(riid) ); - - if (IsEqualGUID(riid, &IID_IUnknown) - || IsEqualGUID(riid, &IID_IMLangCodePages) - || IsEqualGUID(riid, &IID_IMLangFontLink)) - { - MLang_AddRef(This); - TRACE("Returning IID_IMLangFontLink %p ref = %d\n", This, This->ref); - *ppvObject = &This->IMLangFontLink_iface; - return S_OK; - } - - if (IsEqualGUID(riid, &IID_IMLangFontLink2)) - { - MLang_AddRef(This); - TRACE("Returning IID_IMLangFontLink2 %p ref = %d\n", This, This->ref); - *ppvObject = &This->IMLangFontLink2_iface; - return S_OK; - } - - if (IsEqualGUID(riid, &IID_IMultiLanguage) ) - { - MLang_AddRef(This); - TRACE("Returning IID_IMultiLanguage %p ref = %d\n", This, This->ref); - *ppvObject = &This->IMultiLanguage_iface; - return S_OK; - } - - if (IsEqualGUID(riid, &IID_IMultiLanguage2) ) - { - MLang_AddRef(This); - *ppvObject = &This->IMultiLanguage3_iface; - TRACE("Returning IID_IMultiLanguage2 %p ref = %d\n", This, This->ref); - return S_OK; - } - - if (IsEqualGUID(riid, &IID_IMultiLanguage3) ) - { - MLang_AddRef(This); - *ppvObject = &This->IMultiLanguage3_iface; - TRACE("Returning IID_IMultiLanguage3 %p ref = %d\n", This, This->ref); - return S_OK; - } - - if (IsEqualGUID(riid, &IID_IMLangLineBreakConsole)) - { - MLang_AddRef(This); - TRACE("Returning IID_IMLangLineBreakConsole %p ref = %d\n", This, This->ref); - *ppvObject = &This->IMLangLineBreakConsole_iface; - return S_OK; - } - - - WARN("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),ppvObject); - return E_NOINTERFACE; -} - /******************************************************************************/ typedef struct tagEnumCodePage_impl @@ -1891,21 +1809,21 @@ static HRESULT WINAPI fnIMLangFontLink_QueryInterface( void** ppvObject) { MLang_impl *This = impl_from_IMLangFontLink( iface ); - return MLang_QueryInterface( This, riid, ppvObject ); + return IMultiLanguage3_QueryInterface( &This->IMultiLanguage3_iface, riid, ppvObject ); } static ULONG WINAPI fnIMLangFontLink_AddRef( IMLangFontLink* iface) { MLang_impl *This = impl_from_IMLangFontLink( iface ); - return MLang_AddRef( This ); + return IMultiLanguage3_AddRef( &This->IMultiLanguage3_iface ); } static ULONG WINAPI fnIMLangFontLink_Release( IMLangFontLink* iface) { MLang_impl *This = impl_from_IMLangFontLink( iface ); - return MLang_Release( This ); + return IMultiLanguage3_Release( &This->IMultiLanguage3_iface ); } static HRESULT WINAPI fnIMLangFontLink_GetCharCodePages( @@ -2126,22 +2044,22 @@ static inline MLang_impl *impl_from_IMultiLanguage( IMultiLanguage *iface ) static HRESULT WINAPI fnIMultiLanguage_QueryInterface( IMultiLanguage* iface, REFIID riid, - void** ppvObject) + void** obj) { MLang_impl *This = impl_from_IMultiLanguage( iface ); - return MLang_QueryInterface( This, riid, ppvObject ); + return IMultiLanguage3_QueryInterface(&This->IMultiLanguage3_iface, riid, obj); } static ULONG WINAPI fnIMultiLanguage_AddRef( IMultiLanguage* iface ) { MLang_impl *This = impl_from_IMultiLanguage( iface ); - return IMLangFontLink_AddRef( &This->IMLangFontLink_iface ); + return IMultiLanguage3_AddRef(&This->IMultiLanguage3_iface); } static ULONG WINAPI fnIMultiLanguage_Release( IMultiLanguage* iface ) { MLang_impl *This = impl_from_IMultiLanguage( iface ); - return IMLangFontLink_Release( &This->IMLangFontLink_iface ); + return IMultiLanguage3_Release(&This->IMultiLanguage3_iface); } static HRESULT WINAPI fnIMultiLanguage_GetNumberOfCodePageInfo( @@ -2627,22 +2545,65 @@ static inline MLang_impl *impl_from_IMultiLanguage3( IMultiLanguage3 *iface ) static HRESULT WINAPI fnIMultiLanguage2_QueryInterface( IMultiLanguage3* iface, REFIID riid, - void** ppvObject) + void** obj) { MLang_impl *This = impl_from_IMultiLanguage3( iface ); - return MLang_QueryInterface( This, riid, ppvObject ); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), obj); + + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IMultiLanguage)) + { + *obj = &This->IMultiLanguage_iface; + } + else if (IsEqualGUID(riid, &IID_IMLangCodePages) || + IsEqualGUID(riid, &IID_IMLangFontLink)) + { + *obj = &This->IMLangFontLink_iface; + } + else if (IsEqualGUID(riid, &IID_IMLangFontLink2)) + { + *obj = &This->IMLangFontLink2_iface; + } + else if (IsEqualGUID(riid, &IID_IMultiLanguage2) || + IsEqualGUID(riid, &IID_IMultiLanguage3)) + { + *obj = &This->IMultiLanguage3_iface; + } + else if (IsEqualGUID(riid, &IID_IMLangLineBreakConsole)) + { + *obj = &This->IMLangLineBreakConsole_iface; + } + else + { + WARN("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), obj); + *obj = NULL; + return E_NOINTERFACE; + } + + IMultiLanguage3_AddRef(iface); + return S_OK; } static ULONG WINAPI fnIMultiLanguage2_AddRef( IMultiLanguage3* iface ) { MLang_impl *This = impl_from_IMultiLanguage3( iface ); - return MLang_AddRef( This ); + return InterlockedIncrement(&This->ref); } static ULONG WINAPI fnIMultiLanguage2_Release( IMultiLanguage3* iface ) { MLang_impl *This = impl_from_IMultiLanguage3( iface ); - return MLang_Release( This ); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p)->(%d)\n", This, ref); + if (ref == 0) + { + HeapFree(GetProcessHeap(), 0, This); + UnlockModule(); + } + + return ref; } static HRESULT WINAPI fnIMultiLanguage2_GetNumberOfCodePageInfo( @@ -3297,19 +3258,19 @@ static HRESULT WINAPI fnIMLangFontLink2_QueryInterface( void** ppvObject) { MLang_impl *This = impl_from_IMLangFontLink2( iface ); - return MLang_QueryInterface( This, riid, ppvObject ); + return IMultiLanguage3_QueryInterface( &This->IMultiLanguage3_iface, riid, ppvObject ); } static ULONG WINAPI fnIMLangFontLink2_AddRef( IMLangFontLink2* iface ) { MLang_impl *This = impl_from_IMLangFontLink2( iface ); - return MLang_AddRef( This ); + return IMultiLanguage3_AddRef( &This->IMultiLanguage3_iface ); } static ULONG WINAPI fnIMLangFontLink2_Release( IMLangFontLink2* iface ) { MLang_impl *This = impl_from_IMLangFontLink2( iface ); - return MLang_Release( This ); + return IMultiLanguage3_Release( &This->IMultiLanguage3_iface ); } static HRESULT WINAPI fnIMLangFontLink2_GetCharCodePages( IMLangFontLink2* This, @@ -3486,21 +3447,21 @@ static HRESULT WINAPI fnIMLangLineBreakConsole_QueryInterface( void** ppvObject) { MLang_impl *This = impl_from_IMLangLineBreakConsole( iface ); - return MLang_QueryInterface( This, riid, ppvObject ); + return IMultiLanguage3_QueryInterface( &This->IMultiLanguage3_iface, riid, ppvObject ); } static ULONG WINAPI fnIMLangLineBreakConsole_AddRef( IMLangLineBreakConsole* iface ) { MLang_impl *This = impl_from_IMLangLineBreakConsole( iface ); - return MLang_AddRef( This ); + return IMultiLanguage3_AddRef( &This->IMultiLanguage3_iface ); } static ULONG WINAPI fnIMLangLineBreakConsole_Release( IMLangLineBreakConsole* iface ) { MLang_impl *This = impl_from_IMLangLineBreakConsole( iface ); - return MLang_Release( This ); + return IMultiLanguage3_Release( &This->IMultiLanguage3_iface ); } static HRESULT WINAPI fnIMLangLineBreakConsole_BreakLineML( @@ -3721,7 +3682,7 @@ static HRESULT MultiLanguage_create(IUnknown *pUnkOuter, LPVOID *ppObj) mlang->total_scripts = sizeof(mlang_data)/sizeof(mlang_data[0]) - 1; mlang->ref = 1; - *ppObj = mlang; + *ppObj = &mlang->IMultiLanguage_iface; TRACE("returning %p\n", mlang); LockModule();

1 0

Nikolay Sivov : mlang: Forward GetNumberOfCodePageInfo() to IMultiLanguage3 implementation.
by Alexandre Julliard 25 Sep '12

25 Sep '12

Module: wine Branch: master Commit: db1cd7eba8692bb3a06d182cd75bf68d572d1737 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db1cd7eba8692bb3a06d182cd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 25 11:48:38 2012 +0400 mlang: Forward GetNumberOfCodePageInfo() to IMultiLanguage3 implementation. --- dlls/mlang/mlang.c | 11 +++-------- 1 files changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 31d9985..6a58b1f 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -2064,16 +2064,11 @@ static ULONG WINAPI fnIMultiLanguage_Release( IMultiLanguage* iface ) static HRESULT WINAPI fnIMultiLanguage_GetNumberOfCodePageInfo( IMultiLanguage* iface, - UINT* pcCodePage) + UINT* cp) { MLang_impl *This = impl_from_IMultiLanguage( iface ); - - TRACE("(%p, %p)\n", This, pcCodePage); - - if (!pcCodePage) return E_INVALIDARG; - - *pcCodePage = This->total_cp; - return S_OK; + TRACE("(%p, %p)\n", This, cp); + return IMultiLanguage3_GetNumberOfCodePageInfo(&This->IMultiLanguage3_iface, cp); } static HRESULT WINAPI fnIMultiLanguage_GetCodePageInfo(

1 0

Nikolay Sivov : mlang: Forward GetFamilyCodePage() to IMultiLanguage3 implementation.
by Alexandre Julliard 25 Sep '12

25 Sep '12

Module: wine Branch: master Commit: 76e12944edb0ba342bfa0576d5bf33ee1ed335a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76e12944edb0ba342bfa0576d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 25 11:53:55 2012 +0400 mlang: Forward GetFamilyCodePage() to IMultiLanguage3 implementation. --- dlls/mlang/mlang.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 6a58b1f..a956e2d 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -2098,10 +2098,11 @@ static HRESULT WINAPI fnIMultiLanguage_GetCodePageInfo( static HRESULT WINAPI fnIMultiLanguage_GetFamilyCodePage( IMultiLanguage* iface, - UINT uiCodePage, - UINT* puiFamilyCodePage) + UINT cp, + UINT* family_cp) { - return GetFamilyCodePage(uiCodePage, puiFamilyCodePage); + MLang_impl *This = impl_from_IMultiLanguage( iface ); + return IMultiLanguage3_GetFamilyCodePage(&This->IMultiLanguage3_iface, cp, family_cp); } static HRESULT WINAPI fnIMultiLanguage_EnumCodePages(

1 0

Nikolay Sivov : mlang: Forward IsConvertible() to IMultiLanguage3 implementation.
by Alexandre Julliard 25 Sep '12

25 Sep '12

Module: wine Branch: master Commit: 55d87c050cf3849cf24b82bb595d388a6e077f9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=55d87c050cf3849cf24b82bb5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 25 11:57:24 2012 +0400 mlang: Forward IsConvertible() to IMultiLanguage3 implementation. --- dlls/mlang/mlang.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index a956e2d..b8a81f8 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -2128,10 +2128,11 @@ static HRESULT WINAPI fnIMultiLanguage_GetCharsetInfo( static HRESULT WINAPI fnIMultiLanguage_IsConvertible( IMultiLanguage* iface, - DWORD dwSrcEncoding, - DWORD dwDstEncoding) + DWORD src_enc, + DWORD dst_enc) { - return IsConvertINetStringAvailable(dwSrcEncoding, dwDstEncoding); + MLang_impl *This = impl_from_IMultiLanguage( iface ); + return IMultiLanguage3_IsConvertible(&This->IMultiLanguage3_iface, src_enc, dst_enc); } static HRESULT WINAPI fnIMultiLanguage_ConvertString(

1 0

Nikolay Sivov : mlang: Forward GetRfc1766FromLcid() to IMultiLanguage3 implementation.
by Alexandre Julliard 25 Sep '12

25 Sep '12

Module: wine Branch: master Commit: 42db7e4c1d10bdede8954a2765f7dec80d38b329 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42db7e4c1d10bdede8954a276… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 25 11:59:50 2012 +0400 mlang: Forward GetRfc1766FromLcid() to IMultiLanguage3 implementation. --- dlls/mlang/mlang.c | 14 ++------------ 1 files changed, 2 insertions(+), 12 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index b8a81f8..0253eec 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -2187,18 +2187,8 @@ static HRESULT WINAPI fnIMultiLanguage_GetRfc1766FromLcid( LCID lcid, BSTR* pbstrRfc1766) { - WCHAR buf[MAX_RFC1766_NAME]; - - TRACE("%p %04x %p\n", iface, lcid, pbstrRfc1766); - if (!pbstrRfc1766) - return E_INVALIDARG; - - if (!lcid_to_rfc1766W( lcid, buf, MAX_RFC1766_NAME )) - { - *pbstrRfc1766 = SysAllocString( buf ); - return S_OK; - } - return E_FAIL; + MLang_impl *This = impl_from_IMultiLanguage(iface); + return IMultiLanguage3_GetRfc1766FromLcid(&This->IMultiLanguage3_iface, lcid, pbstrRfc1766); } static HRESULT WINAPI fnIMultiLanguage_GetLcidFromRfc1766(

1 0

Henri Verbeet : d3d10: Store shaders directly in d3d10_effect_object.
by Alexandre Julliard 25 Sep '12

25 Sep '12

Module: wine Branch: master Commit: 2a83e1a581585d1d92408200ac5f3abf5701a098 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a83e1a581585d1d92408200a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 25 10:34:40 2012 +0200 d3d10: Store shaders directly in d3d10_effect_object. --- dlls/d3d10/d3d10_private.h | 9 ++++ dlls/d3d10/effect.c | 115 +++++++++++++++++++++++++++++++------------ 2 files changed, 92 insertions(+), 32 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 51696ef..417bff3 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -49,6 +49,9 @@ void d3d10_rb_free(void *ptr) DECLSPEC_HIDDEN; enum d3d10_effect_object_type { + D3D10_EOT_RASTERIZER_STATE = 0x0, + D3D10_EOT_DEPTH_STENCIL_STATE = 0x1, + D3D10_EOT_BLEND_STATE = 0x2, D3D10_EOT_VERTEXSHADER = 0x6, D3D10_EOT_PIXELSHADER = 0x7, D3D10_EOT_GEOMETRYSHADER = 0x8, @@ -71,6 +74,12 @@ struct d3d10_effect_object enum d3d10_effect_object_type type; DWORD index; void *data; + union + { + ID3D10VertexShader *vs; + ID3D10PixelShader *ps; + ID3D10GeometryShader *gs; + } object; }; struct d3d10_effect_shader_signature diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index edb216b..18ac964 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1243,19 +1243,16 @@ static HRESULT parse_fx10_object(struct d3d10_effect_object *o, const char **ptr case D3D10_EOT_VERTEXSHADER: TRACE("Vertex shader\n"); o->data = &anonymous_vs; - hr = S_OK; break; case D3D10_EOT_PIXELSHADER: TRACE("Pixel shader\n"); o->data = &anonymous_ps; - hr = S_OK; break; case D3D10_EOT_GEOMETRYSHADER: TRACE("Geometry shader\n"); o->data = &anonymous_gs; - hr = S_OK; break; case D3D10_EOT_STENCIL_REF: @@ -1264,8 +1261,6 @@ static HRESULT parse_fx10_object(struct d3d10_effect_object *o, const char **ptr ERR("Failed to read stencil ref.\n"); return E_FAIL; } - - hr = S_OK; break; case D3D10_EOT_SAMPLE_MASK: @@ -1274,8 +1269,6 @@ static HRESULT parse_fx10_object(struct d3d10_effect_object *o, const char **ptr FIXME("Failed to read sample mask.\n"); return E_FAIL; } - - hr = S_OK; break; case D3D10_EOT_BLEND_FACTOR: @@ -1284,14 +1277,11 @@ static HRESULT parse_fx10_object(struct d3d10_effect_object *o, const char **ptr FIXME("Failed to read blend factor.\n"); return E_FAIL; } - - hr = S_OK; break; default: FIXME("Unhandled object type %#x\n", o->type); - hr = E_FAIL; - break; + return E_FAIL; } break; @@ -1300,7 +1290,6 @@ static HRESULT parse_fx10_object(struct d3d10_effect_object *o, const char **ptr TRACE("Variable name %s.\n", debugstr_a(data + offset)); o->data = e->lpVtbl->GetVariableByName(e, data + offset); - hr = S_OK; break; case D3D10_EOO_PARSED_OBJECT_INDEX: @@ -1311,7 +1300,6 @@ static HRESULT parse_fx10_object(struct d3d10_effect_object *o, const char **ptr TRACE("Variable name %s[%u].\n", debugstr_a(data + offset), o->index); o->data = e->lpVtbl->GetVariableByName(e, data + offset); - hr = S_OK; break; case D3D10_EOO_ANONYMOUS_SHADER: @@ -1339,34 +1327,66 @@ static HRESULT parse_fx10_object(struct d3d10_effect_object *o, const char **ptr switch (o->type) { case D3D10_EOT_VERTEXSHADER: - TRACE("Vertex shader\n"); - hr = parse_shader(o->data, data_ptr); - break; - case D3D10_EOT_PIXELSHADER: - TRACE("Pixel shader\n"); - hr = parse_shader(o->data, data_ptr); - break; - case D3D10_EOT_GEOMETRYSHADER: - TRACE("Geometry shader\n"); - hr = parse_shader(o->data, data_ptr); + if (FAILED(hr = parse_shader(o->data, data_ptr))) + return hr; break; default: FIXME("Unhandled object type %#x\n", o->type); - hr = E_FAIL; - break; + return E_FAIL; } break; default: - hr = E_FAIL; FIXME("Unhandled operation %#x.\n", operation); + return E_FAIL; + } + + switch (o->type) + { + case D3D10_EOT_VERTEXSHADER: + { + ID3D10EffectVariable *variable = o->data; + ID3D10EffectShaderVariable *sv = variable->lpVtbl->AsShader(variable); + if (FAILED(hr = sv->lpVtbl->GetVertexShader(sv, o->index, &o->object.vs))) + return hr; + break; + } + + case D3D10_EOT_PIXELSHADER: + { + ID3D10EffectVariable *variable = o->data; + ID3D10EffectShaderVariable *sv = variable->lpVtbl->AsShader(variable); + if (FAILED(hr = sv->lpVtbl->GetPixelShader(sv, o->index, &o->object.ps))) + return hr; + break; + } + + case D3D10_EOT_GEOMETRYSHADER: + { + ID3D10EffectVariable *variable = o->data; + ID3D10EffectShaderVariable *sv = variable->lpVtbl->AsShader(variable); + if (FAILED(hr = sv->lpVtbl->GetGeometryShader(sv, o->index, &o->object.gs))) + return hr; break; + } + + case D3D10_EOT_RASTERIZER_STATE: + case D3D10_EOT_DEPTH_STENCIL_STATE: + case D3D10_EOT_BLEND_STATE: + case D3D10_EOT_STENCIL_REF: + case D3D10_EOT_BLEND_FACTOR: + case D3D10_EOT_SAMPLE_MASK: + break; + + default: + FIXME("Unhandled object type %#x.\n", o->type); + return E_FAIL; } - return hr; + return S_OK; } static HRESULT parse_fx10_pass(struct d3d10_effect_pass *p, const char **ptr, const char *data) @@ -2093,22 +2113,21 @@ HRESULT d3d10_effect_parse(struct d3d10_effect *This, const void *data, SIZE_T d static HRESULT d3d10_effect_object_apply(struct d3d10_effect_object *o) { ID3D10Device *device = o->pass->technique->effect->device; - struct d3d10_effect_variable *v = (struct d3d10_effect_variable*) o->data; TRACE("effect object %p, type %#x.\n", o, o->type); switch(o->type) { case D3D10_EOT_VERTEXSHADER: - ID3D10Device_VSSetShader(device, ((struct d3d10_effect_shader_variable *)v->data)->shader.vs); + ID3D10Device_VSSetShader(device, o->object.vs); return S_OK; case D3D10_EOT_PIXELSHADER: - ID3D10Device_PSSetShader(device, ((struct d3d10_effect_shader_variable *)v->data)->shader.ps); + ID3D10Device_PSSetShader(device, o->object.ps); return S_OK; case D3D10_EOT_GEOMETRYSHADER: - ID3D10Device_GSSetShader(device, ((struct d3d10_effect_shader_variable *)v->data)->shader.gs); + ID3D10Device_GSSetShader(device, o->object.gs); return S_OK; default: @@ -2198,6 +2217,30 @@ static void d3d10_effect_variable_destroy(struct d3d10_effect_variable *v) } } +static void d3d10_effect_object_destroy(struct d3d10_effect_object *o) +{ + switch (o->type) + { + case D3D10_EOT_VERTEXSHADER: + if (o->object.vs) + ID3D10VertexShader_Release(o->object.vs); + break; + + case D3D10_EOT_PIXELSHADER: + if (o->object.ps) + ID3D10PixelShader_Release(o->object.ps); + break; + + case D3D10_EOT_GEOMETRYSHADER: + if (o->object.gs) + ID3D10GeometryShader_Release(o->object.gs); + break; + + default: + break; + } +} + static void d3d10_effect_pass_destroy(struct d3d10_effect_pass *p) { unsigned int i; @@ -2205,7 +2248,15 @@ static void d3d10_effect_pass_destroy(struct d3d10_effect_pass *p) TRACE("pass %p\n", p); HeapFree(GetProcessHeap(), 0, p->name); - HeapFree(GetProcessHeap(), 0, p->objects); + + if (p->objects) + { + for (i = 0; i < p->object_count; ++i) + { + d3d10_effect_object_destroy(&p->objects[i]); + } + HeapFree(GetProcessHeap(), 0, p->objects); + } if (p->annotations) {

1 0

Henri Verbeet : d3d10: Store shader variables in d3d10_effect_pass instead of d3d10_effect_object .
by Alexandre Julliard 25 Sep '12

25 Sep '12

Module: wine Branch: master Commit: 4f2c93e2487c260aba02bbb5f774ade5d2f17952 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f2c93e2487c260aba02bbb5f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 25 10:34:41 2012 +0200 d3d10: Store shader variables in d3d10_effect_pass instead of d3d10_effect_object. --- dlls/d3d10/d3d10_private.h | 5 +- dlls/d3d10/effect.c | 115 ++++++++++++++------------------------------ 2 files changed, 40 insertions(+), 80 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4f2c93e2487c260aba02b…

1 0

Henri Verbeet : wined3d: wined3d_device_set_pixel_shader() never fails.
by Alexandre Julliard 25 Sep '12

25 Sep '12

Module: wine Branch: master Commit: fc711d495570297cb32cdc1c699f2ffe75943e80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc711d495570297cb32cdc1c6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 25 10:34:42 2012 +0200 wined3d: wined3d_device_set_pixel_shader() never fails. --- dlls/d3d8/device.c | 9 ++++----- dlls/d3d9/device.c | 5 ++--- dlls/wined3d/device.c | 22 ++++++++-------------- include/wine/wined3d.h | 2 +- 4 files changed, 15 insertions(+), 23 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 709ac52..a313654 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2422,7 +2422,6 @@ static HRESULT WINAPI d3d8_device_SetPixelShader(IDirect3DDevice8 *iface, DWORD { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); struct d3d8_pixel_shader *shader_impl; - HRESULT hr; TRACE("iface %p, shader %#x.\n", iface, shader); @@ -2430,9 +2429,9 @@ static HRESULT WINAPI d3d8_device_SetPixelShader(IDirect3DDevice8 *iface, DWORD if (!shader) { - hr = wined3d_device_set_pixel_shader(device->wined3d_device, NULL); + wined3d_device_set_pixel_shader(device->wined3d_device, NULL); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } if (!(shader_impl = d3d8_get_object(&device->handle_table, shader - (VS_HIGHESTFIXEDFXF + 1), D3D8_HANDLE_PS))) @@ -2443,10 +2442,10 @@ static HRESULT WINAPI d3d8_device_SetPixelShader(IDirect3DDevice8 *iface, DWORD } TRACE("Setting shader %p.\n", shader_impl); - hr = wined3d_device_set_pixel_shader(device->wined3d_device, shader_impl->wined3d_shader); + wined3d_device_set_pixel_shader(device->wined3d_device, shader_impl->wined3d_shader); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d8_device_GetPixelShader(IDirect3DDevice8 *iface, DWORD *shader) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 0418d69..c166ad4 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2564,16 +2564,15 @@ static HRESULT WINAPI d3d9_device_SetPixelShader(IDirect3DDevice9Ex *iface, IDir { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); struct d3d9_pixelshader *shader_obj = unsafe_impl_from_IDirect3DPixelShader9(shader); - HRESULT hr; TRACE("iface %p, shader %p.\n", iface, shader); wined3d_mutex_lock(); - hr = wined3d_device_set_pixel_shader(device->wined3d_device, + wined3d_device_set_pixel_shader(device->wined3d_device, shader_obj ? shader_obj->wined3d_shader : NULL); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d9_device_GetPixelShader(IDirect3DDevice9Ex *iface, IDirect3DPixelShader9 **shader) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 664f1bd..19e21a0 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2831,39 +2831,33 @@ void device_update_tex_unit_map(struct wined3d_device *device) device_map_vsamplers(device, ps, gl_info); } -HRESULT CDECL wined3d_device_set_pixel_shader(struct wined3d_device *device, struct wined3d_shader *shader) +void CDECL wined3d_device_set_pixel_shader(struct wined3d_device *device, struct wined3d_shader *shader) { struct wined3d_shader *prev = device->updateStateBlock->state.pixel_shader; TRACE("device %p, shader %p.\n", device, shader); + if (shader) + wined3d_shader_incref(shader); + if (prev) + wined3d_shader_decref(prev); + device->updateStateBlock->state.pixel_shader = shader; device->updateStateBlock->changed.pixelShader = TRUE; if (device->isRecordingState) { - if (shader) - wined3d_shader_incref(shader); - if (prev) - wined3d_shader_decref(prev); TRACE("Recording... not performing anything.\n"); - return WINED3D_OK; + return; } if (shader == prev) { TRACE("Application is setting the old shader over, nothing to do.\n"); - return WINED3D_OK; + return; } - if (shader) - wined3d_shader_incref(shader); - if (prev) - wined3d_shader_decref(prev); - device_invalidate_state(device, STATE_PIXELSHADER); - - return WINED3D_OK; } struct wined3d_shader * CDECL wined3d_device_get_pixel_shader(const struct wined3d_device *device) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 3a87b25..040fbfe 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2209,7 +2209,7 @@ HRESULT __cdecl wined3d_device_set_light_enable(struct wined3d_device *device, U void __cdecl wined3d_device_set_material(struct wined3d_device *device, const struct wined3d_material *material); void __cdecl wined3d_device_set_multithreaded(struct wined3d_device *device); HRESULT __cdecl wined3d_device_set_npatch_mode(struct wined3d_device *device, float segments); -HRESULT __cdecl wined3d_device_set_pixel_shader(struct wined3d_device *device, struct wined3d_shader *shader); +void __cdecl wined3d_device_set_pixel_shader(struct wined3d_device *device, struct wined3d_shader *shader); void __cdecl wined3d_device_set_primitive_type(struct wined3d_device *device, enum wined3d_primitive_type primitive_topology); HRESULT __cdecl wined3d_device_set_ps_consts_b(struct wined3d_device *device,

1 0