May 2006 - Wine-commits - list.winehq.org

Jacek Caban : urlmon: Use registered protocols.
by Alexandre Julliard 25 May '06

25 May '06

Module: wine Branch: refs/heads/master Commit: 9c9838d9e8d95986d181fc4a8dbdbe16cd254a24 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9c9838d9e8d95986d181fc4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 24 18:00:08 2006 +0200 urlmon: Use registered protocols. --- dlls/urlmon/binding.c | 2 + dlls/urlmon/internet.c | 16 --------- dlls/urlmon/session.c | 82 ++++++++++++++++++++++++++++++++++++++++----- dlls/urlmon/urlmon_main.h | 3 +- 4 files changed, 76 insertions(+), 27 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index e1c63f6..efbd12f 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -789,7 +789,7 @@ static HRESULT get_protocol(Binding *Thi return S_OK; } - hres = get_protocol_iface(url, &unk); + hres = get_protocol_handler(url, &unk); if(FAILED(hres)) return hres; diff --git a/dlls/urlmon/internet.c b/dlls/urlmon/internet.c index ef9939e..8ae22e0 100644 --- a/dlls/urlmon/internet.c +++ b/dlls/urlmon/internet.c @@ -61,22 +61,6 @@ static HRESULT parse_schema(LPCWSTR url, return S_OK; } -static IInternetProtocolInfo *get_protocol_info(LPCWSTR url) -{ - IInternetProtocolInfo *ret = NULL; - IUnknown *unk; - HRESULT hres; - - hres = get_protocol_iface(url, &unk); - if(FAILED(hres)) - return NULL; - - IUnknown_QueryInterface(unk, &IID_IInternetProtocolInfo, (void**)&ret); - IUnknown_Release(unk); - - return ret; -} - static HRESULT parse_security_url(LPCWSTR url, DWORD flags, LPWSTR result, DWORD size, DWORD *rsize) { IInternetProtocolInfo *protocol_info; diff --git a/dlls/urlmon/session.c b/dlls/urlmon/session.c index 4a1a9b3..deb7146 100644 --- a/dlls/urlmon/session.c +++ b/dlls/urlmon/session.c @@ -1,5 +1,5 @@ /* - * Copyright 2005 Jacek Caban + * Copyright 2005-2006 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 @@ -42,11 +42,23 @@ typedef struct name_space { static name_space *name_space_list = NULL; -HRESULT get_protocol_iface(LPCWSTR url, IUnknown **ret) +static IClassFactory *find_name_space(LPCWSTR protocol) { - WCHAR schema[64], str_clsid[64]; + name_space *iter; + + for(iter = name_space_list; iter; iter = iter->next) { + if(!strcmpW(iter->protocol, protocol)) + return iter->cf; + } + + return NULL; +} + +static HRESULT get_protocol_iface(LPCWSTR schema, DWORD schema_len, IUnknown **ret) +{ + WCHAR str_clsid[64]; HKEY hkey = NULL; - DWORD res, type, size, schema_len; + DWORD res, type, size; CLSID clsid; LPWSTR wszKey; HRESULT hres; @@ -55,11 +67,6 @@ HRESULT get_protocol_iface(LPCWSTR url, {'P','R','O','T','O','C','O','L','S','\\','H','a','n','d','l','e','r','\\'}; static const WCHAR wszCLSID[] = {'C','L','S','I','D',0}; - hres = CoInternetParseUrl(url, PARSE_SCHEMA, 0, schema, sizeof(schema)/sizeof(schema[0]), - &schema_len, 0); - if(FAILED(hres) || !schema_len) - return E_FAIL; - wszKey = HeapAlloc(GetProcessHeap(), 0, sizeof(wszProtocolsKey)+(schema_len+1)*sizeof(WCHAR)); memcpy(wszKey, wszProtocolsKey, sizeof(wszProtocolsKey)); memcpy(wszKey + sizeof(wszProtocolsKey)/sizeof(WCHAR), schema, (schema_len+1)*sizeof(WCHAR)); @@ -88,6 +95,63 @@ HRESULT get_protocol_iface(LPCWSTR url, return CoGetClassObject(&clsid, CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, (void**)ret); } +IInternetProtocolInfo *get_protocol_info(LPCWSTR url) +{ + IInternetProtocolInfo *ret = NULL; + IClassFactory *cf; + IUnknown *unk; + WCHAR schema[64]; + DWORD schema_len; + HRESULT hres; + + hres = CoInternetParseUrl(url, PARSE_SCHEMA, 0, schema, sizeof(schema)/sizeof(schema[0]), + &schema_len, 0); + if(FAILED(hres) || !schema_len) + return NULL; + + cf = find_name_space(schema); + if(cf) { + hres = IClassFactory_QueryInterface(cf, &IID_IInternetProtocolInfo, (void**)&ret); + if(SUCCEEDED(hres)) + return ret; + + hres = IClassFactory_CreateInstance(cf, NULL, &IID_IInternetProtocolInfo, (void**)&ret); + if(SUCCEEDED(hres)) + return ret; + } + + hres = get_protocol_iface(schema, schema_len, &unk); + if(FAILED(hres)) + return NULL; + + hres = IUnknown_QueryInterface(unk, &IID_IInternetProtocolInfo, (void**)&ret); + IUnknown_Release(unk); + + return ret; +} + +HRESULT get_protocol_handler(LPCWSTR url, IUnknown **ret) +{ + IClassFactory *cf; + WCHAR schema[64]; + DWORD schema_len; + HRESULT hres; + + hres = CoInternetParseUrl(url, PARSE_SCHEMA, 0, schema, sizeof(schema)/sizeof(schema[0]), + &schema_len, 0); + if(FAILED(hres) || !schema_len) + return schema_len ? hres : E_FAIL; + + cf = find_name_space(schema); + if(cf) { + hres = IClassFactory_CreateInstance(cf, NULL, &IID_IUnknown, (void**)ret); + if(SUCCEEDED(hres)) + return hres; + } + + return get_protocol_iface(schema, schema_len, ret); +} + static HRESULT WINAPI InternetSession_QueryInterface(IInternetSession *iface, REFIID riid, void **ppv) { diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h index c67b52a..0eb7db6 100644 --- a/dlls/urlmon/urlmon_main.h +++ b/dlls/urlmon/urlmon_main.h @@ -54,7 +54,8 @@ typedef struct HRESULT UMCreateStreamOnCacheFile(LPCWSTR pszURL, DWORD dwSize, LPWSTR pszFileName, HANDLE *phfile, IUMCacheStream **ppstr); void UMCloseCacheFileStream(IUMCacheStream *pstr); -HRESULT get_protocol_iface(LPCWSTR url, IUnknown **ret); +IInternetProtocolInfo *get_protocol_info(LPCWSTR url); +HRESULT get_protocol_handler(LPCWSTR url, IUnknown **ret); HRESULT start_binding(LPCWSTR url, IBindCtx *pbc, REFIID riid, void **ppv);

1 0

Jacek Caban : mshtml: The secret interface is CMarkup. Improve FIXMEs.
by Alexandre Julliard 25 May '06

25 May '06

Module: wine Branch: refs/heads/master Commit: 5f3d7f0d940458766943a568b3da00382d77ec7c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5f3d7f0d940458766943a56… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 24 17:58:27 2006 +0200 mshtml: The secret interface is CMarkup. Improve FIXMEs. --- dlls/mshtml/htmldoc.c | 3 +++ dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/service.c | 10 +++++----- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index d028d83..3814410 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -113,6 +113,9 @@ static HRESULT WINAPI HTMLDocument_Query }else if(IsEqualGUID(&IID_IPersistStreamInit, riid)) { TRACE("(%p)->(IID_IPersistStreamInit %p)\n", This, ppvObject); *ppvObject = PERSTRINIT(This); + }else if(IsEqualGUID(&CLSID_CMarkup, riid)) { + FIXME("(%p)->(CLSID_CMarkup %p)\n", This, ppvObject); + return E_NOINTERFACE; } if(*ppvObject) { diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 3d7ed03..846a467 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -264,6 +264,8 @@ DEFINE_GUID(CLSID_MailtoProtocol, 0x3050 DEFINE_GUID(CLSID_ResProtocol, 0x3050F3BC, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B); DEFINE_GUID(CLSID_SysimageProtocol, 0x76E67A63, 0x06E9, 0x11D2, 0xA8,0x40, 0x00,0x60,0x08,0x05,0x93,0x82); +DEFINE_GUID(CLSID_CMarkup,0x3050f4fb,0x98b5,0x11cf,0xbb,0x82,0x00,0xaa,0x00,0xbd,0xce,0x0b); + extern LONG module_ref; #define LOCK_MODULE() InterlockedIncrement(&module_ref) #define UNLOCK_MODULE() InterlockedDecrement(&module_ref) diff --git a/dlls/mshtml/service.c b/dlls/mshtml/service.c index 1d016b9..ce4dc2e 100644 --- a/dlls/mshtml/service.c +++ b/dlls/mshtml/service.c @@ -63,11 +63,11 @@ static HRESULT WINAPI ServiceProvider_Qu { HTMLDocument *This = SERVPROV_THIS(iface); - /* NOTE: - * IE queries for service {3050f84b-98b5-11cf-bb82-00aa00bdce0b}. - * Its interface has the same IID and HTMLDocument also implements this - * interface. I conldn't find that interface is it. - */ + /* See http://msdn.microsoft.com/workshop/browser/hosting/wbcustompart2.asp */ + if(IsEqualGUID(&CLSID_CMarkup, guidService)) { + FIXME("(%p)->(CLSID_CMarkup %s %p)\n", This, debugstr_guid(riid), ppv); + return E_NOINTERFACE; + } FIXME("(%p)->(%s %s %p)\n", This, debugstr_guid(guidService), debugstr_guid(riid), ppv);

1 0

Juan Lang : crypt32: Move cert functions that don' t depend on the implementation of stores to cert.c.
by Alexandre Julliard 25 May '06

25 May '06

Module: wine Branch: refs/heads/master Commit: 9f1dd10a488fc0085f53403b65725b078c2f4a93 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9f1dd10a488fc0085f53403… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Wed May 24 15:15:56 2006 -0700 crypt32: Move cert functions that don't depend on the implementation of stores to cert.c. --- dlls/crypt32/cert.c | 463 +++++++++++++++++++++++++++++++++++++++ dlls/crypt32/crypt32_private.h | 2 dlls/crypt32/store.c | 475 +--------------------------------------- 3 files changed, 474 insertions(+), 466 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=9f1dd10a488fc0085f5…

1 0

Juan Lang : crypt32: Add one more test of CertAddEncodedCertificateToStore.
by Alexandre Julliard 25 May '06

25 May '06

Module: wine Branch: refs/heads/master Commit: d2fd034b850fb0e381537bc7d1fb196d9fa720f0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d2fd034b850fb0e381537bc… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Wed May 24 18:47:30 2006 -0700 crypt32: Add one more test of CertAddEncodedCertificateToStore. --- dlls/crypt32/tests/store.c | 29 ++++++++++++++++++++++++++--- 1 files changed, 26 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c index 3d487ac..78b0530 100644 --- a/dlls/crypt32/tests/store.c +++ b/dlls/crypt32/tests/store.c @@ -127,7 +127,7 @@ static const BYTE certWithUsage[] = { 0x 0x05, 0x05, 0x07, 0x03, 0x03, 0x06, 0x08, 0x2b, 0x06, 0x01, 0x05, 0x05, 0x07, 0x03, 0x02, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x01 }; static const BYTE serialNum[] = { 1 }; -static const BYTE bigCertWithDifferentIssuer[] = { 0x30, 0x7a, 0x02, 0x01, 0x01, +static const BYTE bigCertWithDifferentSubject[] = { 0x30, 0x7a, 0x02, 0x01, 0x01, 0x30, 0x02, 0x06, 0x00, 0x30, 0x15, 0x31, 0x13, 0x30, 0x11, 0x06, 0x03, 0x55, 0x04, 0x03, 0x13, 0x0a, 0x4a, 0x75, 0x61, 0x6e, 0x20, 0x4c, 0x61, 0x6e, 0x67, 0x00, 0x30, 0x22, 0x18, 0x0f, 0x31, 0x36, 0x30, 0x31, 0x30, 0x31, 0x30, 0x31, @@ -138,6 +138,17 @@ static const BYTE bigCertWithDifferentIs 0x00, 0x03, 0x01, 0x00, 0xa3, 0x16, 0x30, 0x14, 0x30, 0x12, 0x06, 0x03, 0x55, 0x1d, 0x13, 0x01, 0x01, 0xff, 0x04, 0x08, 0x30, 0x06, 0x01, 0x01, 0xff, 0x02, 0x01, 0x01 }; +static const BYTE bigCertWithDifferentIssuer[] = { 0x30, 0x7a, 0x02, 0x01, + 0x01, 0x30, 0x02, 0x06, 0x00, 0x30, 0x15, 0x31, 0x13, 0x30, 0x11, 0x06, 0x03, + 0x55, 0x04, 0x03, 0x13, 0x0a, 0x41, 0x6c, 0x65, 0x78, 0x20, 0x4c, 0x61, 0x6e, + 0x67, 0x00, 0x30, 0x22, 0x18, 0x0f, 0x31, 0x36, 0x30, 0x31, 0x30, 0x31, 0x30, + 0x31, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a, 0x18, 0x0f, 0x31, 0x36, 0x30, + 0x31, 0x30, 0x31, 0x30, 0x31, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a, 0x30, + 0x15, 0x31, 0x13, 0x30, 0x11, 0x06, 0x03, 0x55, 0x04, 0x03, 0x13, 0x0a, 0x4a, + 0x75, 0x61, 0x6e, 0x20, 0x4c, 0x61, 0x6e, 0x67, 0x00, 0x30, 0x07, 0x30, 0x02, + 0x06, 0x00, 0x03, 0x01, 0x00, 0xa3, 0x16, 0x30, 0x14, 0x30, 0x12, 0x06, 0x03, + 0x55, 0x1d, 0x13, 0x01, 0x01, 0xff, 0x04, 0x08, 0x30, 0x06, 0x01, 0x01, 0xff, + 0x02, 0x01, 0x01 }; static void testAddCert(void) { @@ -224,8 +235,8 @@ static void testAddCert(void) CertFreeCertificateContext(context); } - /* Adding a cert that differs by nothing more than serial number - * succeeds. + /* Adding a cert with the same issuer name and serial number (but + * different subject) as an existing cert succeeds. */ context = NULL; ret = CertAddEncodedCertificateToStore(store, X509_ASN_ENCODING, @@ -236,6 +247,18 @@ static void testAddCert(void) if (context) CertDeleteCertificateFromStore(context); + /* Adding a cert with the same subject name and serial number (but + * different issuer) as an existing cert succeeds. + */ + context = NULL; + ret = CertAddEncodedCertificateToStore(store, X509_ASN_ENCODING, + bigCertWithDifferentSubject, sizeof(bigCertWithDifferentSubject), + CERT_STORE_ADD_NEW, &context); + ok(ret, "CertAddEncodedCertificateToStore failed: %08lx\n", + GetLastError()); + if (context) + CertDeleteCertificateFromStore(context); + /* Adding a cert with the same issuer name and serial number (but * different otherwise) as an existing cert succeeds. */

1 0

Stefan Dösinger : wined3d: Fog fixes.
by Alexandre Julliard 25 May '06

25 May '06

Module: wine Branch: refs/heads/master Commit: d5f95961f13287eb68fe47a9469f1a76bde379af URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d5f95961f13287eb68fe47a… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Thu May 25 00:40:08 2006 +0200 wined3d: Fog fixes. --- dlls/wined3d/device.c | 31 ++++++++++++++++++++----------- 1 files changed, 20 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c473de7..9eaca1d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3591,7 +3591,13 @@ #endif { glHint(GL_FOG_HINT, GL_NICEST); switch (Value) { - case D3DFOG_NONE: /* I don't know what to do here */ checkGLcall("glFogi(GL_FOG_MODE, GL_EXP"); break; + case D3DFOG_NONE: { + if(This->stateBlock->renderState[WINED3DRS_FOGVERTEXMODE] == D3DFOG_NONE) { + glFogi(GL_FOG_MODE, GL_LINEAR); checkGLcall("glFogi(GL_FOG_MODE, GL_LINEAR"); + } + /* Otherwise leave the vertex fog value */ + break; + } case D3DFOG_EXP: glFogi(GL_FOG_MODE, GL_EXP); checkGLcall("glFogi(GL_FOG_MODE, GL_EXP"); break; case D3DFOG_EXP2: glFogi(GL_FOG_MODE, GL_EXP2); checkGLcall("glFogi(GL_FOG_MODE, GL_EXP2"); break; case D3DFOG_LINEAR: glFogi(GL_FOG_MODE, GL_LINEAR); checkGLcall("glFogi(GL_FOG_MODE, GL_LINEAR"); break; @@ -3607,16 +3613,19 @@ #endif case WINED3DRS_FOGVERTEXMODE : { glHint(GL_FOG_HINT, GL_FASTEST); - switch (Value) { - case D3DFOG_NONE: /* I don't know what to do here */ checkGLcall("glFogi(GL_FOG_MODE, GL_EXP"); break; - case D3DFOG_EXP: glFogi(GL_FOG_MODE, GL_EXP); checkGLcall("glFogi(GL_FOG_MODE, GL_EXP"); break; - case D3DFOG_EXP2: glFogi(GL_FOG_MODE, GL_EXP2); checkGLcall("glFogi(GL_FOG_MODE, GL_EXP2"); break; - case D3DFOG_LINEAR: glFogi(GL_FOG_MODE, GL_LINEAR); checkGLcall("glFogi(GL_FOG_MODE, GL_LINEAR"); break; - default: - FIXME("Unsupported Value(%lu) for WINED3DRS_FOGTABLEMODE!\n", Value); - } - if (GL_SUPPORT(NV_FOG_DISTANCE)) { - glFogi(GL_FOG_DISTANCE_MODE_NV, This->stateBlock->renderState[WINED3DRS_RANGEFOGENABLE] ? GL_EYE_RADIAL_NV : GL_EYE_PLANE_ABSOLUTE_NV); + /* DX 7 sdk: "If both render states(vertex and table fog) are set to valid modes, the system will apply only pixel(=table) fog effects." */ + if(This->stateBlock->renderState[WINED3DRS_FOGTABLEMODE] == D3DFOG_NONE) { + switch (Value) { + case D3DFOG_EXP: glFogi(GL_FOG_MODE, GL_EXP); checkGLcall("glFogi(GL_FOG_MODE, GL_EXP"); break; + case D3DFOG_EXP2: glFogi(GL_FOG_MODE, GL_EXP2); checkGLcall("glFogi(GL_FOG_MODE, GL_EXP2"); break; + case D3DFOG_NONE: + case D3DFOG_LINEAR: glFogi(GL_FOG_MODE, GL_LINEAR); checkGLcall("glFogi(GL_FOG_MODE, GL_LINEAR"); break; + default: + FIXME("Unsupported Value(%lu) for WINED3DRS_FOGTABLEMODE!\n", Value); + } + if (GL_SUPPORT(NV_FOG_DISTANCE)) { + glFogi(GL_FOG_DISTANCE_MODE_NV, This->stateBlock->renderState[WINED3DRS_RANGEFOGENABLE] ? GL_EYE_RADIAL_NV : GL_EYE_PLANE_ABSOLUTE_NV); + } } } break;

1 0

Vitaliy Margolen : d3d9: StateBlock is also created in EndStateBlock. With tests.
by Alexandre Julliard 25 May '06

25 May '06

Module: wine Branch: refs/heads/master Commit: 5eeead1fd76526ffc87088ac1217a31b72e3a7d6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5eeead1fd76526ffc87088a… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Wed May 24 08:42:50 2006 -0600 d3d9: StateBlock is also created in EndStateBlock. With tests. --- dlls/d3d9/stateblock.c | 13 +++++++++---- dlls/d3d9/tests/device.c | 8 ++++++++ 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/stateblock.c b/dlls/d3d9/stateblock.c index bdc4662..ad87335 100644 --- a/dlls/d3d9/stateblock.c +++ b/dlls/d3d9/stateblock.c @@ -150,12 +150,17 @@ HRESULT WINAPI IDirect3DDevice9Impl_En } /* allocate a new IDirectD3DStateBlock */ object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY ,sizeof(IDirect3DStateBlock9Impl)); + if (!object) { + FIXME("(%p) Failed to allocate %d bytes\n", This, sizeof(IDirect3DStateBlock9Impl)); + return E_OUTOFMEMORY; + } object->ref = 1; object->lpVtbl = &Direct3DStateBlock9_Vtbl; - - object->wineD3DStateBlock=wineD3DStateBlock; - - *ppSB=(IDirect3DStateBlock9*)object; + object->wineD3DStateBlock = wineD3DStateBlock; + + IUnknown_AddRef(iface); + object->parentDevice = iface; + *ppSB=(IDirect3DStateBlock9*)object; TRACE("(%p)Returning %p %p\n", This, *ppSB, wineD3DStateBlock); return D3D_OK; } diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index af938c5..36e84de 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -201,6 +201,7 @@ void test_refcount(void) IDirect3DSurface9 *pRenderTarget = NULL; IDirect3DSurface9 *pTextureLevel = NULL; IDirect3DStateBlock9 *pStateBlock = NULL; + IDirect3DStateBlock9 *pStateBlock1 = NULL; IDirect3DSwapChain9 *pSwapChain = NULL; IDirect3DQuery9 *pQuery = NULL; D3DPRESENT_PARAMETERS d3dpp; @@ -302,6 +303,12 @@ void test_refcount(void) hr = IDirect3DDevice9_CreateQuery( pDevice, D3DQUERYTYPE_EVENT, &pQuery ); CHECK_CALL( hr, "CreateQuery", pDevice, refcount+1 ); + refcount = get_refcount( (IUnknown *)pDevice ); + hr = IDirect3DDevice9_BeginStateBlock( pDevice ); + CHECK_CALL( hr, "BeginStateBlock", pDevice, refcount ); + hr = IDirect3DDevice9_EndStateBlock( pDevice, &pStateBlock1 ); + CHECK_CALL( hr, "EndStateBlock", pDevice, refcount+1 ); + cleanup: if (pDevice) IUnknown_Release( pDevice ); @@ -327,6 +334,7 @@ cleanup: if (pSwapChain) IUnknown_Release( pSwapChain ); */ if (pQuery) IUnknown_Release( pQuery ); + if (pStateBlock1) IUnknown_Release( pStateBlock1 ); if (pD3d) IUnknown_Release( pD3d );

