wine-commits January 2012

wine-commits@winehq.org

2 participants
972 discussions

Aric Stewart : usp10: Implement ScriptGetFontFeatureTags.
by Alexandre Julliard 03 Jan '12

03 Jan '12

Module: wine Branch: master Commit: 3d98085d65cbc63fb0cc118acce2c3df1f204a33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d98085d65cbc63fb0cc118ac… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jan 3 06:51:23 2012 -0600 usp10: Implement ScriptGetFontFeatureTags. --- dlls/usp10/shape.c | 130 +++++++++++++++++++++++++++++++++++++++++++ dlls/usp10/tests/usp10.c | 36 +++++++++++- dlls/usp10/usp10.c | 14 +++++ dlls/usp10/usp10.spec | 2 +- dlls/usp10/usp10_internal.h | 3 + 5 files changed, 182 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3d98085d65cbc63fb0cc1…

1 0

Aric Stewart : usp10: Convert tag in LoadedFeature to OPENTYPE_TAG.
by Alexandre Julliard 03 Jan '12

03 Jan '12

Module: wine Branch: master Commit: dbe02b96c5686bb92ac42a22c440b32929d51804 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbe02b96c5686bb92ac42a22c… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jan 3 06:51:20 2012 -0600 usp10: Convert tag in LoadedFeature to OPENTYPE_TAG. --- dlls/usp10/shape.c | 4 ++-- dlls/usp10/usp10_internal.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 0596f99..ed9b477 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -1188,7 +1188,7 @@ static LPCVOID load_GSUB_feature(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache *psc for (i = 0; i < psc->feature_count; i++) { - if (strncmp(psc->features[i].tag,feat,4)==0 && psc->features[i].script == script) + if (psc->features[i].tag == MS_MAKE_TAG(feat[0],feat[1],feat[2],feat[3])&& psc->features[i].script == script) return psc->features[i].feature; } @@ -1231,7 +1231,7 @@ static LPCVOID load_GSUB_feature(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache *psc else psc->features = HeapAlloc(GetProcessHeap(), 0, psc->feature_count * sizeof(LoadedFeature)); - lstrcpynA(psc->features[psc->feature_count - 1].tag, feat, 5); + psc->features[psc->feature_count - 1].tag = MS_MAKE_TAG(feat[0],feat[1],feat[2],feat[3]); psc->features[psc->feature_count - 1].script = script; psc->features[psc->feature_count - 1].feature = feature; return feature; diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index 9eb6801..62307a5 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -126,7 +126,7 @@ #define GLYPH_MAX 65536 typedef struct { - char tag[5]; + OPENTYPE_TAG tag; OPENTYPE_TAG script; LPCVOID feature; } LoadedFeature;

1 0

Aric Stewart : usp10: Replace GSUB_get_lang_table with GSUB_GetFontLanguageTags.
by Alexandre Julliard 03 Jan '12

03 Jan '12

Module: wine Branch: master Commit: f07321a82ba088ce50d01451e04a57480defc3e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f07321a82ba088ce50d01451e… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jan 3 06:51:16 2012 -0600 usp10: Replace GSUB_get_lang_table with GSUB_GetFontLanguageTags. --- dlls/usp10/shape.c | 56 ++++++++++----------------------------------------- 1 files changed, 11 insertions(+), 45 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 0c59df0..0596f99 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -348,6 +348,7 @@ typedef struct { static INT GSUB_apply_lookup(const GSUB_LookupList* lookup, INT lookup_index, WORD *glyphs, INT glyph_index, INT write_dir, INT *glyph_count); static HRESULT GSUB_GetFontScriptTags(ScriptCache *psc, OPENTYPE_TAG searchingFor, int cMaxTags, OPENTYPE_TAG *pScriptTags, int *pcTags, LPCVOID* script_table); +static HRESULT GSUB_GetFontLanguageTags(ScriptCache *psc, OPENTYPE_TAG script_tag, OPENTYPE_TAG searchingFor, int cMaxTags, OPENTYPE_TAG *pLanguageTags, int *pcTags, LPCVOID* language_table); typedef struct tagVowelComponents { @@ -766,31 +767,6 @@ static INT GSUB_is_glyph_covered(LPCVOID table , UINT glyph) return -1; } -static const GSUB_LangSys* GSUB_get_lang_table( const GSUB_Script* script, const char* tag) -{ - int i; - int offset; - const GSUB_LangSys *Lang; - - TRACE("Deflang %x, LangCount %i\n",GET_BE_WORD(script->DefaultLangSys), GET_BE_WORD(script->LangSysCount)); - - for (i = 0; i < GET_BE_WORD(script->LangSysCount) ; i++) - { - offset = GET_BE_WORD(script->LangSysRecord[i].LangSys); - Lang = (const GSUB_LangSys*)((const BYTE*)script + offset); - - if ( strncmp(script->LangSysRecord[i].LangSysTag,tag,4)==0) - return Lang; - } - offset = GET_BE_WORD(script->DefaultLangSys); - if (offset) - { - Lang = (const GSUB_LangSys*)((const BYTE*)script + offset); - return Lang; - } - return NULL; -} - static const GSUB_Feature * GSUB_get_feature(const GSUB_Header *header, const GSUB_LangSys *lang, const char* tag) { int i; @@ -1220,39 +1196,29 @@ static LPCVOID load_GSUB_feature(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache *psc if (psc->GSUB_Table) { - const GSUB_Script *script = NULL; - const GSUB_LangSys *language; + const GSUB_LangSys *language = NULL; int attempt = 2; OPENTYPE_TAG scriptTags; int cTags; - HRESULT hr; do { - hr = GSUB_GetFontScriptTags(psc, get_opentype_script(hdc,psa,psc,(attempt==2)), 1, &scriptTags, &cTags, (LPCVOID*)&script); + if (psc->userLang != 0) + GSUB_GetFontLanguageTags(psc, get_opentype_script(hdc,psa,psc,(attempt==2)), psc->userLang, 1, &scriptTags, &cTags, (LPCVOID*)&language); + else + GSUB_GetFontLanguageTags(psc, get_opentype_script(hdc,psa,psc,(attempt==2)), MS_MAKE_TAG('x','x','x','x'), 1, &scriptTags, &cTags, (LPCVOID*)&language); /* Need to get Lang tag */ attempt--; - if (SUCCEEDED(hr) && cTags && script) - { - if (psc->userLang != 0) - language = GSUB_get_lang_table(script,(char*)&psc->userLang); - else - language = GSUB_get_lang_table(script, "xxxx"); /* Need to get Lang tag */ - if (language) - feature = GSUB_get_feature(psc->GSUB_Table, language, feat); - } + if (language) + feature = GSUB_get_feature(psc->GSUB_Table, language, feat); } while(attempt && !feature); /* try in the default (latin) table */ if (!feature) { - hr = GSUB_GetFontScriptTags(psc, MS_MAKE_TAG('l','a','t','n'), 1, &scriptTags, &cTags, (LPCVOID*)&script); - if (SUCCEEDED(hr) && script) - { - language = GSUB_get_lang_table(script, "xxxx"); /* Need to get Lang tag */ - if (language) - feature = GSUB_get_feature(psc->GSUB_Table, language, feat); - } + GSUB_GetFontLanguageTags(psc, MS_MAKE_TAG('l','a','t','n'), MS_MAKE_TAG('x','x','x','x'), 1, &scriptTags, &cTags, (LPCVOID*)&language); /* Need to get Lang tag */ + if (language) + feature = GSUB_get_feature(psc->GSUB_Table, language, feat); } }

1 0

Aric Stewart : usp10: Implement ScriptGetFontLanguageTags.
by Alexandre Julliard 03 Jan '12

03 Jan '12

Module: wine Branch: master Commit: 0661d2d202ef00319cffb2dafec9fbe8df64e8c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0661d2d202ef00319cffb2daf… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jan 3 06:51:07 2012 -0600 usp10: Implement ScriptGetFontLanguageTags. --- dlls/usp10/shape.c | 121 ++++++++++++++++++++++++++++++++++++++++++- dlls/usp10/tests/usp10.c | 37 ++++++++++++- dlls/usp10/usp10.c | 11 ++++ dlls/usp10/usp10.spec | 2 +- dlls/usp10/usp10_internal.h | 9 +++ 5 files changed, 176 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0661d2d202ef00319cffb…

1 0

Alistair Leslie-Hughes : mscoree: Implement CLRRuntimeHost_ExecuteInDefaultAppDomain.
by Alexandre Julliard 03 Jan '12

03 Jan '12

Module: wine Branch: master Commit: acaa258054ab2a79efcb2b99595ab6a771401288 URL: http://source.winehq.org/git/wine.git/?a=commit;h=acaa258054ab2a79efcb2b995… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Dec 16 09:15:11 2011 +1100 mscoree: Implement CLRRuntimeHost_ExecuteInDefaultAppDomain. --- dlls/mscoree/corruntimehost.c | 83 +++++++++++++++++++++++++++++++++++++++- dlls/mscoree/metahost.c | 1 + dlls/mscoree/mscoree_private.h | 2 + 3 files changed, 84 insertions(+), 2 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index b7e4f5f..04482be 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -534,9 +534,88 @@ static HRESULT WINAPI CLRRuntimeHost_ExecuteInDefaultAppDomain(ICLRRuntimeHost* LPCWSTR pwzAssemblyPath, LPCWSTR pwzTypeName, LPCWSTR pwzMethodName, LPCWSTR pwzArgument, DWORD *pReturnValue) { - FIXME("(%p,%s,%s,%s,%s)\n", iface, debugstr_w(pwzAssemblyPath), + RuntimeHost *This = impl_from_ICLRRuntimeHost( iface ); + HRESULT hr; + MonoDomain *domain; + MonoAssembly *assembly; + MonoImage *image; + MonoClass *klass; + MonoMethod *method; + MonoObject *result; + MonoString *str; + void *args[2]; + char *filenameA = NULL, *classA = NULL, *methodA = NULL; + char *argsA = NULL, *ns; + + TRACE("(%p,%s,%s,%s,%s)\n", iface, debugstr_w(pwzAssemblyPath), debugstr_w(pwzTypeName), debugstr_w(pwzMethodName), debugstr_w(pwzArgument)); - return E_NOTIMPL; + + hr = RuntimeHost_GetDefaultDomain(This, &domain); + if(hr != S_OK) + { + ERR("Couldn't get Default Domain\n"); + return hr; + } + + hr = E_FAIL; + + filenameA = WtoA(pwzAssemblyPath); + assembly = This->mono->mono_domain_assembly_open(domain, filenameA); + if (!assembly) + { + ERR("Cannot open assembly %s\n", filenameA); + goto cleanup; + } + + image = This->mono->mono_assembly_get_image(assembly); + if (!image) + { + ERR("Couldn't get assembly image\n"); + goto cleanup; + } + + classA = WtoA(pwzTypeName); + ns = strrchr(classA, '.'); + *ns = '\0'; + klass = This->mono->mono_class_from_name(image, classA, ns+1); + if (!klass) + { + ERR("Couldn't get class from image\n"); + goto cleanup; + } + + methodA = WtoA(pwzMethodName); + method = This->mono->mono_class_get_method_from_name(klass, methodA, 1); + if (!method) + { + ERR("Couldn't get method from class\n"); + goto cleanup; + } + + argsA = WtoA(pwzArgument); + str = This->mono->mono_string_new(domain, argsA); + args[0] = &str; + args[1] = NULL; + result = This->mono->mono_runtime_invoke(method, NULL, args, NULL); + if (!result) + ERR("Couldn't get result pointer\n"); + else + { + *pReturnValue = *(DWORD*)This->mono->mono_object_unbox(result); + hr = S_OK; + } + +cleanup: + if(filenameA) + HeapFree(GetProcessHeap(), 0, filenameA); + if(classA) + HeapFree(GetProcessHeap(), 0, classA); + if(argsA) + HeapFree(GetProcessHeap(), 0, argsA); + if(methodA) + HeapFree(GetProcessHeap(), 0, methodA); + + return hr; } static const struct ICLRRuntimeHostVtbl CLRHostVtbl = diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index d9e36a8..454a653 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -185,6 +185,7 @@ static HRESULT load_mono(CLRRuntimeInfo *This, loaded_mono **result) LOAD_MONO_FUNCTION(mono_runtime_quit); LOAD_MONO_FUNCTION(mono_set_dirs); LOAD_MONO_FUNCTION(mono_stringify_assembly_name); + LOAD_MONO_FUNCTION(mono_string_new); /* GLib imports obsoleted by the 2.0 ABI */ if (This->mono_abi_version == 1) diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 71bf738..a45a405 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -41,6 +41,7 @@ typedef struct _MonoType MonoType; typedef struct _MonoImage MonoImage; typedef struct _MonoClass MonoClass; typedef struct _MonoObject MonoObject; +typedef struct _MonoString MonoString; typedef struct _MonoMethod MonoMethod; typedef struct _MonoProfiler MonoProfiler; @@ -161,6 +162,7 @@ struct loaded_mono void (CDECL *mono_thread_pool_cleanup)(void); void (CDECL *mono_thread_suspend_all_other_threads)(void); void (CDECL *mono_threads_set_shutting_down)(void); + MonoString* (CDECL *mono_string_new)(MonoDomain *domain, const char *str); }; /* loaded runtime interfaces */

1 0

Michael Stefaniuc : ddraw: Fix two memory leaks (Smatch).
by Alexandre Julliard 03 Jan '12

03 Jan '12

Module: wine Branch: master Commit: f1f5536d8ffdd9bd2f8caf5fc5931dea9bfc28a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1f5536d8ffdd9bd2f8caf5fc… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 2 22:27:07 2012 +0100 ddraw: Fix two memory leaks (Smatch). --- dlls/ddraw/surface.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index d110acc..2f92edf 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1353,6 +1353,7 @@ static HRESULT ddraw_surface_blt_clipped(IDirectDrawSurfaceImpl *dst_surface, co &dst_rect, clip_list, &clip_list_size))) { WARN("Failed to get clip list, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, clip_list); return hr; } @@ -1386,6 +1387,7 @@ static HRESULT ddraw_surface_blt_clipped(IDirectDrawSurfaceImpl *dst_surface, co } } + HeapFree(GetProcessHeap(), 0, clip_list); return hr; }

1 0

Michael Stefaniuc : jscript: Remove break after return (Smatch).
by Alexandre Julliard 03 Jan '12

03 Jan '12

Module: wine Branch: master Commit: 158c8b76cbb6e216589ddb5027d8d2e217d51437 URL: http://source.winehq.org/git/wine.git/?a=commit;h=158c8b76cbb6e216589ddb502… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 2 22:23:48 2012 +0100 jscript: Remove break after return (Smatch). --- dlls/jscript/jsutils.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 2463a0b..b145d8a 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -571,10 +571,8 @@ HRESULT to_string(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, BSTR *str) case VT_I4: *str = int_to_bstr(V_I4(v)); break; - case VT_R8: { + case VT_R8: return double_to_bstr(V_R8(v), str); - break; - } case VT_BSTR: *str = SysAllocString(V_BSTR(v)); break;

1 0

Marcus Meissner : gdi32: Check return value of REGION_UnionRectWithRegion ( Coverity).
by Alexandre Julliard 03 Jan '12

03 Jan '12

Module: wine Branch: master Commit: 15162ddf3c58ab33b7a5704bf0a2338648996ee8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15162ddf3c58ab33b7a5704bf… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Dec 31 16:21:48 2011 +0100 gdi32: Check return value of REGION_UnionRectWithRegion (Coverity). --- dlls/gdi32/region.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c index 4daf88c..66ca1c3 100644 --- a/dlls/gdi32/region.c +++ b/dlls/gdi32/region.c @@ -1271,11 +1271,12 @@ static BOOL REGION_UnionRectWithRegion(const RECT *rect, WINEREGION *rgn) BOOL add_rect_to_region( HRGN rgn, const RECT *rect ) { RGNOBJ *obj = GDI_GetObjPtr( rgn, OBJ_REGION ); + BOOL ret; if (!obj) return FALSE; - REGION_UnionRectWithRegion( rect, &obj->rgn ); + ret = REGION_UnionRectWithRegion( rect, &obj->rgn ); GDI_ReleaseObj( rgn ); - return TRUE; + return ret; } /***********************************************************************

1 0

Marcus Meissner : ws2_32: Removed dead code (Coverity).
by Alexandre Julliard 03 Jan '12

03 Jan '12

Module: wine Branch: master Commit: d34e0515fd320f48a1921dc968e1b576ef81a26d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d34e0515fd320f48a1921dc96… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Dec 31 15:12:41 2011 +0100 ws2_32: Removed dead code (Coverity). --- dlls/ws2_32/tests/sock.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 5677a2c..2905267 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5328,8 +5328,6 @@ static void test_completion_port(void) if (dest != INVALID_SOCKET) closesocket(dest); - if (src != INVALID_SOCKET) - closesocket(src); src = socket(AF_INET, SOCK_STREAM, 0);

1 0

Pierre Schweitzer : dplayx: Fix handle leak.
by Alexandre Julliard 03 Jan '12

03 Jan '12

Module: wine Branch: master Commit: 2d14f89fea8fa7d7819e5c22ace94dbf41411601 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d14f89fea8fa7d7819e5c22a… Author: Pierre Schweitzer <pierre(a)reactos.org> Date: Fri Dec 30 21:54:16 2011 +0100 dplayx: Fix handle leak. --- dlls/dplayx/dplayx_messages.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/dplayx/dplayx_messages.c b/dlls/dplayx/dplayx_messages.c index 2e34950..8b9320d 100644 --- a/dlls/dplayx/dplayx_messages.c +++ b/dlls/dplayx/dplayx_messages.c @@ -58,6 +58,7 @@ DWORD CreateLobbyMessageReceptionThread( HANDLE hNotifyEvent, HANDLE hStart, { DWORD dwMsgThreadId; LPMSGTHREADINFO lpThreadInfo; + HANDLE hThread; lpThreadInfo = HeapAlloc( GetProcessHeap(), 0, sizeof( *lpThreadInfo ) ); if( lpThreadInfo == NULL ) @@ -83,21 +84,20 @@ DWORD CreateLobbyMessageReceptionThread( HANDLE hNotifyEvent, HANDLE hStart, lpThreadInfo->hDeath = hDeath; lpThreadInfo->hSettingRead = hConnRead; - if( !CreateThread( NULL, /* Security attribs */ - 0, /* Stack */ - DPL_MSG_ThreadMain, /* Msg reception function */ - lpThreadInfo, /* Msg reception func parameter */ - 0, /* Flags */ - &dwMsgThreadId /* Updated with thread id */ - ) - ) + hThread = CreateThread( NULL, /* Security attribs */ + 0, /* Stack */ + DPL_MSG_ThreadMain, /* Msg reception function */ + lpThreadInfo, /* Msg reception func parameter */ + 0, /* Flags */ + &dwMsgThreadId /* Updated with thread id */ + ); + if ( hThread == NULL ) { ERR( "Unable to create msg thread\n" ); goto error; } - /* FIXME: Should I be closing the handle to the thread or does that - terminate the thread? */ + CloseHandle(hThread); return dwMsgThreadId;

1 0

← Newer
1
...
89
90
91
92
93
94
95
...
98
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2012