November 2007 - Wine-commits

Jacek Caban : hlink: Wrap heap functions.
by Alexandre Julliard 21 Nov '07

21 Nov '07

Module: wine Branch: master Commit: 593023663ba6f20c1e92e994fd23544770e10d7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=593023663ba6f20c1e92e994f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 21 02:13:58 2007 +0100 hlink: Wrap heap functions. --- dlls/hlink/browse_ctx.c | 10 +++--- dlls/hlink/hlink_main.c | 1 - dlls/hlink/hlink_private.h | 47 +++++++++++++++++++++++++++ dlls/hlink/link.c | 75 +++++++++++++------------------------------ 4 files changed, 75 insertions(+), 58 deletions(-) diff --git a/dlls/hlink/browse_ctx.c b/dlls/hlink/browse_ctx.c index bd9b6fc..3b2f4b4 100644 --- a/dlls/hlink/browse_ctx.c +++ b/dlls/hlink/browse_ctx.c @@ -46,7 +46,7 @@ HRESULT WINAPI HLinkBrowseContext_Constructor(IUnknown *pUnkOuter, REFIID riid, if (pUnkOuter) return CLASS_E_NOAGGREGATION; - hl = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(HlinkBCImpl)); + hl = hlink_alloc_zero(sizeof(HlinkBCImpl)); if (!hl) return E_OUTOFMEMORY; @@ -95,10 +95,10 @@ static ULONG WINAPI IHlinkBC_fnRelease (IHlinkBrowseContext* iface) return refCount; TRACE("-- destroying IHlinkBrowseContext (%p)\n", This); - HeapFree(GetProcessHeap(), 0, This->BrowseWindowInfo); + hlink_free(This->BrowseWindowInfo); if (This->CurrentPage) IHlink_Release(This->CurrentPage); - HeapFree(GetProcessHeap(), 0, This); + hlink_free(This); return 0; } @@ -155,8 +155,8 @@ static HRESULT WINAPI IHlinkBC_SetBrowseWindowInfo(IHlinkBrowseContext* iface, HlinkBCImpl *This = (HlinkBCImpl*)iface; TRACE("(%p)->(%p)\n", This, phlbwi); - HeapFree(GetProcessHeap(), 0, This->BrowseWindowInfo); - This->BrowseWindowInfo = HeapAlloc(GetProcessHeap(), 0, phlbwi->cbSize); + hlink_free(This->BrowseWindowInfo); + This->BrowseWindowInfo = hlink_alloc(phlbwi->cbSize); memcpy(This->BrowseWindowInfo, phlbwi, phlbwi->cbSize); return S_OK; diff --git a/dlls/hlink/hlink_main.c b/dlls/hlink/hlink_main.c index a68585f..e45bc0c 100644 --- a/dlls/hlink/hlink_main.c +++ b/dlls/hlink/hlink_main.c @@ -24,7 +24,6 @@ #include "hlguids.h" #include "wine/debug.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(hlink); diff --git a/dlls/hlink/hlink_private.h b/dlls/hlink/hlink_private.h index 0a765be..ef381bd 100644 --- a/dlls/hlink/hlink_private.h +++ b/dlls/hlink/hlink_private.h @@ -27,5 +27,52 @@ #include "ole2.h" #include "hlink.h" +#include "wine/unicode.h" + extern HRESULT WINAPI HLink_Constructor(IUnknown*,REFIID,void**); extern HRESULT WINAPI HLinkBrowseContext_Constructor(IUnknown*,REFIID,void**); + +static inline void *hlink_alloc(size_t len) +{ + return HeapAlloc(GetProcessHeap(), 0, len); +} + +static inline void *hlink_alloc_zero(size_t len) +{ + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); +} + +static inline BOOL hlink_free(void *mem) +{ + return HeapFree(GetProcessHeap(), 0, mem); +} + +static inline LPWSTR hlink_strdupW(LPCWSTR str) +{ + LPWSTR ret = NULL; + + if(str) { + DWORD size; + + size = (strlenW(str)+1)*sizeof(WCHAR); + ret = hlink_alloc(size); + memcpy(ret, str, size); + } + + return ret; +} + +static inline LPWSTR hlink_co_strdupW(LPCWSTR str) +{ + LPWSTR ret = NULL; + + if(str) { + DWORD size; + + size = (strlenW(str)+1)*sizeof(WCHAR); + ret = CoTaskMemAlloc(size); + memcpy(ret, str, size); + } + + return ret; +} diff --git a/dlls/hlink/link.c b/dlls/hlink/link.c index e1eb6f9..179a179 100644 --- a/dlls/hlink/link.c +++ b/dlls/hlink/link.c @@ -24,7 +24,6 @@ #include "hlguids.h" #include "wine/debug.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(hlink); @@ -71,34 +70,6 @@ static inline HlinkImpl* HlinkImpl_from_IDataObject( IDataObject* iface) return (HlinkImpl*) ((CHAR*)iface - FIELD_OFFSET(HlinkImpl, lpDOVtbl)); } -static inline LPWSTR strdupW( LPCWSTR str ) -{ - LPWSTR r; - UINT len; - - if (!str) - return NULL; - len = (lstrlenW(str)+1) * sizeof (WCHAR); - r = HeapAlloc(GetProcessHeap(), 0, len); - if (r) - memcpy(r, str, len); - return r; -} - -static inline LPWSTR co_strdupW( LPCWSTR str ) -{ - LPWSTR r; - UINT len; - - if (!str) - return NULL; - len = (lstrlenW(str)+1) * sizeof (WCHAR); - r = CoTaskMemAlloc(len); - if (r) - memcpy(r, str, len); - return r; -} - static inline void __GetMoniker(HlinkImpl* This, IMoniker** moniker) { *moniker = NULL; @@ -127,7 +98,7 @@ HRESULT WINAPI HLink_Constructor(IUnknown *pUnkOuter, REFIID riid, if (pUnkOuter) return CLASS_E_NOAGGREGATION; - hl = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(HlinkImpl)); + hl = hlink_alloc_zero(sizeof(HlinkImpl)); if (!hl) return E_OUTOFMEMORY; @@ -184,15 +155,15 @@ static ULONG WINAPI IHlink_fnRelease (IHlink* iface) return refCount; TRACE("-- destroying IHlink (%p)\n", This); - HeapFree(GetProcessHeap(), 0, This->FriendlyName); - HeapFree(GetProcessHeap(), 0, This->Target); - HeapFree(GetProcessHeap(), 0, This->TargetFrameName); - HeapFree(GetProcessHeap(), 0, This->Location); + hlink_free(This->FriendlyName); + hlink_free(This->Target); + hlink_free(This->TargetFrameName); + hlink_free(This->Location); if (This->Moniker) IMoniker_Release(This->Moniker); if (This->Site) IHlinkSite_Release(This->Site); - HeapFree(GetProcessHeap(), 0, This); + hlink_free(This); return 0; } @@ -252,8 +223,8 @@ static HRESULT WINAPI IHlink_fnSetMonikerReference( IHlink* iface, CoTaskMemFree(display_name); } - HeapFree(GetProcessHeap(), 0, This->Location); - This->Location = strdupW( pwzLocation ); + hlink_free(This->Location); + This->Location = hlink_strdupW( pwzLocation ); return S_OK; } @@ -268,13 +239,13 @@ static HRESULT WINAPI IHlink_fnSetStringReference(IHlink* iface, if (grfHLSETF & HLINKSETF_TARGET) { - HeapFree(GetProcessHeap(), 0, This->Target); - This->Target = strdupW( pwzTarget ); + hlink_free(This->Target); + This->Target = hlink_strdupW( pwzTarget ); } if (grfHLSETF & HLINKSETF_LOCATION) { - HeapFree(GetProcessHeap(), 0, This->Location); - This->Location = strdupW( pwzLocation ); + hlink_free(This->Location); + This->Location = hlink_strdupW( pwzLocation ); } return S_OK; @@ -306,7 +277,7 @@ static HRESULT WINAPI IHlink_fnGetStringReference (IHlink* iface, if (ppwzTarget) { - *ppwzTarget = co_strdupW( This->Target ); + *ppwzTarget = hlink_co_strdupW( This->Target ); if (!This->Target) { @@ -326,7 +297,7 @@ static HRESULT WINAPI IHlink_fnGetStringReference (IHlink* iface, } } if (ppwzLocation) - *ppwzLocation = co_strdupW( This->Location ); + *ppwzLocation = hlink_co_strdupW( This->Location ); TRACE("(Target: %s Location: %s)\n", (ppwzTarget)?debugstr_w(*ppwzTarget):"<NULL>", @@ -342,8 +313,8 @@ static HRESULT WINAPI IHlink_fnSetFriendlyName (IHlink *iface, TRACE("(%p) -> (%s)\n", This, debugstr_w(pwzFriendlyName)); - HeapFree(GetProcessHeap(), 0, This->FriendlyName); - This->FriendlyName = strdupW( pwzFriendlyName ); + hlink_free(This->FriendlyName); + This->FriendlyName = hlink_strdupW( pwzFriendlyName ); return S_OK; } @@ -358,7 +329,7 @@ static HRESULT WINAPI IHlink_fnGetFriendlyName (IHlink* iface, /* FIXME: Only using explicitly set and cached friendly names */ if (This->FriendlyName) - *ppwzFriendlyName = co_strdupW( This->FriendlyName ); + *ppwzFriendlyName = hlink_co_strdupW( This->FriendlyName ); else { IMoniker *moniker; @@ -385,8 +356,8 @@ static HRESULT WINAPI IHlink_fnSetTargetFrameName(IHlink* iface, HlinkImpl *This = (HlinkImpl*)iface; TRACE("(%p)->(%s)\n", This, debugstr_w(pwzTargetFramename)); - HeapFree(GetProcessHeap(), 0, This->TargetFrameName); - This->TargetFrameName = strdupW( pwzTargetFramename ); + hlink_free(This->TargetFrameName); + This->TargetFrameName = hlink_strdupW( pwzTargetFramename ); return S_OK; } @@ -397,7 +368,7 @@ static HRESULT WINAPI IHlink_fnGetTargetFrameName(IHlink* iface, HlinkImpl *This = (HlinkImpl*)iface; TRACE("(%p)->(%p)\n", This, ppwzTargetFrameName); - *ppwzTargetFrameName = co_strdupW( This->TargetFrameName ); + *ppwzTargetFrameName = hlink_co_strdupW( This->TargetFrameName ); return S_OK; } @@ -677,18 +648,18 @@ static HRESULT read_hlink_string(IStream *pStm, LPWSTR *out_str) TRACE("read len %d\n", len); - str = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + str = hlink_alloc(len * sizeof(WCHAR)); if (!str) return E_OUTOFMEMORY; hr = IStream_Read(pStm, str, len * sizeof(WCHAR), &read); if (FAILED(hr)) { - HeapFree(GetProcessHeap(), 0, str); + hlink_free(str); return hr; } if (read != len * sizeof(WCHAR)) { - HeapFree(GetProcessHeap(), 0, str); + hlink_free(str); return STG_E_READFAULT; } TRACE("read string %s\n", debugstr_w(str));

1 0

Jacek Caban : hlink: Added HlinkCreateExtensionServices implementation.
by Alexandre Julliard 21 Nov '07

21 Nov '07

Module: wine Branch: master Commit: 8208e81d4646ac409a993bac2ab0ce240c471710 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8208e81d4646ac409a993bac2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 21 11:35:00 2007 +0100 hlink: Added HlinkCreateExtensionServices implementation. --- dlls/hlink/Makefile.in | 1 + dlls/hlink/extserv.c | 185 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/hlink/hlink_main.c | 10 --- 3 files changed, 186 insertions(+), 10 deletions(-) diff --git a/dlls/hlink/Makefile.in b/dlls/hlink/Makefile.in index d7ceff2..3d0262c 100644 --- a/dlls/hlink/Makefile.in +++ b/dlls/hlink/Makefile.in @@ -10,6 +10,7 @@ EXTRALIBS = -luuid C_SRCS = \ browse_ctx.c \ + extserv.c \ hlink_main.c \ link.c diff --git a/dlls/hlink/extserv.c b/dlls/hlink/extserv.c new file mode 100644 index 0000000..d2abf2e --- /dev/null +++ b/dlls/hlink/extserv.c @@ -0,0 +1,185 @@ +/* + * Copyright 2007 Jacek Caban for 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 + */ + +#include "hlink_private.h" + +#include "wine/debug.h" +#include "wine/unicode.h" + +WINE_DEFAULT_DEBUG_CHANNEL(hlink); + +#define DEFINE_THIS(cls,ifc,iface) ((cls*)((BYTE*)(iface)-offsetof(cls,lp ## ifc ## Vtbl))) + +typedef struct { + const IUnknownVtbl *lpIUnknownVtbl; + const IAuthenticateVtbl *lpIAuthenticateVtbl; + + LONG ref; + IUnknown *outer; + + HWND hwnd; + LPWSTR username; + LPWSTR password; +} ExtensionService; + +#define EXTSERVUNK(x) ((IUnknown*) &(x)->lpIUnknownVtbl) +#define AUTHENTICATE(x) ((IAuthenticate*) &(x)->lpIAuthenticateVtbl) + +#define EXTSERVUNK_THIS(iface) DEFINE_THIS(ExtensionService, IUnknown, iface) + +static HRESULT WINAPI ExtServUnk_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) +{ + ExtensionService *This = EXTSERVUNK_THIS(iface); + + *ppv = NULL; + + if(IsEqualGUID(&IID_IUnknown, riid)) { + TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); + *ppv = EXTSERVUNK(This); + }else if(IsEqualGUID(&IID_IAuthenticate, riid)) { + TRACE("(%p)->(IID_IAuthenticate %p)\n", This, ppv); + *ppv = AUTHENTICATE(This); + } + + if(*ppv) { + IUnknown_AddRef(EXTSERVUNK(This)); + return S_OK; + } + + FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + return E_NOINTERFACE; +} + +static ULONG WINAPI ExtServUnk_AddRef(IUnknown *iface) +{ + ExtensionService *This = EXTSERVUNK_THIS(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI ExtServUnk_Release(IUnknown *iface) +{ + ExtensionService *This = EXTSERVUNK_THIS(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) { + hlink_free(This->username); + hlink_free(This->password); + hlink_free(This); + } + + return ref; +} + +#undef EXTSERVUNK_THIS + +static const IUnknownVtbl ExtServUnkVtbl = { + ExtServUnk_QueryInterface, + ExtServUnk_AddRef, + ExtServUnk_Release +}; + +#define AUTHENTICATE_THIS(iface) DEFINE_THIS(ExtensionService, IAuthenticate, iface) + +static HRESULT WINAPI Authenticate_QueryInterface(IAuthenticate *iface, REFIID riid, void **ppv) +{ + ExtensionService *This = AUTHENTICATE_THIS(iface); + return IUnknown_QueryInterface(This->outer, riid, ppv); +} + +static ULONG WINAPI Authenticate_AddRef(IAuthenticate *iface) +{ + ExtensionService *This = AUTHENTICATE_THIS(iface); + return IUnknown_AddRef(This->outer); +} + +static ULONG WINAPI Authenticate_Release(IAuthenticate *iface) +{ + ExtensionService *This = AUTHENTICATE_THIS(iface); + return IUnknown_Release(This->outer); +} + +static HRESULT WINAPI Authenticate_Authenticate(IAuthenticate *iface, + HWND *phwnd, LPWSTR *pszUsername, LPWSTR *pszPassword) +{ + ExtensionService *This = AUTHENTICATE_THIS(iface); + + TRACE("(%p)->(%p %p %p)\n", This, phwnd, pszUsername, pszPassword); + + if(!phwnd || !pszUsername || !pszPassword) + return E_INVALIDARG; + + *phwnd = This->hwnd; + *pszUsername = hlink_co_strdupW(This->username); + *pszPassword = hlink_co_strdupW(This->password); + + return S_OK; +} + +#undef AUTHENTICATE_THIS + +static const IAuthenticateVtbl AuthenticateVtbl = { + Authenticate_QueryInterface, + Authenticate_AddRef, + Authenticate_Release, + Authenticate_Authenticate +}; + +HRESULT WINAPI HlinkCreateExtensionServices(LPCWSTR pwzAdditionalHeaders, + HWND phwnd, LPCWSTR pszUsername, LPCWSTR pszPassword, + IUnknown *punkOuter, REFIID riid, void** ppv) +{ + ExtensionService *ret; + HRESULT hres = S_OK; + + TRACE("%s %p %s %s %p %s %p\n",debugstr_w(pwzAdditionalHeaders), + phwnd, debugstr_w(pszUsername), debugstr_w(pszPassword), + punkOuter, debugstr_guid(riid), ppv); + + if(pwzAdditionalHeaders) + FIXME("Unsupported pwzAdditionalHeaders\n"); + + ret = hlink_alloc(sizeof(*ret)); + + ret->lpIUnknownVtbl = &ExtServUnkVtbl; + ret->lpIAuthenticateVtbl = &AuthenticateVtbl; + ret->ref = 1; + ret->hwnd = phwnd; + ret->username = hlink_strdupW(pszUsername); + ret->password = hlink_strdupW(pszPassword); + + + if(!punkOuter) { + ret->outer = EXTSERVUNK(ret); + hres = IUnknown_QueryInterface(EXTSERVUNK(ret), riid, ppv); + IUnknown_Release(EXTSERVUNK(ret)); + }else if(IsEqualGUID(&IID_IUnknown, riid)) { + ret->outer = punkOuter; + *ppv = EXTSERVUNK(ret); + }else { + IUnknown_Release(EXTSERVUNK(ret)); + hres = E_INVALIDARG; + } + + return hres; +} diff --git a/dlls/hlink/hlink_main.c b/dlls/hlink/hlink_main.c index e45bc0c..4e32189 100644 --- a/dlls/hlink/hlink_main.c +++ b/dlls/hlink/hlink_main.c @@ -215,16 +215,6 @@ HRESULT WINAPI HlinkQueryCreateFromData(IDataObject* piDataObj) return E_NOTIMPL; } -HRESULT WINAPI HlinkCreateExtensionServices(LPCWSTR pwzAdditionalHeaders, - HWND phwnd, LPCWSTR pszUsername, LPCWSTR pszPassword, - IUnknown *punkOuter, REFIID riid, void** ppvObj) -{ - FIXME("%s %p %s %s %p %s %p\n",debugstr_w(pwzAdditionalHeaders), - phwnd, debugstr_w(pszUsername), debugstr_w(pszPassword), - punkOuter, debugstr_guid(riid), ppvObj); - return E_NOTIMPL; -} - HRESULT WINAPI HlinkNavigateToStringReference( LPCWSTR pwzTarget, LPCWSTR pwzLocation, IHlinkSite *pihlsite, DWORD dwSiteData, IHlinkFrame *pihlframe, DWORD grfHLNF, LPBC pibc,

1 0

Jacek Caban : hlink: Added HlinkCreateExtensionServices tests.
by Alexandre Julliard 21 Nov '07

21 Nov '07

Module: wine Branch: master Commit: 54d5fd079bfa8b140e2118456a69632d07eb2857 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54d5fd079bfa8b140e2118456… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 21 02:14:45 2007 +0100 hlink: Added HlinkCreateExtensionServices tests. --- dlls/hlink/tests/hlink.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 53 insertions(+), 0 deletions(-) diff --git a/dlls/hlink/tests/hlink.c b/dlls/hlink/tests/hlink.c index 2eb63dd..4a59f63 100644 --- a/dlls/hlink/tests/hlink.c +++ b/dlls/hlink/tests/hlink.c @@ -2,6 +2,7 @@ * Implementation of hyperlinking (hlink.dll) * * Copyright 2006 Mike McCormack + * Copyright 2007 Jacek Caban for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -342,6 +343,57 @@ static void test_special_reference(void) ok(ref == NULL, "ref=%p\n", ref); } +static void test_HlinkCreateExtensionServices(void) +{ + IAuthenticate *authenticate; + LPWSTR password, username; + HWND hwnd; + HRESULT hres; + + static const WCHAR usernameW[] = {'u','s','e','r',0}; + static const WCHAR passwordW[] = {'p','a','s','s',0}; + + hres = HlinkCreateExtensionServices(NULL, NULL, NULL, NULL, + NULL, &IID_IAuthenticate, (void**)&authenticate); + ok(hres == S_OK, "HlinkCreateExtensionServices failed: %08x\n", hres); + ok(authenticate != NULL, "HlinkCreateExtensionServices returned NULL\n"); + + password = username = (void*)0xdeadbeef; + hwnd = (void*)0xdeadbeef; + hres = IAuthenticate_Authenticate(authenticate, &hwnd, &username, &password); + ok(hres == S_OK, "Authenticate failed: %08x\n", hres); + ok(!hwnd, "hwnd != NULL\n"); + ok(!username, "username != NULL\n"); + ok(!password, "password != NULL\n"); + + IAuthenticate_Release(authenticate); + + + hres = HlinkCreateExtensionServices(NULL, (HWND)0xfefefefe, usernameW, passwordW, + NULL, &IID_IAuthenticate, (void**)&authenticate); + ok(hres == S_OK, "HlinkCreateExtensionServices failed: %08x\n", hres); + ok(authenticate != NULL, "HlinkCreateExtensionServices returned NULL\n"); + + password = username = NULL; + hwnd = NULL; + hres = IAuthenticate_Authenticate(authenticate, &hwnd, &username, &password); + ok(hres == S_OK, "Authenticate failed: %08x\n", hres); + ok(hwnd == (HWND)0xfefefefe, "hwnd=%p\n", hwnd); + ok(!lstrcmpW(username, usernameW), "unexpected username\n"); + ok(!lstrcmpW(password, passwordW), "unexpected password\n"); + CoTaskMemFree(username); + CoTaskMemFree(password); + + password = username = (void*)0xdeadbeef; + hwnd = (void*)0xdeadbeef; + hres = IAuthenticate_Authenticate(authenticate, &hwnd, NULL, &password); + ok(hres == E_INVALIDARG, "Authenticate failed: %08x\n", hres); + ok(password == (void*)0xdeadbeef, "password = %p\n", password); + ok(hwnd == (void*)0xdeadbeef, "hwnd = %p\n", hwnd); + + IAuthenticate_Release(authenticate); +} + START_TEST(hlink) { CoInitialize(NULL); @@ -350,6 +402,7 @@ START_TEST(hlink) test_reference(); test_persist(); test_special_reference(); + test_HlinkCreateExtensionServices(); CoUninitialize(); }

