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

Aric Stewart : usp10: Properly handle fonts with scripts without a default language.
by Alexandre Julliard 11 Jun '12

11 Jun '12

Module: wine Branch: master Commit: 6c43ef46d85bb37de5ce65a8ae6634e891e5cb07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c43ef46d85bb37de5ce65a8a… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jun 11 07:15:11 2012 -0500 usp10: Properly handle fonts with scripts without a default language. --- dlls/usp10/opentype.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index 74046fd..1a5d3e4 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -924,10 +924,15 @@ static void GSUB_initialize_language_cache(LoadedScript *script) if (!script->language_count) { + DWORD offset; const GSUB_Script* table = script->table; script->language_count = GET_BE_WORD(table->LangSysCount); - script->default_language.tag = MS_MAKE_TAG('d','f','l','t'); - script->default_language.table = (const BYTE*)table + GET_BE_WORD(table->DefaultLangSys); + offset = GET_BE_WORD(table->DefaultLangSys); + if (offset) + { + script->default_language.tag = MS_MAKE_TAG('d','f','l','t'); + script->default_language.table = (const BYTE*)table + offset; + } if (script->language_count) {

1 0

Aric Stewart : usp10: Corrections for ShapeCharGlyphProp_Thai.
by Alexandre Julliard 11 Jun '12

11 Jun '12

Module: wine Branch: master Commit: f241014f46aedbae233409c4bfe0150d55c9e184 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f241014f46aedbae233409c4b… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jun 11 09:49:14 2012 -0500 usp10: Corrections for ShapeCharGlyphProp_Thai. --- dlls/usp10/shape.c | 32 ++++++++------------------------ 1 files changed, 8 insertions(+), 24 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index f2b41b1..36f6854 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -411,7 +411,7 @@ static const ScriptShapeData ShapingData[] = {{ tibetan_features, 2}, NULL, 0, NULL, ShapeCharGlyphProp_Tibet}, {{ phags_features, 3}, NULL, 0, ContextualShape_Phags_pa, ShapeCharGlyphProp_Thai}, {{ thai_features, 1}, NULL, 0, ContextualShape_Thai, ShapeCharGlyphProp_Thai}, - {{ thai_features, 1}, NULL, 0, ContextualShape_Thai, ShapeCharGlyphProp_Thai}, + {{ thai_features, 1}, NULL, 0, ContextualShape_Thai, NULL}, {{ thai_features, 1}, required_lao_features, 0, ContextualShape_Lao, ShapeCharGlyphProp_Thai}, {{ thai_features, 1}, required_lao_features, 0, ContextualShape_Lao, ShapeCharGlyphProp_Thai}, {{ devanagari_features, 6}, required_devanagari_features, MS_MAKE_TAG('d','e','v','2'), ContextualShape_Devanagari, ShapeCharGlyphProp_Devanagari}, @@ -2838,13 +2838,9 @@ static void ShapeCharGlyphProp_Arabic( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSI static void ShapeCharGlyphProp_Thai( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD *pwLogClust, SCRIPT_CHARPROP *pCharProp, SCRIPT_GLYPHPROP *pGlyphProp ) { - int i,k; + int i; int finaGlyph; INT dirL; - BYTE *spaces; - - spaces = HeapAlloc(GetProcessHeap(),0,cGlyphs); - memset(spaces,0,cGlyphs); if (!psa->fLogicalOrder && psa->fRTL) { @@ -2857,20 +2853,11 @@ static void ShapeCharGlyphProp_Thai( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS dirL = 1; } - for (i = 0; i < cGlyphs; i++) - { - for (k = 0; k < cChars; k++) - if (pwLogClust[k] == i) - { - if (pwcChars[k] == 0x0020) - spaces[i] = 1; - } - } - OpenType_GDEF_UpdateGlyphProps(hdc, psc, pwGlyphs, cGlyphs, pwLogClust, cChars, pGlyphProp); for (i = 0; i < cGlyphs; i++) { + int k; int char_index[20]; int char_count = 0; @@ -2881,25 +2868,22 @@ static void ShapeCharGlyphProp_Thai( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS char_index[char_count++] = k; } + if (i == finaGlyph) + pGlyphProp[i].sva.uJustification = SCRIPT_JUSTIFY_NONE; + else + pGlyphProp[i].sva.uJustification = SCRIPT_JUSTIFY_CHARACTER; + if (char_count == 0) continue; if (char_count ==1 && pwcChars[char_index[0]] == 0x0020) /* space */ - { - pGlyphProp[i].sva.uJustification = SCRIPT_JUSTIFY_CHARACTER; pCharProp[char_index[0]].fCanGlyphAlone = 1; - } - else if (i == finaGlyph) - pGlyphProp[i].sva.uJustification = SCRIPT_JUSTIFY_NONE; - else - pGlyphProp[i].sva.uJustification = SCRIPT_JUSTIFY_CHARACTER; /* handle Thai SARA AM (U+0E33) differently than GDEF */ if (char_count == 1 && pwcChars[char_index[0]] == 0x0e33) pGlyphProp[i].sva.fClusterStart = 0; } - HeapFree(GetProcessHeap(),0,spaces); UpdateClustersFromGlyphProp(cGlyphs, cChars, pwLogClust, pGlyphProp); /* Do not allow justification between marks and their base */

1 0

Jacek Caban : urlmon: Use error dialog for ERROR_INTERNET_SEC_CERT_REV_FAILED error if IHttpSecurity returns S_FALSE .
by Alexandre Julliard 11 Jun '12

11 Jun '12

Module: wine Branch: master Commit: 9af95b32433f2227c3d62b70dc7740a5fa0b81cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=9af95b32433f2227c3d62b70d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 11 16:14:45 2012 +0200 urlmon: Use error dialog for ERROR_INTERNET_SEC_CERT_REV_FAILED error if IHttpSecurity returns S_FALSE. --- dlls/urlmon/http.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/urlmon/http.c b/dlls/urlmon/http.c index d5f2b33..c67d36e 100644 --- a/dlls/urlmon/http.c +++ b/dlls/urlmon/http.c @@ -129,6 +129,8 @@ static HRESULT handle_http_error(HttpProtocol *This, DWORD error) DWORD res; HRESULT hres; + TRACE("(%p %u)\n", This, error); + switch(error) { case ERROR_INTERNET_SEC_CERT_DATE_INVALID: case ERROR_INTERNET_SEC_CERT_CN_INVALID: @@ -162,6 +164,8 @@ static HRESULT handle_http_error(HttpProtocol *This, DWORD error) hres = IHttpSecurity_OnSecurityProblem(http_security, error); IHttpSecurity_Release(http_security); + TRACE("OnSecurityProblem returned %08x\n", hres); + if(hres != S_FALSE) { BOOL res = FALSE; @@ -195,15 +199,13 @@ static HRESULT handle_http_error(HttpProtocol *This, DWORD error) switch(error) { case ERROR_INTERNET_SEC_CERT_REV_FAILED: - if(hres == S_FALSE) { - hres = internet_error_to_hres(error); - }else { + if(hres != S_FALSE) { /* Silently ignore the error. We will get more detailed error from wininet anyway. */ set_security_flag(This, SECURITY_FLAG_IGNORE_REVOCATION); hres = RPC_E_RETRY; + break; } - break; - + /* fallthrough */ default: hres = IServiceProvider_QueryService(serv_prov, &IID_IWindowForBindingUI, &IID_IWindowForBindingUI, (void**)&wfb_ui); if(SUCCEEDED(hres)) {

1 0

Jacek Caban : mshtml: Wine Gecko 1.6 release.
by Alexandre Julliard 11 Jun '12

11 Jun '12

Module: wine Branch: master Commit: 9fa443dcd9d16265a2d2b41441cea17c3c07e782 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fa443dcd9d16265a2d2b4144… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 11 15:32:18 2012 +0200 mshtml: Wine Gecko 1.6 release. --- dlls/appwiz.cpl/addons.c | 6 ++-- dlls/mshtml/htmlelem.c | 26 ++----------- dlls/mshtml/htmlnode.c | 2 +- dlls/mshtml/nsiface.idl | 90 ++++++++++++++++++++++----------------------- 4 files changed, 52 insertions(+), 72 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9fa443dcd9d16265a2d2b…

1 0

Hans Leidekker : msi: Add support for 64-bit registry components.
by Alexandre Julliard 11 Jun '12

11 Jun '12

Module: wine Branch: master Commit: f0ea60049c4c0a484f7006a14ca3375cb0fd9260 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0ea60049c4c0a484f7006a14… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jun 11 15:36:03 2012 +0200 msi: Add support for 64-bit registry components. --- dlls/msi/action.c | 30 +++++++--- dlls/msi/msi_main.c | 1 + dlls/msi/msipriv.h | 1 + dlls/msi/package.c | 2 - dlls/msi/tests/install.c | 140 ++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 162 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f0ea60049c4c0a484f700…

1 0

Hans Leidekker : msi: Ignore the value if a registry value name is special.
by Alexandre Julliard 11 Jun '12

11 Jun '12

Module: wine Branch: master Commit: fd0c2dabdf1818efcd2e0fc05b70e628227145c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd0c2dabdf1818efcd2e0fc05… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jun 11 15:36:22 2012 +0200 msi: Ignore the value if a registry value name is special. --- dlls/msi/action.c | 43 +++++++++++++++++++------------------------ 1 files changed, 19 insertions(+), 24 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 17e8696..5ba7ec3 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2390,13 +2390,17 @@ static UINT ACTION_CostFinalize(MSIPACKAGE *package) return MSI_SetFeatureStates(package); } -/* OK this value is "interpreted" and then formatted based on the - first few characters */ -static LPSTR parse_value(MSIPACKAGE *package, LPCWSTR value, DWORD *type, - DWORD *size) +static LPSTR parse_value(MSIPACKAGE *package, LPCWSTR value, DWORD *type, DWORD *size) { LPSTR data = NULL; + if (!value) + { + data = (LPSTR)strdupW(szEmpty); + *size = sizeof(szEmpty); + *type = REG_SZ; + return data; + } if (value[0]=='#' && value[1]!='#' && value[1]!='%') { if (value[1]=='x') @@ -2578,19 +2582,19 @@ static WCHAR *get_keypath( MSICOMPONENT *comp, HKEY root, const WCHAR *path ) return strdupW( path ); } -static BOOL is_special_entry( const WCHAR *name, const WCHAR *value ) +static BOOL is_special_entry( const WCHAR *name ) { - return (name && (name[0] == '*' || name[0] == '+') && !name[1] && !value); + return (name && (name[0] == '*' || name[0] == '+') && !name[1]); } static UINT ITERATE_WriteRegistryValues(MSIRECORD *row, LPVOID param) { MSIPACKAGE *package = param; - LPSTR value_data = NULL; + LPSTR value; HKEY root_key, hkey; DWORD type,size; LPWSTR deformated, uikey, keypath; - LPCWSTR szRoot, component, name, key, value; + LPCWSTR szRoot, component, name, key; MSICOMPONENT *comp; MSIRECORD * uirow; INT root; @@ -2643,25 +2647,16 @@ static UINT ITERATE_WriteRegistryValues(MSIRECORD *row, LPVOID param) msi_free(keypath); return ERROR_SUCCESS; } - - value = MSI_RecordGetString(row,5); - if (value) - value_data = parse_value(package, value, &type, &size); - else - { - value_data = (LPSTR)strdupW(szEmpty); - size = sizeof(szEmpty); - type = REG_SZ; - } - + value = parse_value(package, MSI_RecordGetString(row, 5), &type, &size); deformat_string(package, name, &deformated); - if (!is_special_entry( name , value )) + + if (!is_special_entry( name )) { if (!check_first) { TRACE("Setting value %s of %s\n", debugstr_w(deformated), debugstr_w(uikey)); - RegSetValueExW(hkey, deformated, 0, type, (LPBYTE)value_data, size); + RegSetValueExW(hkey, deformated, 0, type, (LPBYTE)value, size); } else { @@ -2677,7 +2672,7 @@ static UINT ITERATE_WriteRegistryValues(MSIRECORD *row, LPVOID param) TRACE("Checked and setting value %s of %s\n", debugstr_w(deformated), debugstr_w(uikey)); if (deformated || size) - RegSetValueExW(hkey, deformated, 0, type, (LPBYTE)value_data, size); + RegSetValueExW(hkey, deformated, 0, type, (LPBYTE)value, size); } } } @@ -2687,11 +2682,11 @@ static UINT ITERATE_WriteRegistryValues(MSIRECORD *row, LPVOID param) MSI_RecordSetStringW(uirow,2,deformated); MSI_RecordSetStringW(uirow,1,uikey); if (type == REG_SZ || type == REG_EXPAND_SZ) - MSI_RecordSetStringW(uirow,3,(LPWSTR)value_data); + MSI_RecordSetStringW(uirow, 3, (LPWSTR)value); msi_ui_actiondata( package, szWriteRegistryValues, uirow ); msiobj_release( &uirow->hdr ); - msi_free(value_data); + msi_free(value); msi_free(deformated); msi_free(uikey); msi_free(keypath);

1 0

Christian Costa : d3drm: Fix vertex index test and print a warning when it is out of range.
by Alexandre Julliard 11 Jun '12

11 Jun '12

Module: wine Branch: master Commit: 422d57e7d210f599f60c42de87c6759ef48323b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=422d57e7d210f599f60c42de8… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Jun 8 15:38:25 2012 +0200 d3drm: Fix vertex index test and print a warning when it is out of range. --- dlls/d3drm/meshbuilder.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index bdb5e00..1bb84c5 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -1366,8 +1366,11 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3* iface, LPDIRECTXFILEDATA pData) else { DWORD vertex_idx = *faces_vertex_idx_ptr; - if (vertex_idx > This->nb_vertices) + if (vertex_idx >= This->nb_vertices) + { + WARN("Found vertex index %u but only %u vertices available => use index 0\n", vertex_idx, This->nb_vertices); vertex_idx = 0; + } *(faces_data_ptr + faces_data_size++) = vertex_idx; /* Add face normal to vertex normal */ D3DRMVectorAdd(&This->pNormals[vertex_idx], &This->pNormals[vertex_idx], &face_normal);

1 0

Christian Costa : d3drm: Handle texture associated with the material when loading a mesh.
by Alexandre Julliard 11 Jun '12

11 Jun '12

Module: wine Branch: master Commit: 0023ddf1174af71701f66bd609119117d52d6869 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0023ddf1174af71701f66bd60… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Jun 8 15:38:34 2012 +0200 d3drm: Handle texture associated with the material when loading a mesh. --- dlls/d3drm/meshbuilder.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 57 insertions(+), 0 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 1bb84c5..56f53fd 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -1248,6 +1248,7 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3* iface, LPDIRECTXFILEDATA pData) LPDIRECTXFILEDATA data; LPDIRECTXFILEDATAREFERENCE reference; LPDIRECT3DRMMATERIAL2 material; + LPDIRECTXFILEOBJECT material_child; hr = IDirectXFileObject_QueryInterface(child, &IID_IDirectXFileData, (void **)&data); if (FAILED(hr)) @@ -1290,6 +1291,62 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3* iface, LPDIRECTXFILEDATA pData) This->material = material; + hr = IDirectXFileData_GetNextObject(data, &material_child); + if (hr == S_OK) + { + LPDIRECTXFILEDATA data; + LPDIRECT3DRMTEXTURE3 texture; + char** filename; + + hr = IDirectXFileObject_QueryInterface(material_child, &IID_IDirectXFileData, (void **)&data); + if (FAILED(hr)) + { + LPDIRECTXFILEDATAREFERENCE reference; + + hr = IDirectXFileObject_QueryInterface(material_child, &IID_IDirectXFileDataReference, (void **)&reference); + if (FAILED(hr)) + goto end; + + hr = IDirectXFileDataReference_Resolve(reference, &data); + IDirectXFileDataReference_Release(reference); + if (FAILED(hr)) + goto end; + } + + hr = IDirectXFileData_GetType(data, &pGuid); + if (hr != DXFILE_OK) + goto end; + if (!IsEqualGUID(pGuid, &TID_D3DRMTextureFilename)) + { + WARN("Not a texture filename\n"); + goto end; + } + + size = 4; + hr = IDirectXFileData_GetData(data, NULL, &size, (void**)&filename); + if (SUCCEEDED(hr)) + { + HANDLE file; + + file = CreateFileA(*filename, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); + if (file != INVALID_HANDLE_VALUE) + { + hr = Direct3DRMTexture_create(&IID_IDirect3DRMTexture3, (LPUNKNOWN*)&texture); + if (FAILED(hr)) + { + IDirectXFileData_Release(data); + goto end; + } + This->texture = texture; + } + } + } + else if (hr != DXFILEERR_NOMOREOBJECTS) + { + goto end; + } + hr = S_OK; + IDirectXFileData_Release(data); i++; }

1 0

Christian Costa : d3drm: Free texture object when releasing mesh builder object.
by Alexandre Julliard 11 Jun '12

11 Jun '12

Module: wine Branch: master Commit: a77fd778c2f3ead593f6a9d692a8032e0cb17699 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a77fd778c2f3ead593f6a9d69… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Jun 8 15:38:43 2012 +0200 d3drm: Free texture object when releasing mesh builder object. --- dlls/d3drm/meshbuilder.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 56f53fd..043f395 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -367,6 +367,8 @@ static ULONG WINAPI IDirect3DRMMeshBuilder2Impl_Release(IDirect3DRMMeshBuilder2* { if (This->material) IDirect3DRMMaterial2_Release(This->material); + if (This->texture) + IDirect3DRMTexture3_Release(This->texture); HeapFree(GetProcessHeap(), 0, This->name); HeapFree(GetProcessHeap(), 0, This->pVertices); HeapFree(GetProcessHeap(), 0, This->pNormals);

1 0

Christian Costa : d3drm: Free all mesh resources when releasing mesh object .
by Alexandre Julliard 11 Jun '12

11 Jun '12

Module: wine Branch: master Commit: 85f4fda840ff7a2bec3bf9112f76a60271d88be7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85f4fda840ff7a2bec3bf9112… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Jun 8 15:38:51 2012 +0200 d3drm: Free all mesh resources when releasing mesh object. --- dlls/d3drm/meshbuilder.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 043f395..c545e69 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -2491,7 +2491,14 @@ static ULONG WINAPI IDirect3DRMMeshImpl_Release(IDirect3DRMMesh* iface) int i; for (i = 0; i < This->nb_groups; i++) + { HeapFree(GetProcessHeap(), 0, This->groups[i].vertices); + HeapFree(GetProcessHeap(), 0, This->groups[i].face_data); + if (This->groups[i].material) + IDirect3DRMMaterial2_Release(This->groups[i].material); + if (This->groups[i].texture) + IDirect3DRMTexture3_Release(This->groups[i].texture); + } HeapFree(GetProcessHeap(), 0, This->groups); HeapFree(GetProcessHeap(), 0, This); }

1 0