1 0

Stefan Dösinger : wined3d: Color keying emulation.
by Alexandre Julliard 25 May '06

25 May '06

Module: wine Branch: refs/heads/master Commit: 93db443319ae99e1f499a9b2982ddfae19828040 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=93db443319ae99e1f499a9b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed May 24 17:15:24 2006 +0200 wined3d: Color keying emulation. --- dlls/wined3d/device.c | 92 +++++++++++++++++++++++++++++++------------------ 1 files changed, 58 insertions(+), 34 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 5ac899c..efa6836 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3212,46 +3212,55 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetRen break; case WINED3DRS_ALPHATESTENABLE : - if (Value) { - glEnable(GL_ALPHA_TEST); - checkGLcall("glEnable GL_ALPHA_TEST"); - } else { - glDisable(GL_ALPHA_TEST); - checkGLcall("glDisable GL_ALPHA_TEST"); - } - break; - case WINED3DRS_ALPHAFUNC : + case WINED3DRS_ALPHAREF : + case WINED3DRS_COLORKEYENABLE : { - int glParm = GL_LESS; - float ref = ((float) This->stateBlock->renderState[WINED3DRS_ALPHAREF]) / 255.0f; + int glParm = 0.0; + float ref = GL_LESS; + BOOL enable_ckey = FALSE; - switch ((D3DCMPFUNC) Value) { - case D3DCMP_NEVER: glParm = GL_NEVER; break; - case D3DCMP_LESS: glParm = GL_LESS; break; - case D3DCMP_EQUAL: glParm = GL_EQUAL; break; - case D3DCMP_LESSEQUAL: glParm = GL_LEQUAL; break; - case D3DCMP_GREATER: glParm = GL_GREATER; break; - case D3DCMP_NOTEQUAL: glParm = GL_NOTEQUAL; break; - case D3DCMP_GREATEREQUAL: glParm = GL_GEQUAL; break; - case D3DCMP_ALWAYS: glParm = GL_ALWAYS; break; - default: - FIXME("Unrecognized/Unhandled D3DCMPFUNC value %ld\n", Value); + IWineD3DSurfaceImpl *surf; + + /* Find out if the texture on the first stage has a ckey set */ + if(This->stateBlock->textures[0]) { + surf = (IWineD3DSurfaceImpl *) ((IWineD3DTextureImpl *)This->stateBlock->textures[0])->surfaces[0]; + if(surf->CKeyFlags & DDSD_CKSRCBLT) enable_ckey = TRUE; } - TRACE("glAlphaFunc with Parm=%x, ref=%f\n", glParm, ref); - glAlphaFunc(glParm, ref); - This->alphafunc = glParm; - checkGLcall("glAlphaFunc"); - } - break; - case WINED3DRS_ALPHAREF : - { - int glParm = This->alphafunc; - float ref = 1.0f; + if (This->stateBlock->renderState[WINED3DRS_ALPHATESTENABLE] || + (This->stateBlock->renderState[WINED3DRS_COLORKEYENABLE] && enable_ckey)) { + glEnable(GL_ALPHA_TEST); + checkGLcall("glEnable GL_ALPHA_TEST"); + } else { + glDisable(GL_ALPHA_TEST); + checkGLcall("glDisable GL_ALPHA_TEST"); + /* Alpha test is disabled, don't bother setting the params - it will happen on the next + * enable call + */ + break; + } - ref = ((float) Value) / 255.0f; - TRACE("glAlphaFunc with Parm=%x, ref=%f\n", glParm, ref); + if(This->stateBlock->renderState[WINED3DRS_COLORKEYENABLE] && enable_ckey) { + glParm = GL_NOTEQUAL; + ref = 0.0; + } else { + ref = ((float) This->stateBlock->renderState[WINED3DRS_ALPHAREF]) / 255.0f; + + switch ((D3DCMPFUNC) This->stateBlock->renderState[WINED3DRS_ALPHAFUNC]) { + case D3DCMP_NEVER: glParm = GL_NEVER; break; + case D3DCMP_LESS: glParm = GL_LESS; break; + case D3DCMP_EQUAL: glParm = GL_EQUAL; break; + case D3DCMP_LESSEQUAL: glParm = GL_LEQUAL; break; + case D3DCMP_GREATER: glParm = GL_GREATER; break; + case D3DCMP_NOTEQUAL: glParm = GL_NOTEQUAL; break; + case D3DCMP_GREATEREQUAL: glParm = GL_GEQUAL; break; + case D3DCMP_ALWAYS: glParm = GL_ALWAYS; break; + default: + FIXME("Unrecognized/Unhandled D3DCMPFUNC value %ld\n", Value); + } + } + This->alphafunc = glParm; glAlphaFunc(glParm, ref); checkGLcall("glAlphaFunc"); } @@ -5231,6 +5240,21 @@ #endif IWineD3DBaseTexture_Release(oldTexture); } + /* Reset color keying */ + if(Stage == 0 && This->stateBlock->renderState[WINED3DRS_COLORKEYENABLE]) { + BOOL enable_ckey = FALSE; + + if(pTexture) { + IWineD3DSurfaceImpl *surf = (IWineD3DSurfaceImpl *) ((IWineD3DTextureImpl *)pTexture)->surfaces[0]; + if(surf->CKeyFlags & DDSD_CKSRCBLT) enable_ckey = TRUE; + } + + if(enable_ckey) { + glAlphaFunc(GL_NOTEQUAL, 0.0); + checkGLcall("glAlphaFunc"); + } + } + return WINED3D_OK; }

1 0

Stefan Dösinger : wined3d: Silence the offscreen surface creation fixme.
by Alexandre Julliard 25 May '06

25 May '06

Module: wine Branch: refs/heads/master Commit: e18c89b3f49e28dca0a6fc89072248c291c5c7b6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e18c89b3f49e28dca0a6fc8… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed May 24 17:33:34 2006 +0200 wined3d: Silence the offscreen surface creation fixme. --- dlls/wined3d/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index efa6836..c473de7 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -736,7 +736,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_Creat case WINED3DPOOL_DEFAULT: /*TODO: Create offscreen plain can cause this check to fail..., find out if it should */ if(!(Usage & WINED3DUSAGE_DYNAMIC) && !(Usage & WINED3DUSAGE_RENDERTARGET) && !(Usage && WINED3DUSAGE_DEPTHSTENCIL ) && Lockable) - FIXME("Creating a surface with a POOL of DEFAULT with Locable true, that doesn't specify DYNAMIC usage.\n"); + WARN("Creating a surface with a POOL of DEFAULT with Lockable true, that doesn't specify DYNAMIC usage.\n"); break; default: FIXME("(%p) Unknown pool %d\n", This, Pool);

1 0

Stefan Dösinger : wined3d: Turn around the image in LockRect.
by Alexandre Julliard 25 May '06

25 May '06

Module: wine Branch: refs/heads/master Commit: 40d3cc5ee4c2fb8606728da8a0681ba8702125a4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=40d3cc5ee4c2fb8606728da… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed May 24 17:37:43 2006 +0200 wined3d: Turn around the image in LockRect. --- dlls/wined3d/surface.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 9fb52a8..ed9a549 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -588,12 +588,34 @@ #endif if ((This->lockedRect.left == 0 && This->lockedRect.top == 0 && This->lockedRect.right == This->currentDesc.Width && This->lockedRect.bottom == This->currentDesc.Height)) { + char *row, *top, *bottom; + int i; + glReadPixels(0, 0, This->currentDesc.Width, This->currentDesc.Height, This->glDescription.glFormat, This->glDescription.glType, (char *)pLockedRect->pBits); + + /* glReadPixels returns the image upside down, and there is no way to prevent this. + Flip the lines in software*/ + row = HeapAlloc(GetProcessHeap(), 0, pLockedRect->Pitch); + if(!row) { + ERR("Out of memory\n"); + return E_OUTOFMEMORY; + } + top = This->resource.allocatedMemory; + bottom = ( (char *) This->resource.allocatedMemory) + pLockedRect->Pitch * ( This->currentDesc.Height - 1); + for(i = 0; i < This->currentDesc.Height / 2; i++) { + memcpy(row, top, pLockedRect->Pitch); + memcpy(top, bottom, pLockedRect->Pitch); + memcpy(bottom, row, pLockedRect->Pitch); + top += pLockedRect->Pitch; + bottom -= pLockedRect->Pitch; + } + HeapFree(GetProcessHeap(), 0, row); + } else if (This->lockedRect.left == 0 && This->lockedRect.right == This->currentDesc.Width) { glReadPixels(0, This->lockedRect.top,

1 0

lostwages/ include/winehq.conf news/2006052401.xml
by WineHQ 24 May '06

24 May '06

ChangeSet ID: 25114 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: wineowner(a)winehq.org 2006/05/24 13:20:07 Modified files: include : winehq.conf Added files: news : 2006052401.xml Log message: News about Wine 0.9.14 Patch: http://cvs.winehq.org/patch.py?id=25114 Old revision New revision Changes Path 1.37 1.38 +1 -1 lostwages/include/winehq.conf Added 1.1 +0 -0 lostwages/news/2006052401.xml Index: lostwages/include/winehq.conf diff -u -p lostwages/include/winehq.conf:1.37 lostwages/include/winehq.conf:1.38 --- lostwages/include/winehq.conf:1.37 24 May 2006 18:20: 7 -0000 +++ lostwages/include/winehq.conf 24 May 2006 18:20: 7 -0000 @@ -29,7 +29,7 @@ news_xml_path: news wwn_xml_path: wwn # Snapshot Date -snapshot_date: 0.9.13 +snapshot_date: 0.9.14 # Current RH Packages Snapshot Date snapshot_date_rh: 0.9.2 Index: lostwages/news/2006052401.xml diff -u -p /dev/null lostwages/news/2006052401.xml:1.1 --- /dev/null 24 May 2006 18:20: 7 -0000 +++ lostwages/news/2006052401.xml 24 May 2006 18:20: 7 -0000 @@ -0,0 +1,24 @@ +<news> + <date>May 24, 2006</date> + <title>Wine 0.9.14 Released</title> + <body> +<p> +A new drop fell out of CVS today - Wine 0.9.14. There's a lot of behind +the scenes changes in this release, but you may notice the following: +<ul> +<li> Better MS/RPC compatibility.</li> +<li> Many fixes to Direct3D shaders.</li> +<li> Several improvements to the header control. </li> +</ul> +</p><p> + Binary packages are in the process of being built, but the source is + <a href="http://prdownloads.sourceforge.net/wine/wine-0.9.14.tar.bz2">available + now</a>. You can find out more about this release in the + <a href="?announce=1.118">announcement</a>. Check out our + <a href="/site/download">download page</a> for packages for your favorite + distribution. Currently official Fedora packages lag behind, but you can get + Wine-0.9.10 by running <tt>yum install wine</tt> from + <a href="http://fedoraproject.org/extras/4/i386/repodata/repoview/W.group.html">Fedora Extras</a>. +</p> + </body> +</news>

1 0