July 2008 - Wine-commits - list.winehq.org

Piotr Caban : msxml3: Added ISAXAttributes_getValue implementation.
by Alexandre Julliard 31 Jul '08

31 Jul '08

Module: wine Branch: master Commit: 25168401af6b56a7690089dbf96420f70ced1d00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25168401af6b56a7690089dbf… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Wed Jul 30 20:27:25 2008 +0200 msxml3: Added ISAXAttributes_getValue implementation. --- dlls/msxml3/saxreader.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index e57bf6c..5a64e2b 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -382,9 +382,14 @@ static HRESULT WINAPI isaxattributes_getValue( int *nValue) { saxattributes *This = impl_from_ISAXAttributes( iface ); + TRACE("(%p)->(%d)\n", This, nIndex); - FIXME("(%p)->(%d) stub\n", This, nIndex); - return E_NOTIMPL; + if(nIndex >= This->nb_attributes) return E_INVALIDARG; + + *nValue = SysStringLen(This->szValue[nIndex]); + *pValue = This->szValue[nIndex]; + + return S_OK; } static HRESULT WINAPI isaxattributes_getValueFromName( @@ -544,8 +549,6 @@ static void libxmlStartElementNS( HRESULT hr; saxattributes *attr; - FIXME("Arguments processing not yet implemented.\n"); - update_position(This, (xmlChar*)This->pParserCtxt->input->cur+1); if(This->saxreader->contentHandler)

1 0

Piotr Caban : msxml3: Add ISAXAttribute_getLength implementation.
by Alexandre Julliard 31 Jul '08

31 Jul '08

Module: wine Branch: master Commit: 58b26f3b073a56f5f48b50c1f7c13df5406b741e URL: http://source.winehq.org/git/wine.git/?a=commit;h=58b26f3b073a56f5f48b50c1f… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Wed Jul 30 20:26:50 2008 +0200 msxml3: Add ISAXAttribute_getLength implementation. --- dlls/msxml3/saxreader.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 62bfd9b..7c7e90f 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -245,8 +245,9 @@ static HRESULT WINAPI isaxattributes_getLength( { saxattributes *This = impl_from_ISAXAttributes( iface ); - FIXME("(%p) stub\n", This); - return E_NOTIMPL; + *length = This->nb_attributes; + TRACE("Length set to %d\n", *length); + return S_OK; } static HRESULT WINAPI isaxattributes_getURI(

1 0

Piotr Caban : msxml3: Added ISAXAttributes_getLocalName implementation.
by Alexandre Julliard 31 Jul '08

31 Jul '08

Module: wine Branch: master Commit: 421a9a61c45322d774152b2d8b4884ceb2dd91d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=421a9a61c45322d774152b2d8… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Wed Jul 30 20:27:07 2008 +0200 msxml3: Added ISAXAttributes_getLocalName implementation. --- dlls/msxml3/saxreader.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 7c7e90f..e57bf6c 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -269,9 +269,14 @@ static HRESULT WINAPI isaxattributes_getLocalName( int *pLocalNameLength) { saxattributes *This = impl_from_ISAXAttributes( iface ); + TRACE("(%p)->(%d)\n", This, nIndex); - FIXME("(%p)->(%d) stub\n", This, nIndex); - return E_NOTIMPL; + if(nIndex >= This->nb_attributes) return E_INVALIDARG; + + *pLocalNameLength = SysStringLen(This->szLocalname[nIndex]); + *pLocalName = This->szLocalname[nIndex]; + + return S_OK; } static HRESULT WINAPI isaxattributes_getQName(

1 0

Piotr Caban : msxml3: Initialize ISAXAttribute structure.
by Alexandre Julliard 31 Jul '08

31 Jul '08

Module: wine Branch: master Commit: 6df49d5707fccbf480be88441fdb83c5af1575ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=6df49d5707fccbf480be88441… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Wed Jul 30 20:24:12 2008 +0200 msxml3: Initialize ISAXAttribute structure. --- dlls/msxml3/saxreader.c | 111 +++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 97 insertions(+), 14 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 8ec1e46..62bfd9b 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -73,6 +73,11 @@ typedef struct _saxattributes { const struct ISAXAttributesVtbl *lpSAXAttributesVtbl; LONG ref; + int nb_attributes; + BSTR *szLocalname; + BSTR *szPrefix; + BSTR *szURI; + BSTR *szValue; } saxattributes; static inline saxreader *impl_from_IVBSAXXMLReader( IVBSAXXMLReader *iface ) @@ -96,6 +101,28 @@ static inline saxattributes *impl_from_ISAXAttributes( ISAXAttributes *iface ) } +BSTR bstr_from_xmlCharN(const xmlChar *buf, int len) +{ + DWORD dLen; + LPWSTR str; + BSTR bstr; + + if (!buf) + return NULL; + + dLen = MultiByteToWideChar(CP_UTF8, 0, (LPCSTR)buf, len, NULL, 0); + if(len != -1) dLen++; + str = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, dLen * sizeof (WCHAR)); + if (!str) + return NULL; + MultiByteToWideChar(CP_UTF8, 0, (LPCSTR)buf, len, str, dLen); + if(len != -1) str[dLen-1] = '\0'; + bstr = SysAllocString(str); + HeapFree(GetProcessHeap(), 0, str); + + return bstr; +} + static void format_error_message_from_id(saxlocator *This, HRESULT hr) { xmlStopParser(This->pParserCtxt); @@ -191,6 +218,20 @@ static ULONG WINAPI isaxattributes_Release(ISAXAttributes* iface) ref = InterlockedDecrement(&This->ref); if (ref==0) { + int index; + for(index=0; index<This->nb_attributes; index++) + { + SysFreeString(This->szLocalname[index]); + SysFreeString(This->szPrefix[index]); + SysFreeString(This->szURI[index]); + SysFreeString(This->szValue[index]); + } + + HeapFree(GetProcessHeap(), 0, This->szLocalname); + HeapFree(GetProcessHeap(), 0, This->szPrefix); + HeapFree(GetProcessHeap(), 0, This->szURI); + HeapFree(GetProcessHeap(), 0, This->szValue); + HeapFree(GetProcessHeap(), 0, This); } @@ -389,9 +430,11 @@ static const struct ISAXAttributesVtbl isaxattributes_vtbl = isaxattributes_getValueFromQName }; -static HRESULT SAXAttributes_create(IUnknown *pUnkOuter, LPVOID *ppObj) +static HRESULT SAXAttributes_create(saxattributes **attr, + int nb_attributes, const xmlChar **xmlAttributes) { saxattributes *attributes; + int index; attributes = HeapAlloc(GetProcessHeap(), 0, sizeof(*attributes)); if(!attributes) @@ -400,9 +443,47 @@ static HRESULT SAXAttributes_create(IUnknown *pUnkOuter, LPVOID *ppObj) attributes->lpSAXAttributesVtbl = &isaxattributes_vtbl; attributes->ref = 1; - *ppObj = attributes; + attributes->nb_attributes = nb_attributes; + + attributes->szLocalname = + HeapAlloc(GetProcessHeap(), 0, sizeof(BSTR)*nb_attributes); + attributes->szPrefix = + HeapAlloc(GetProcessHeap(), 0, sizeof(BSTR)*nb_attributes); + attributes->szURI = + HeapAlloc(GetProcessHeap(), 0, sizeof(BSTR)*nb_attributes); + attributes->szValue = + HeapAlloc(GetProcessHeap(), 0, sizeof(BSTR)*nb_attributes); + + if(!attributes->szLocalname || !attributes->szPrefix + || !attributes->szURI || !attributes->szValue) + { + if(attributes->szLocalname) + HeapFree(GetProcessHeap(), 0, attributes->szLocalname); + if(attributes->szPrefix) + HeapFree(GetProcessHeap(), 0, attributes->szPrefix); + if(attributes->szURI) + HeapFree(GetProcessHeap(), 0, attributes->szURI); + if(attributes->szValue) + HeapFree(GetProcessHeap(), 0, attributes->szValue); + return E_FAIL; + } + + for(index=0; index<nb_attributes; index++) + { + attributes->szLocalname[index] = + bstr_from_xmlChar(xmlAttributes[index*5]); + attributes->szPrefix[index] = + bstr_from_xmlChar(xmlAttributes[index*5+1]); + attributes->szURI[index] = + bstr_from_xmlChar(xmlAttributes[index*5+2]); + attributes->szValue[index] = + bstr_from_xmlCharN(xmlAttributes[index*5+3], + xmlAttributes[index*5+4]-xmlAttributes[index*5+3]); + } + + *attr = attributes; - TRACE("returning %p\n", *ppObj); + TRACE("returning %p\n", *attr); return S_OK; } @@ -455,7 +536,7 @@ static void libxmlStartElementNS( BSTR NamespaceUri, LocalName, QName; saxlocator *This = ctx; HRESULT hr; - ISAXAttributes *attr; + saxattributes *attr; FIXME("Arguments processing not yet implemented.\n"); @@ -467,21 +548,23 @@ static void libxmlStartElementNS( LocalName = bstr_from_xmlChar(localname); QName = bstr_from_xmlChar(localname); - SAXAttributes_create(NULL, (void*)&attr); - - hr = ISAXContentHandler_startElement( - This->saxreader->contentHandler, - NamespaceUri, SysStringLen(NamespaceUri), - LocalName, SysStringLen(LocalName), - QName, SysStringLen(QName), - attr); + hr = SAXAttributes_create(&attr, nb_attributes, attributes); + if(hr == S_OK) + { + hr = ISAXContentHandler_startElement( + This->saxreader->contentHandler, + NamespaceUri, SysStringLen(NamespaceUri), + LocalName, SysStringLen(LocalName), + QName, SysStringLen(QName), + (ISAXAttributes*)&attr->lpSAXAttributesVtbl); + + ISAXAttributes_Release((ISAXAttributes*)&attr->lpSAXAttributesVtbl); + } SysFreeString(NamespaceUri); SysFreeString(LocalName); SysFreeString(QName); - ISAXAttributes_Release(attr); - if(hr != S_OK) format_error_message_from_id(This, hr); }

1 0

Paul Vriens : crypt32/tests: Don't crash on some win9x boxes.
by Alexandre Julliard 31 Jul '08

31 Jul '08

Module: wine Branch: master Commit: 6d33798265e40a0bc1581205701100f7bd16be8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d33798265e40a0bc15812057… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed Jul 30 22:06:34 2008 +0200 crypt32/tests: Don't crash on some win9x boxes. --- dlls/crypt32/tests/cert.c | 50 +++++++++++++++++++++++++++----------------- 1 files changed, 31 insertions(+), 19 deletions(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 37cea10..36f7ea1 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -157,19 +157,23 @@ static void testAddCert(void) return; /* Weird--bad add disposition leads to an access violation in Windows. + * Both tests crash on some win9x boxes. */ - ret = CertAddEncodedCertificateToStore(0, X509_ASN_ENCODING, bigCert, - sizeof(bigCert), 0, NULL); - ok(!ret && (GetLastError() == STATUS_ACCESS_VIOLATION || - GetLastError() == E_INVALIDARG), - "Expected STATUS_ACCESS_VIOLATION or E_INVALIDARG, got %08x\n", - GetLastError()); - ret = CertAddEncodedCertificateToStore(store, X509_ASN_ENCODING, - bigCert, sizeof(bigCert), 0, NULL); - ok(!ret && (GetLastError() == STATUS_ACCESS_VIOLATION || - GetLastError() == E_INVALIDARG), - "Expected STATUS_ACCESS_VIOLATION or E_INVALIDARG, got %08x\n", - GetLastError()); + if (0) + { + ret = CertAddEncodedCertificateToStore(0, X509_ASN_ENCODING, bigCert, + sizeof(bigCert), 0, NULL); + ok(!ret && (GetLastError() == STATUS_ACCESS_VIOLATION || + GetLastError() == E_INVALIDARG), + "Expected STATUS_ACCESS_VIOLATION or E_INVALIDARG, got %08x\n", + GetLastError()); + ret = CertAddEncodedCertificateToStore(store, X509_ASN_ENCODING, + bigCert, sizeof(bigCert), 0, NULL); + ok(!ret && (GetLastError() == STATUS_ACCESS_VIOLATION || + GetLastError() == E_INVALIDARG), + "Expected STATUS_ACCESS_VIOLATION or E_INVALIDARG, got %08x\n", + GetLastError()); + } /* Weird--can add a cert to the NULL store (does this have special * meaning?) @@ -1746,10 +1750,14 @@ static void testSignAndEncodeCert(void) &algID, NULL, NULL, &size); ok(!ret && GetLastError() == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %08x\n", GetLastError()); - ret = CryptSignAndEncodeCertificate(0, 0, X509_ASN_ENCODING, - X509_CERT_TO_BE_SIGNED, NULL, &algID, NULL, NULL, &size); - ok(!ret && GetLastError() == STATUS_ACCESS_VIOLATION, - "Expected STATUS_ACCESS_VIOLATION, got %08x\n", GetLastError()); + /* Crashes on some win9x boxes */ + if (0) + { + ret = CryptSignAndEncodeCertificate(0, 0, X509_ASN_ENCODING, + X509_CERT_TO_BE_SIGNED, NULL, &algID, NULL, NULL, &size); + ok(!ret && GetLastError() == STATUS_ACCESS_VIOLATION, + "Expected STATUS_ACCESS_VIOLATION, got %08x\n", GetLastError()); + } /* Crashes ret = CryptSignAndEncodeCertificate(0, 0, X509_ASN_ENCODING, X509_CERT_TO_BE_SIGNED, &info, NULL, NULL, NULL, &size); @@ -2522,9 +2530,13 @@ static void testHashPublicKeyInfo(void) ret = CryptHashPublicKeyInfo(0, 0, 0, 0, NULL, NULL, &len); ok(!ret && GetLastError() == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %08x\n", GetLastError()); - ret = CryptHashPublicKeyInfo(0, 0, 0, X509_ASN_ENCODING, NULL, NULL, &len); - ok(!ret && GetLastError() == STATUS_ACCESS_VIOLATION, - "Expected STATUS_ACCESS_VIOLATION, got %08x\n", GetLastError()); + /* Crashes on some win9x boxes */ + if (0) + { + ret = CryptHashPublicKeyInfo(0, 0, 0, X509_ASN_ENCODING, NULL, NULL, &len); + ok(!ret && GetLastError() == STATUS_ACCESS_VIOLATION, + "Expected STATUS_ACCESS_VIOLATION, got %08x\n", GetLastError()); + } ret = CryptHashPublicKeyInfo(0, 0, 0, X509_ASN_ENCODING, &info, NULL, &len); ok(ret, "CryptHashPublicKeyInfo failed: %08x\n", GetLastError()); ok(len == 16, "Expected hash size 16, got %d\n", len);

1 0

Stefan Dösinger : wined3d: GL_ARB_fragment_program ffp implementation.
by Alexandre Julliard 31 Jul '08

31 Jul '08

Module: wine Branch: master Commit: 14b24058d69d73ebf6b70bc36c8aa62993351079 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14b24058d69d73ebf6b70bc36… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jul 28 11:41:02 2008 -0500 wined3d: GL_ARB_fragment_program ffp implementation. --- dlls/wined3d/arb_program_shader.c | 983 +++++++++++++++++++++++++++++++++---- dlls/wined3d/device.c | 6 +- dlls/wined3d/directx.c | 19 +- dlls/wined3d/wined3d_private.h | 3 + 4 files changed, 907 insertions(+), 104 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=14b24058d69d73ebf6b70…

1 0

Stefan Dösinger : wined3d: Use a hashmap to store the ffp shaders.
by Alexandre Julliard 31 Jul '08

31 Jul '08

Module: wine Branch: master Commit: bc4435e4063c70d0ef2fcc2ab7bb6df3efcfc0e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc4435e4063c70d0ef2fcc2ab… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jul 29 10:51:52 2008 -0500 wined3d: Use a hashmap to store the ffp shaders. --- dlls/wined3d/ati_fragment_shader.c | 32 +++++++++-------- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/utils.c | 64 ++++++++++++++++++++++++++---------- dlls/wined3d/wined3d_private.h | 9 +++-- 4 files changed, 69 insertions(+), 38 deletions(-) diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index 6dc0193..54b05b1 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -50,7 +50,7 @@ struct atifs_ffp_desc struct atifs_private_data { - struct list fragment_shaders; /* A linked list to track fragment pipeline replacement shaders */ + hash_table_t *fragment_shaders; /* A hashtable to track fragment pipeline replacement shaders */ }; @@ -786,7 +786,7 @@ static void set_tex_op_atifs(DWORD state, IWineD3DStateBlockImpl *stateblock, Wi unsigned int i; gen_ffp_op(stateblock, &settings, TRUE); - desc = (struct atifs_ffp_desc *) find_ffp_shader(&priv->fragment_shaders, &settings); + desc = (struct atifs_ffp_desc *) find_ffp_shader(priv->fragment_shaders, &settings); if(!desc) { desc = HeapAlloc(GetProcessHeap(), 0, sizeof(*desc)); if(!desc) { @@ -801,7 +801,7 @@ static void set_tex_op_atifs(DWORD state, IWineD3DStateBlockImpl *stateblock, Wi memcpy(&desc->parent.settings, &settings, sizeof(settings)); desc->shader = gen_ati_shader(settings.op, &GLINFO_LOCATION); - add_ffp_shader(&priv->fragment_shaders, &desc->parent); + add_ffp_shader(priv->fragment_shaders, &desc->parent); TRACE("Allocated fixed function replacement shader descriptor %p\n", desc); } @@ -1036,26 +1036,28 @@ static HRESULT atifs_alloc(IWineD3DDevice *iface) { return E_OUTOFMEMORY; } priv = (struct atifs_private_data *) This->fragment_priv; - list_init(&priv->fragment_shaders); + priv->fragment_shaders = hash_table_create(ffp_program_key_hash, ffp_program_key_compare); return WINED3D_OK; } #define GLINFO_LOCATION This->adapter->gl_info +static void atifs_free_ffpshader(void *value, void *device) { + IWineD3DDeviceImpl *This = device; + struct atifs_ffp_desc *entry_ati = value; + + ENTER_GL(); + GL_EXTCALL(glDeleteFragmentShaderATI(entry_ati->shader)); + checkGLcall("glDeleteFragmentShaderATI(entry->shader)"); + HeapFree(GetProcessHeap(), 0, entry_ati); + LEAVE_GL(); +} + static void atifs_free(IWineD3DDevice *iface) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; struct atifs_private_data *priv = (struct atifs_private_data *) This->fragment_priv; - struct ffp_desc *entry, *entry2; - struct atifs_ffp_desc *entry_ati; - ENTER_GL(); - LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &priv->fragment_shaders, struct ffp_desc, entry) { - entry_ati = (struct atifs_ffp_desc *) entry; - GL_EXTCALL(glDeleteFragmentShaderATI(entry_ati->shader)); - checkGLcall("glDeleteFragmentShaderATI(entry->shader)"); - list_remove(&entry->entry); - HeapFree(GetProcessHeap(), 0, entry); - } - LEAVE_GL(); + hash_table_destroy(priv->fragment_shaders, atifs_free_ffpshader, This); + HeapFree(GetProcessHeap(), 0, priv); This->fragment_priv = NULL; } diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ce84ea7..80c4411 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3527,7 +3527,7 @@ static void shader_glsl_free(IWineD3DDevice *iface) { GL_EXTCALL(glDeleteObjectARB(priv->depth_blt_glsl_program_id)); } - hash_table_destroy(priv->glsl_program_lookup); + hash_table_destroy(priv->glsl_program_lookup, NULL, NULL); HeapFree(GetProcessHeap(), 0, This->shader_priv); This->shader_priv = NULL; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 4398724..a9fc780 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1576,12 +1576,15 @@ hash_table_t *hash_table_create(hash_function_t *hash_function, compare_function return table; } -void hash_table_destroy(hash_table_t *table) +void hash_table_destroy(hash_table_t *table, void (*free_value)(void *value, void *cb), void *cb) { unsigned int i = 0; for (i = 0; i < table->entry_count; ++i) { + if(free_value) { + free_value(table->entries[i].value, cb); + } HeapFree(GetProcessHeap(), 0, table->entries[i].key); } @@ -1953,26 +1956,18 @@ void gen_ffp_op(IWineD3DStateBlockImpl *stateblock, struct ffp_settings *setting } #undef GLINFO_LOCATION -struct ffp_desc *find_ffp_shader(struct list *shaders, struct ffp_settings *settings) +struct ffp_desc *find_ffp_shader(hash_table_t *fragment_shaders, struct ffp_settings *settings) { - struct ffp_desc *entry; + return (struct ffp_desc *)hash_table_get(fragment_shaders, settings);} - /* TODO: Optimize this. Finding the shader can be optimized by e.g. sorting the list, - * or maybe consider using hashtables +void add_ffp_shader(hash_table_t *shaders, struct ffp_desc *desc) { + struct ffp_settings *key = HeapAlloc(GetProcessHeap(), 0, sizeof(*key)); + /* Note that the key is the implementation independent part of the ffp_desc structure, + * whereas desc points to an extended structure with implementation specific parts. + * Make a copy of the key because hash_table_put takes ownership of it */ - LIST_FOR_EACH_ENTRY(entry, shaders, struct ffp_desc, entry) { - if(memcmp(settings, &entry->settings, sizeof(*settings)) == 0) { - TRACE("Found shader entry %p\n", entry); - return entry; - } - } - - TRACE("Shader not found\n"); - return NULL; -} - -void add_ffp_shader(struct list *shaders, struct ffp_desc *desc) { - list_add_head(shaders, &desc->entry); + *key = desc->settings; + hash_table_put(shaders, key, desc); } /* Activates the texture dimension according to the bound D3D texture. @@ -2069,3 +2064,36 @@ void sampler_texdim(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DCont texture_activate_dimensions(sampler, stateblock, context); } #undef GLINFO_LOCATION + +unsigned int ffp_program_key_hash(void *key) { + struct ffp_settings *k = (struct ffp_settings *)key; + unsigned int hash = 0, i; + DWORD *blob; + + /* This takes the texture op settings of stage 0 and 1 into account. + * how exactly depends on the memory laybout of the compiler, but it + * should not matter too much. Stages > 1 are used rarely, so there's + * no need to process them. Even if they're used it is likely that + * the ffp setup has distinct stage 0 and 1 settings. + */ + for(i = 0; i < 2; i++) { + blob = (DWORD *) &k->op[i]; + hash ^= blob[0] ^ blob[1]; + } + + hash += ~(hash << 15); + hash ^= (hash >> 10); + hash += (hash << 3); + hash ^= (hash >> 6); + hash += ~(hash << 11); + hash ^= (hash >> 16); + + return hash; +} + +BOOL ffp_program_key_compare(void *keya, void *keyb) { + struct ffp_settings *ka = (struct ffp_settings *)keya; + struct ffp_settings *kb = (struct ffp_settings *)keyb; + + return memcmp(ka, kb, sizeof(*ka)) == 0; +} diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 66e5a32..5b19acc 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -68,7 +68,7 @@ typedef struct { } hash_table_t; hash_table_t *hash_table_create(hash_function_t *hash_function, compare_function_t *compare_function); -void hash_table_destroy(hash_table_t *table); +void hash_table_destroy(hash_table_t *table, void (*free_value)(void *value, void *cb), void *cb); void *hash_table_get(hash_table_t *table, void *key); void hash_table_put(hash_table_t *table, void *key, void *value); void hash_table_remove(hash_table_t *table, void *key); @@ -761,12 +761,13 @@ struct ffp_settings { struct ffp_desc { struct ffp_settings settings; - struct list entry; }; void gen_ffp_op(IWineD3DStateBlockImpl *stateblock, struct ffp_settings *settings, BOOL ignore_textype); -struct ffp_desc *find_ffp_shader(struct list *shaders, struct ffp_settings *settings); -void add_ffp_shader(struct list *shaders, struct ffp_desc *desc); +struct ffp_desc *find_ffp_shader(hash_table_t *fragment_shaders, struct ffp_settings *settings); +void add_ffp_shader(hash_table_t *shaders, struct ffp_desc *desc); +BOOL ffp_program_key_compare(void *keya, void *keyb); +unsigned int ffp_program_key_hash(void *key); /***************************************************************************** * IWineD3D implementation structure

1 0

Dylan Smith : richedit: Added OleInitialize for clipboard operations.
by Alexandre Julliard 31 Jul '08

31 Jul '08

Module: wine Branch: master Commit: edb63043798019d8632b46af540cb435122e5d52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=edb63043798019d8632b46af5… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Jul 30 10:09:14 2008 -0400 richedit: Added OleInitialize for clipboard operations. --- dlls/riched20/editor.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index c747c31..db9728c 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1814,6 +1814,8 @@ ME_TextEditor *ME_MakeEditor(HWND hWnd) { ed->vert_si.nPage = 0; ed->vert_si.nPos = 0; + OleInitialize(NULL); + return ed; } @@ -1882,6 +1884,7 @@ void ME_DestroyEditor(ME_TextEditor *editor) DeleteObject(editor->hbrBackground); if(editor->lpOleCallback) IUnknown_Release(editor->lpOleCallback); + OleUninitialize(); FREE_OBJ(editor->pBuffer); FREE_OBJ(editor->pCursors);

1 0

Stefan Dösinger : wined3d: Use C bitfields to compact the ffp description.
by Alexandre Julliard 31 Jul '08

31 Jul '08

Module: wine Branch: master Commit: d4d133f032389f54a45e6c8397a932f0ac47b432 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4d133f032389f54a45e6c839… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 30 10:57:32 2008 -0500 wined3d: Use C bitfields to compact the ffp description. --- dlls/wined3d/ati_fragment_shader.c | 4 +- dlls/wined3d/utils.c | 117 +++++++++++++++++++++++------------- dlls/wined3d/wined3d_private.h | 33 +++++++--- 3 files changed, 101 insertions(+), 53 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d4d133f032389f54a45e6…

1 0

Alexandre Julliard : user32: Add an entry point for ShowWindow to the driver interface.
by Alexandre Julliard 31 Jul '08

31 Jul '08

Module: wine Branch: master Commit: 4c431197ca99557cf23a5fcd59ef88ccc9c5b401 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c431197ca99557cf23a5fcd5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 30 16:13:28 2008 +0200 user32: Add an entry point for ShowWindow to the driver interface. --- dlls/user32/driver.c | 13 +++++++++++++ dlls/user32/user_private.h | 1 + dlls/user32/winpos.c | 2 ++ 3 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 7daffd9..c4522eb 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -119,6 +119,7 @@ static const USER_DRIVER *load_driver(void) GET_USER_FUNC(SetWindowIcon); GET_USER_FUNC(SetWindowStyle); GET_USER_FUNC(SetWindowText); + GET_USER_FUNC(ShowWindow); GET_USER_FUNC(SysCommand); GET_USER_FUNC(WindowMessage); GET_USER_FUNC(WindowPosChanging); @@ -395,6 +396,11 @@ static void nulldrv_SetWindowText( HWND hwnd, LPCWSTR text ) { } +static UINT nulldrv_ShowWindow( HWND hwnd, INT cmd, RECT *rect, UINT swp ) +{ + return swp; +} + static LRESULT nulldrv_SysCommand( HWND hwnd, WPARAM wparam, LPARAM lparam ) { return -1; @@ -472,6 +478,7 @@ static USER_DRIVER null_driver = nulldrv_SetWindowIcon, nulldrv_SetWindowStyle, nulldrv_SetWindowText, + nulldrv_ShowWindow, nulldrv_SysCommand, nulldrv_WindowMessage, nulldrv_WindowPosChanging, @@ -726,6 +733,11 @@ static void loaderdrv_SetWindowText( HWND hwnd, LPCWSTR text ) load_driver()->pSetWindowText( hwnd, text ); } +static UINT loaderdrv_ShowWindow( HWND hwnd, INT cmd, RECT *rect, UINT swp ) +{ + return load_driver()->pShowWindow( hwnd, cmd, rect, swp ); +} + static LRESULT loaderdrv_SysCommand( HWND hwnd, WPARAM wparam, LPARAM lparam ) { return load_driver()->pSysCommand( hwnd, wparam, lparam ); @@ -807,6 +819,7 @@ static USER_DRIVER lazy_load_driver = loaderdrv_SetWindowIcon, loaderdrv_SetWindowStyle, loaderdrv_SetWindowText, + loaderdrv_ShowWindow, loaderdrv_SysCommand, loaderdrv_WindowMessage, loaderdrv_WindowPosChanging, diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index fc5a16d..909686d 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -155,6 +155,7 @@ typedef struct tagUSER_DRIVER { void (*pSetWindowIcon)(HWND,UINT,HICON); void (*pSetWindowStyle)(HWND,DWORD); void (*pSetWindowText)(HWND,LPCWSTR); + UINT (*pShowWindow)(HWND,INT,RECT*,UINT); LRESULT (*pSysCommand)(HWND,WPARAM,LPARAM); LRESULT (*pWindowMessage)(HWND,UINT,WPARAM,LPARAM); void (*pWindowPosChanging)(HWND,HWND,UINT,const RECT *,const RECT *,RECT *); diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index fed65e9..2bbaab9 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1046,6 +1046,8 @@ static BOOL show_window( HWND hwnd, INT cmd ) if (!IsWindow( hwnd )) return wasVisible; } + swp = USER_Driver->pShowWindow( hwnd, cmd, &newPos, swp ); + parent = GetAncestor( hwnd, GA_PARENT ); if (parent && !IsWindowVisible( parent ) && !(swp & SWP_STATECHANGED)) {

1 0