1 0

Alistair Leslie-Hughes : msxml: Added test for get_text.
by Alexandre Julliard 21 Nov '07

21 Nov '07

Module: wine Branch: master Commit: 9845a9ced4841f7bd4674a53cc58432c3e180e6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9845a9ced4841f7bd4674a53c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Nov 20 21:23:35 2007 +1100 msxml: Added test for get_text. --- dlls/msxml3/tests/domdoc.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 60d7acf..bf272ff 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -1206,6 +1206,10 @@ static void test_get_text(void) ok( r == S_OK, "ret %08x\n", r ); IXMLDOMNodeList_Release( node_list ); + /* Invalid output parameter*/ + r = IXMLDOMNode_get_text( node, NULL ); + ok( r == E_INVALIDARG, "ret %08x\n", r ); + r = IXMLDOMNode_get_text( node, &str ); ok( r == S_OK, "ret %08x\n", r ); todo_wine {

1 0

José Manuel Ferrer Ortiz : winefile: Spanish resource file updated.
by Alexandre Julliard 21 Nov '07

21 Nov '07

Module: wine Branch: master Commit: 34e8cbf2d86b639fc464970e0526073ecc73ea03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34e8cbf2d86b639fc464970e0… Author: José Manuel Ferrer Ortiz <jmfo1982(a)yahoo.es> Date: Tue Nov 20 14:45:37 2007 -0800 winefile: Spanish resource file updated. --- programs/winefile/Es.rc | 85 +++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 82 insertions(+), 3 deletions(-) diff --git a/programs/winefile/Es.rc b/programs/winefile/Es.rc index 77b93da..4ad3e95 100644 --- a/programs/winefile/Es.rc +++ b/programs/winefile/Es.rc @@ -2,7 +2,7 @@ * WineFile * Spanish Language Support * - * Copyright 2004 Jos� Manuel Ferrer Ortiz + * Copyright 2004, 2007 Jos� Manuel Ferrer Ortiz * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -111,7 +111,7 @@ IDM_WINEFILE MENU FIXED IMPURE #endif MENUITEM SEPARATOR MENUITEM "&Minimizar al ejecutarse", 504 - MENUITEM "&Guardar opciones al salir", 511 + MENUITEM "&Guardar opciones al salir", ID_VIEW_SAVESETTINGS } @@ -173,6 +173,59 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "&Examinar", 254, 158, 43, 47, 14 } +IDD_DIALOG_VIEW_TYPE DIALOG DISCARDABLE 15, 13, 161, 97 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Por tipo de archivo" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "&Nombre:",-1,7,8,22,10 + EDITTEXT IDC_VIEW_PATTERN,31,7,63,12,ES_AUTOHSCROLL + GROUPBOX "Tipo de archivo",-1,7,23,87,56 + CONTROL "&Directorios",IDC_VIEW_TYPE_DIRECTORIES,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,32,70,10 + CONTROL "&Programas",IDC_VIEW_TYPE_PROGRAMS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,43,70,10 + CONTROL "Docu&mentos",IDC_VIEW_TYPE_DOCUMENTS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,54,70,10 + CONTROL "&Otros archivos",IDC_VIEW_TYPE_OTHERS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,65,70,10 + CONTROL "Mostrar archivos de &sistema/ocultos",IDC_VIEW_TYPE_HIDDEN, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,81,130,9 + DEFPUSHBUTTON "Aceptar",IDOK,104,7,50,14 + PUSHBUTTON "Cancelar",IDCANCEL,104,24,50,14 +END + +IDD_DIALOG_PROPERTIES DIALOG DISCARDABLE 0, 0, 248, 215 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Propiedades de %s" +FONT 8, "MS Sans Serif" +BEGIN + DEFPUSHBUTTON "Aceptar",IDOK,191,7,50,14 + PUSHBUTTON "Cancelar",IDCANCEL,191,29,50,14 + LTEXT "Nombre:",-1,7,7,59,9 + EDITTEXT IDC_STATIC_PROP_FILENAME,71,7,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "&Ruta completa:",-1,7,18,59,9 + EDITTEXT IDC_STATIC_PROP_PATH,71,18,120,9, ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "�ltimo cambio:",-1,7,29,59,9 + EDITTEXT IDC_STATIC_PROP_LASTCHANGE,71,29,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "Versi�n:",-1,7,40,59,9 + EDITTEXT IDC_STATIC_PROP_VERSION,71,40,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "Cop&yright:",-1,7,51,59,9 + EDITTEXT IDC_STATIC_PROP_COPYRIGHT,71,51,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "Tama�o:",-1,7,62,59,9 + EDITTEXT IDC_STATIC_PROP_SIZE,71,62,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + GROUPBOX "Atributos",-1,7,79,158,46 + CONTROL "S�lo &lectura",IDC_CHECK_READONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,91,68,9 + CONTROL "&Oculto",IDC_CHECK_HIDDEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,91,68,9 + CONTROL "A&rchivar",IDC_CHECK_ARCHIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,101,68,9 + CONTROL "&Sistema",IDC_CHECK_SYSTEM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,101,68,9 + CONTROL "&Comprimido",IDC_CHECK_COMPRESSED,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,17,111,68,9 + GROUPBOX "Informaci�n de &versi�n",-1,7,129,234,79 + LISTBOX IDC_LIST_PROP_VERSION_TYPES,13,139,107,63,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP + EDITTEXT IDC_LIST_PROP_VERSION_VALUES,123,139,111,63,ES_MULTILINE | ES_READONLY | WS_VSCROLL +END + + STRINGTABLE { IDS_FONT_SEL_DLG_NAME "Aplicando configuraci�n de fuente" @@ -183,7 +236,7 @@ STRINGTABLE { IDS_WINEFILE "Winefile" IDS_ERROR "Error" - IDS_ROOT_FS "sf ra�z" + IDS_ROOT_FS "SF ra�z" IDS_UNIXFS "unixfs" IDS_DESKTOP "Escritorio" IDS_SHELL "Shell" @@ -204,4 +257,30 @@ STRINGTABLE IDS_COL_LINKS "Enlaces" IDS_COL_ATTR "Atributos" IDS_COL_SEC "Seguridad" + + IDS_FREE_SPACE_FMT "%s de %s libre" +} + +STRINGTABLE +{ +IDS_LICENSE_CAPTION, "LICENCIA" +IDS_LICENSE, +"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.\n\ +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.\n\ +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" + +IDS_WARRANTY_CAPTION, "SIN GARANT�A" +IDS_WARRANTY, +"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." }

1 0

Alexander Nicolaysen Sørnes : winecfg: Some fixes for Norwegian translation.
by Alexandre Julliard 21 Nov '07

21 Nov '07

Module: wine Branch: master Commit: c65dbabcf3604370e18089dea169c7a4c48c9ba4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c65dbabcf3604370e18089dea… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Nov 21 10:39:59 2007 +0100 winecfg: Some fixes for Norwegian translation. --- programs/winecfg/No.rc | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/programs/winecfg/No.rc b/programs/winecfg/No.rc index bc6be43..b7751bf 100644 --- a/programs/winecfg/No.rc +++ b/programs/winecfg/No.rc @@ -2,7 +2,7 @@ * WineCfg resources * Norwegian Bokm�l Language Support * - * Copyright 2005-2006 Alexander N. S�rnes <alex(a)thehandofagony.com> + * Copyright 2005-2007 Alexander N. S�rnes <alex(a)thehandofagony.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -46,7 +46,7 @@ STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN GROUPBOX " Programminnstillinger ",IDC_STATIC, 8,4,244,240 - LTEXT "Wine kan herme etter forskjellige Windows-versjoner for hvert program. Denne fanen er koblet med bibliotek- og grafikkfanene, s�nn at du kan endre innstillinger for hele systemet eller enkelte program der ogs�.", + LTEXT "Wine kan etterligne forskjellige Windows-versjoner for hvert program. Denne fanen er koblet med bibliotek- og grafikkfanene, s�nn at du kan endre innstillinger for hele systemet eller enkelte program der ogs�.", IDC_STATIC,15,20,227,30 CONTROL "Programmer",IDC_APP_LISTVIEW,"SysListView32",WS_BORDER | WS_TABSTOP | LVS_LIST | LVS_SINGLESEL | LVS_SHOWSELALWAYS, 15,50,230,150 @@ -69,9 +69,9 @@ BEGIN LTEXT "Du kan velge � emulere et Windows-skrivebord, der alle vinduene er bundet i en virtuell skjerm, eller du kan f� vinduene til � oppf�re seg som andre programmer p� skrivebordet.", IDC_STATIC,15,126,228,28 - LTEXT "Skrivebordsstrrelse:",IDC_DESKTOP_SIZE,15,168,44,8,WS_DISABLED + LTEXT "St�rrelse:",IDC_DESKTOP_SIZE,15,168,44,8,WS_DISABLED LTEXT "X",IDC_DESKTOP_BY,108,168,8,8,WS_DISABLED - CONTROL "Emuler et virtuelt skrivebord",IDC_ENABLE_DESKTOP,"Button", + CONTROL "Vis et virtuelt skrivebord",IDC_ENABLE_DESKTOP,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,15,153,230,10 EDITTEXT IDC_DESKTOP_WIDTH,64,168,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED @@ -83,7 +83,7 @@ BEGIN COMBOBOX IDC_D3D_VSHADER_MODE,100,198,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "Tillat piksel-skyggelegger (hvis maskinvaren st�tter det)",IDC_D3D_PSHADER_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,217,230,10 - GROUPBOX " Screen Resolution ",IDC_STATIC,8,242,244,25 + GROUPBOX " Skjermoppl�sning (styrer skriftst�rrelse) ",IDC_STATIC,8,242,244,25 CONTROL "", IDC_RES_TRACKBAR, "msctls_trackbar32",WS_TABSTOP,12,250,187,15 EDITTEXT IDC_RES_DPIEDIT,204,250,23,13,ES_NUMBER|WS_TABSTOP LTEXT "dpi",IDC_STATIC,235,252,10,8 @@ -99,7 +99,7 @@ BEGIN LTEXT "Ny overstyring for bibliotek:",IDC_STATIC,16,58,100,8 COMBOBOX IDC_DLLCOMBO,16,68,140,14,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP | CBS_SORT | CBS_LOWERCASE PUSHBUTTON "&Legg til",IDC_DLLS_ADDDLL, 164,68,82,13,BS_DEFPUSHBUTTON - LTEXT "Eksisterende overstyringer:",IDC_STATIC,16,86,100,8 + LTEXT "Gjeldende overstyringer:",IDC_STATIC,16,86,100,8 LISTBOX IDC_DLLS_LIST,16,96,140,140,WS_BORDER | WS_TABSTOP | WS_VSCROLL PUSHBUTTON "R&ediger",IDC_DLLS_EDITDLL,164,96,82,14 PUSHBUTTON "Fje&rn",IDC_DLLS_REMOVEDLL,164,114,82,14 @@ -110,7 +110,7 @@ STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Rediger overstyring" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX " Lastingsrekkeflge ",IDC_STATIC,8,4,94,66 + GROUPBOX " Lastingsrekkef�lge ",IDC_STATIC,8,4,94,66 CONTROL "Inne&bygget (Wine)",IDC_RAD_BUILTIN,"Button", BS_AUTORADIOBUTTON | WS_GROUP,16,14,75,10 CONTROL "I&nnf�dt (Windows)",IDC_RAD_NATIVE,"Button", BS_AUTORADIOBUTTON,16,24,75,10 CONTROL "&Innebygget s� innf�dt",IDC_RAD_BUILTIN_NATIVE,"Button", BS_AUTORADIOBUTTON,16,34,75,10 @@ -179,7 +179,7 @@ IDD_DESKTOP_INTEGRATION DIALOG DISCARDABLE 0, 0, 260, 250 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX " Appearance ",IDC_STATIC,8,4,244,106 + GROUPBOX " Utseende ",IDC_STATIC,8,4,244,106 LTEXT "Tema:",IDC_STATIC,15,16,130,8 COMBOBOX IDC_THEME_THEMECOMBO,15,24,130,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Installer tema . . .",IDC_THEME_INSTALL,152,23,93,14 @@ -289,8 +289,8 @@ END STRINGTABLE DISCARDABLE BEGIN - IDC_SYSPARAMS_BUTTON "Styrer bakgrunnen" - IDC_SYSPARAMS_BUTTON_TEXT "Styrer tekst" + IDC_SYSPARAMS_BUTTON "Kontrollerbakgrunn" + IDC_SYSPARAMS_BUTTON_TEXT "Kontrollertekst" IDC_SYSPARAMS_DESKTOP "Skrivebord" IDC_SYSPARAMS_MENU "Menybakgrunn" IDC_SYSPARAMS_MENU_TEXT "Menytekst" @@ -305,5 +305,5 @@ BEGIN IDC_SYSPARAMS_ACTIVE_TITLE_TEXT "Aktiv titteltekst" IDC_SYSPARAMS_INACTIVE_TITLE "Inaktiv tittellinje" IDC_SYSPARAMS_INACTIVE_TITLE_TEXT "Inaktiv titteltekst" - IDC_SYSPARAMS_MSGBOX_TEXT "Message Box Text" + IDC_SYSPARAMS_MSGBOX_TEXT "Meldingsvindutekst" END

1 0

Stefan Dösinger : wined3d: Do not cap fragment samplers to 8.
by Alexandre Julliard 21 Nov '07

21 Nov '07

Module: wine Branch: master Commit: bf03075b5e9c1d4a915f0f581783344d08e07e60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf03075b5e9c1d4a915f0f581… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Nov 17 00:44:36 2007 +0100 wined3d: Do not cap fragment samplers to 8. --- dlls/wined3d/directx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 696ce10..36d7ebc 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -758,7 +758,7 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { if (gl_info->supported[ARB_FRAGMENT_PROGRAM]) { GLint tmp; glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS_ARB, &tmp); - gl_info->max_fragment_samplers = min(8, tmp); + gl_info->max_fragment_samplers = min(MAX_FRAGMENT_SAMPLERS, tmp); } else { gl_info->max_fragment_samplers = max(gl_info->max_fragment_samplers, gl_max); }

1 0

Stefan Dösinger : wined3d: Move destroying the glsl vshader into a separate function.
by Alexandre Julliard 21 Nov '07

21 Nov '07

Module: wine Branch: master Commit: af4edef5e1ef166f62a3f5115b1b748761065ac5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af4edef5e1ef166f62a3f5115… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Nov 20 17:03:21 2007 +0100 wined3d: Move destroying the glsl vshader into a separate function. --- dlls/wined3d/vertexshader.c | 29 ++++++++++++++++------------- 1 files changed, 16 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index ab03e25..934fed0 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -445,6 +445,21 @@ static ULONG WINAPI IWineD3DVertexShaderImpl_AddRef(IWineD3DVertexShader *iface return IWineD3DBaseShaderImpl_AddRef((IWineD3DBaseShader *) iface); } +static void destroy_glsl_vshader(IWineD3DVertexShaderImpl *This) { + struct list *linked_programs = &This->baseShader.linked_programs; + + TRACE("Deleting linked programs\n"); + if (linked_programs->next) { + struct glsl_shader_prog_link *entry, *entry2; + LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, linked_programs, struct glsl_shader_prog_link, vshader_entry) { + delete_glsl_program_entry(This->baseShader.device, entry); + } + } + + TRACE("Deleting shader object %u\n", This->baseShader.prgId); + GL_EXTCALL(glDeleteObjectARB(This->baseShader.prgId)); + checkGLcall("glDeleteObjectARB"); +} static ULONG WINAPI IWineD3DVertexShaderImpl_Release(IWineD3DVertexShader *iface) { IWineD3DVertexShaderImpl *This = (IWineD3DVertexShaderImpl *)iface; ULONG ref; @@ -452,19 +467,7 @@ static ULONG WINAPI IWineD3DVertexShaderImpl_Release(IWineD3DVertexShader *iface if (ref == 0) { if (This->baseShader.shader_mode == SHADER_GLSL && This->baseShader.prgId != 0) { - struct list *linked_programs = &This->baseShader.linked_programs; - - TRACE("Deleting linked programs\n"); - if (linked_programs->next) { - struct glsl_shader_prog_link *entry, *entry2; - LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, linked_programs, struct glsl_shader_prog_link, vshader_entry) { - delete_glsl_program_entry(This->baseShader.device, entry); - } - } - - TRACE("Deleting shader object %u\n", This->baseShader.prgId); - GL_EXTCALL(glDeleteObjectARB(This->baseShader.prgId)); - checkGLcall("glDeleteObjectARB"); + destroy_glsl_vshader(This); } HeapFree(GetProcessHeap(), 0, This); }

1 0

Stefan Dösinger : wined3d: Move glsl shader destruction to the glsl shader backend.
by Alexandre Julliard 21 Nov '07

21 Nov '07

Module: wine Branch: master Commit: cfc5725760e3070d53b522709208237e63b2ba03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfc5725760e3070d53b522709… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Nov 20 17:40:54 2007 +0100 wined3d: Move glsl shader destruction to the glsl shader backend. --- dlls/wined3d/arb_program_shader.c | 6 +++++- dlls/wined3d/baseshader.c | 9 ++++++++- dlls/wined3d/glsl_shader.c | 36 +++++++++++++++++++++++++++++++++++- dlls/wined3d/pixelshader.c | 33 ++------------------------------- dlls/wined3d/vertexshader.c | 27 +-------------------------- dlls/wined3d/wined3d_private.h | 1 + 6 files changed, 52 insertions(+), 60 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index d6ca4a8..4a08f70 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1723,10 +1723,14 @@ static void shader_arb_cleanup(IWineD3DDevice *iface) { if (GL_SUPPORT(ARB_FRAGMENT_PROGRAM)) glDisable(GL_FRAGMENT_PROGRAM_ARB); } +static void shader_arb_destroy(IWineD3DBaseShader *iface) { +} + const shader_backend_t arb_program_shader_backend = { &shader_arb_select, &shader_arb_select_depth_blt, &shader_arb_load_constants, &shader_arb_cleanup, - &shader_arb_color_correction + &shader_arb_color_correction, + &shader_arb_destroy }; diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 35d8d32..638db90 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -1080,12 +1080,16 @@ static void shader_none_select(IWineD3DDevice *iface, BOOL usePS, BOOL useVS) {} static void shader_none_select_depth_blt(IWineD3DDevice *iface) {} static void shader_none_load_constants(IWineD3DDevice *iface, char usePS, char useVS) {} static void shader_none_cleanup(IWineD3DDevice *iface) {} +static void shader_none_color_correction(SHADER_OPCODE_ARG* arg) {} +static void shader_none_destroy(IWineD3DBaseShader *iface) {} const shader_backend_t none_shader_backend = { &shader_none_select, &shader_none_select_depth_blt, &shader_none_load_constants, - &shader_none_cleanup + &shader_none_cleanup, + &shader_none_color_correction, + &shader_none_destroy }; /* ******************************************* @@ -1115,14 +1119,17 @@ ULONG WINAPI IWineD3DBaseShaderImpl_AddRef(IWineD3DBaseShader *iface) { ULONG WINAPI IWineD3DBaseShaderImpl_Release(IWineD3DBaseShader *iface) { IWineD3DBaseShaderImpl *This = (IWineD3DBaseShaderImpl *)iface; + IWineD3DDeviceImpl *deviceImpl = (IWineD3DDeviceImpl *) This->baseShader.device; ULONG ref; TRACE("(%p) : Releasing from %d\n", This, This->baseShader.ref); ref = InterlockedDecrement(&This->baseShader.ref); if (ref == 0) { + deviceImpl->shader_backend->shader_destroy(iface); HeapFree(GetProcessHeap(), 0, This->baseShader.function); shader_delete_constant_list(&This->baseShader.constantsF); shader_delete_constant_list(&This->baseShader.constantsB); shader_delete_constant_list(&This->baseShader.constantsI); + HeapFree(GetProcessHeap(), 0, This); } return ref; } diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 5d988e4..1cc3ec8 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3176,10 +3176,44 @@ static void shader_glsl_cleanup(IWineD3DDevice *iface) { GL_EXTCALL(glUseProgramObjectARB(0)); } +static void shader_glsl_destroy(IWineD3DBaseShader *iface) { + struct list *linked_programs; + IWineD3DBaseShaderImpl *This = (IWineD3DBaseShaderImpl *) iface; + WineD3D_GL_Info *gl_info = &((IWineD3DDeviceImpl *) This->baseShader.device)->adapter->gl_info; + + /* Note: Do not use QueryInterface here to find out which shader type this is because this code + * can be called from IWineD3DBaseShader::Release + */ + char pshader = shader_is_pshader_version(This->baseShader.hex_version); + + if(This->baseShader.prgId == 0) return; + linked_programs = &This->baseShader.linked_programs; + + TRACE("Deleting linked programs\n"); + if (linked_programs->next) { + struct glsl_shader_prog_link *entry, *entry2; + + if(pshader) { + LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, linked_programs, struct glsl_shader_prog_link, pshader_entry) { + delete_glsl_program_entry(This->baseShader.device, entry); + } + } else { + LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, linked_programs, struct glsl_shader_prog_link, vshader_entry) { + delete_glsl_program_entry(This->baseShader.device, entry); + } + } + } + + TRACE("Deleting shader object %u\n", This->baseShader.prgId); + GL_EXTCALL(glDeleteObjectARB(This->baseShader.prgId)); + checkGLcall("glDeleteObjectARB"); +} + const shader_backend_t glsl_shader_backend = { &shader_glsl_select, &shader_glsl_select_depth_blt, &shader_glsl_load_constants, &shader_glsl_cleanup, - &shader_glsl_color_correction + &shader_glsl_color_correction, + &shader_glsl_destroy }; diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 5654c46..b9fbd75 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -51,35 +51,8 @@ static ULONG WINAPI IWineD3DPixelShaderImpl_AddRef(IWineD3DPixelShader *iface) return IWineD3DBaseShaderImpl_AddRef((IWineD3DBaseShader *) iface); } -static void destroy_glsl_pshader(IWineD3DPixelShaderImpl *This) { - struct list *linked_programs = &This->baseShader.linked_programs; - - TRACE("Deleting linked programs\n"); - if (linked_programs->next) { - struct glsl_shader_prog_link *entry, *entry2; - LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, linked_programs, struct glsl_shader_prog_link, pshader_entry) { - delete_glsl_program_entry(This->baseShader.device, entry); - } - } - - TRACE("Deleting shader object %u\n", This->baseShader.prgId); - GL_EXTCALL(glDeleteObjectARB(This->baseShader.prgId)); - checkGLcall("glDeleteObjectARB"); -} - static ULONG WINAPI IWineD3DPixelShaderImpl_Release(IWineD3DPixelShader *iface) { - IWineD3DPixelShaderImpl *This = (IWineD3DPixelShaderImpl *)iface; - ULONG ref; - ref = IWineD3DBaseShaderImpl_Release((IWineD3DBaseShader *) iface); - - if(ref == 0) { - if (This->baseShader.shader_mode == SHADER_GLSL && This->baseShader.prgId != 0) { - destroy_glsl_pshader(This); - } - HeapFree(GetProcessHeap(), 0, This); - } - - return ref; + return IWineD3DBaseShaderImpl_Release((IWineD3DBaseShader *) iface); } /* ******************************************* @@ -658,9 +631,7 @@ static HRESULT WINAPI IWineD3DPixelShaderImpl_CompileShader(IWineD3DPixelShader This->baseShader.recompile_count++; } - if (This->baseShader.shader_mode == SHADER_GLSL && This->baseShader.prgId != 0) { - destroy_glsl_pshader(This); - } + deviceImpl->shader_backend->shader_destroy((IWineD3DBaseShader *) iface); } /* We don't need to compile */ diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index 934fed0..2b16f04 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -445,33 +445,8 @@ static ULONG WINAPI IWineD3DVertexShaderImpl_AddRef(IWineD3DVertexShader *iface return IWineD3DBaseShaderImpl_AddRef((IWineD3DBaseShader *) iface); } -static void destroy_glsl_vshader(IWineD3DVertexShaderImpl *This) { - struct list *linked_programs = &This->baseShader.linked_programs; - - TRACE("Deleting linked programs\n"); - if (linked_programs->next) { - struct glsl_shader_prog_link *entry, *entry2; - LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, linked_programs, struct glsl_shader_prog_link, vshader_entry) { - delete_glsl_program_entry(This->baseShader.device, entry); - } - } - - TRACE("Deleting shader object %u\n", This->baseShader.prgId); - GL_EXTCALL(glDeleteObjectARB(This->baseShader.prgId)); - checkGLcall("glDeleteObjectARB"); -} static ULONG WINAPI IWineD3DVertexShaderImpl_Release(IWineD3DVertexShader *iface) { - IWineD3DVertexShaderImpl *This = (IWineD3DVertexShaderImpl *)iface; - ULONG ref; - ref = IWineD3DBaseShaderImpl_Release((IWineD3DBaseShader *) iface); - - if (ref == 0) { - if (This->baseShader.shader_mode == SHADER_GLSL && This->baseShader.prgId != 0) { - destroy_glsl_vshader(This); - } - HeapFree(GetProcessHeap(), 0, This); - } - return ref; + return IWineD3DBaseShaderImpl_Release((IWineD3DBaseShader *) iface); } /* ******************************************* diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c77d2af..5c6d7e9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -211,6 +211,7 @@ typedef struct { void (*shader_load_constants)(IWineD3DDevice *iface, char usePS, char useVS); void (*shader_cleanup)(IWineD3DDevice *iface); void (*shader_color_correction)(struct SHADER_OPCODE_ARG *arg); + void (*shader_destroy)(IWineD3DBaseShader *iface); } shader_backend_t; extern const shader_backend_t glsl_shader_backend;

1 0

Stefan Dösinger : wined3d: Track vertex declaration changes on vertex shaders.
by Alexandre Julliard 21 Nov '07

21 Nov '07

Module: wine Branch: master Commit: 959212304dfaf0e7459374593b20b74fe22a0b57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=959212304dfaf0e7459374593… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Nov 20 21:14:10 2007 +0100 wined3d: Track vertex declaration changes on vertex shaders. If an attribute has type D3DDECLTYPE_D3DCOLOR, the red and blue channels are swizzled in the shader. Since the attribute is stored in the vertex declaration and not the vertex shader, it can change by setting a new vertex declaration. If this happens, we have to recompile the shader with the swizzling of that specific attribute turned on or off. --- dlls/wined3d/vertexdeclaration.c | 29 ++++++- dlls/wined3d/vertexshader.c | 169 ++++++++++++++++++++++++++++++++++--- dlls/wined3d/wined3d_private.h | 17 ++++- 3 files changed, 199 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=959212304dfaf0e745937…

1 0