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

Austin English : advapi32: Return success in RegisterTraceGuids.
by Alexandre Julliard 13 May '11

13 May '11

Module: wine Branch: master Commit: 8781b58ed92db1cf4d5fd3eff4b92ea294f1d758 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8781b58ed92db1cf4d5fd3eff… Author: Austin English <austinenglish(a)gmail.com> Date: Tue May 10 14:59:10 2011 -0500 advapi32: Return success in RegisterTraceGuids. --- dlls/advapi32/eventlog.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index ecc887e..2301502 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -750,10 +750,10 @@ ULONG WINAPI RegisterTraceGuidsW( WMIDPREQUEST RequestAddress, PTRACE_GUID_REGISTRATION TraceGuidReg, LPCWSTR MofImagePath, LPCWSTR MofResourceName, PTRACEHANDLE RegistrationHandle ) { - FIXME("(%p, %p, %s, %u, %p, %s, %s, %p,)\n", RequestAddress, RequestContext, + FIXME("(%p, %p, %s, %u, %p, %s, %s, %p,): stub\n", RequestAddress, RequestContext, debugstr_guid(ControlGuid), GuidCount, TraceGuidReg, debugstr_w(MofImagePath), debugstr_w(MofResourceName), RegistrationHandle); - return ERROR_CALL_NOT_IMPLEMENTED; + return ERROR_SUCCESS; } /****************************************************************************** @@ -769,10 +769,10 @@ ULONG WINAPI RegisterTraceGuidsA( WMIDPREQUEST RequestAddress, PTRACE_GUID_REGISTRATION TraceGuidReg, LPCSTR MofImagePath, LPCSTR MofResourceName, PTRACEHANDLE RegistrationHandle ) { - FIXME("(%p, %p, %s, %u, %p, %s, %s, %p,)\n", RequestAddress, RequestContext, + FIXME("(%p, %p, %s, %u, %p, %s, %s, %p,): stub\n", RequestAddress, RequestContext, debugstr_guid(ControlGuid), GuidCount, TraceGuidReg, debugstr_a(MofImagePath), debugstr_a(MofResourceName), RegistrationHandle); - return ERROR_CALL_NOT_IMPLEMENTED; + return ERROR_SUCCESS; } /******************************************************************************

1 0

Stefan Dösinger : wined3d: Make the glram parameter of WineD3DAdapterChangeGLRam signed.
by Alexandre Julliard 13 May '11

13 May '11

Module: wine Branch: master Commit: 682bae7c2b89edd658159ef152bc6d1d0dcba2cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=682bae7c2b89edd658159ef15… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 12 17:39:21 2011 +0200 wined3d: Make the glram parameter of WineD3DAdapterChangeGLRam signed. --- dlls/wined3d/directx.c | 2 +- dlls/wined3d/resource.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 8b486f8..7951d02 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -329,7 +329,7 @@ fail: } /* Adjust the amount of used texture memory */ -unsigned int WineD3DAdapterChangeGLRam(IWineD3DDeviceImpl *device, unsigned int glram) +unsigned int WineD3DAdapterChangeGLRam(IWineD3DDeviceImpl *device, int glram) { struct wined3d_adapter *adapter = device->adapter; diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 253fc52..583e56f 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -137,7 +137,7 @@ void resource_cleanup(struct wined3d_resource *resource) if (resource->pool == WINED3DPOOL_DEFAULT) { TRACE("Decrementing device memory pool by %u.\n", resource->size); - WineD3DAdapterChangeGLRam(resource->device, -resource->size); + WineD3DAdapterChangeGLRam(resource->device, 0 - resource->size); } LIST_FOR_EACH_SAFE(e1, e2, &resource->privateData) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 599f449..f076748 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1541,7 +1541,7 @@ struct wined3d_adapter BOOL initPixelFormats(struct wined3d_gl_info *gl_info, enum wined3d_pci_vendor vendor) DECLSPEC_HIDDEN; BOOL initPixelFormatsNoGL(struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; -extern unsigned int WineD3DAdapterChangeGLRam(IWineD3DDeviceImpl *D3DDevice, unsigned int glram) DECLSPEC_HIDDEN; +extern unsigned int WineD3DAdapterChangeGLRam(IWineD3DDeviceImpl *D3DDevice, int glram) DECLSPEC_HIDDEN; extern void add_gl_compat_wrappers(struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; /*****************************************************************************

1 0

Stefan Dösinger : wined3d: Fix a unsigned unary minus warning in MSVC.
by Alexandre Julliard 13 May '11

13 May '11

Module: wine Branch: master Commit: 31901155ce7ecc29e3257627b7ec24641194953c URL: http://source.winehq.org/git/wine.git/?a=commit;h=31901155ce7ecc29e3257627b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 12 17:47:29 2011 +0200 wined3d: Fix a unsigned unary minus warning in MSVC. --- dlls/wined3d/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 44c1670..05e4631 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -399,7 +399,7 @@ static HRESULT surface_create_dib_section(struct wined3d_surface *surface) b_info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); /* TODO: Is there a nicer way to force a specific alignment? (8 byte for ddraw) */ b_info->bmiHeader.biWidth = wined3d_surface_get_pitch(surface) / format->byte_count; - b_info->bmiHeader.biHeight = -surface->resource.height - extraline; + b_info->bmiHeader.biHeight = 0 - surface->resource.height - extraline; b_info->bmiHeader.biSizeImage = (surface->resource.height + extraline) * wined3d_surface_get_pitch(surface); b_info->bmiHeader.biPlanes = 1;

1 0

Stefan Dösinger : wined3d: Fix a few MSVC data loss warnings.
by Alexandre Julliard 13 May '11

13 May '11

Module: wine Branch: master Commit: a549b8f09084ec198573222ebc1d2390b88fd197 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a549b8f09084ec198573222eb… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 12 18:05:27 2011 +0200 wined3d: Fix a few MSVC data loss warnings. --- dlls/wined3d/drawprim.c | 2 +- dlls/wined3d/gl_compat.c | 12 ++++++------ dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/surface.c | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index cbfd938..5915ea1 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -274,7 +274,7 @@ static void drawStridedSlow(IWineD3DDeviceImpl *device, const struct wined3d_con if (specular_fog) { DWORD specularColor = *(const DWORD *)ptrToCoords; - GL_EXTCALL(glFogCoordfEXT(specularColor >> 24)); + GL_EXTCALL(glFogCoordfEXT((float) (specularColor >> 24))); } } diff --git a/dlls/wined3d/gl_compat.c b/dlls/wined3d/gl_compat.c index 0f8eaba..5756445 100644 --- a/dlls/wined3d/gl_compat.c +++ b/dlls/wined3d/gl_compat.c @@ -178,9 +178,9 @@ static void WINE_GLAPI wine_glFogi(GLenum pname, GLint param) { } } else { if(pname == GL_FOG_START) { - ctx->fogstart = param; + ctx->fogstart = (float) param; } else if(pname == GL_FOG_END) { - ctx->fogend = param; + ctx->fogend = (float) param; } old_fogcoord_glFogi(pname, param); } @@ -199,9 +199,9 @@ static void WINE_GLAPI wine_glFogiv(GLenum pname, const GLint *param) { } } else { if(pname == GL_FOG_START) { - ctx->fogstart = *param; + ctx->fogstart = (float) *param; } else if(pname == GL_FOG_END) { - ctx->fogend = *param; + ctx->fogend = (float) *param; } old_fogcoord_glFogiv(pname, param); } @@ -331,13 +331,13 @@ static void WINE_GLAPI wine_glFogCoordfEXT(GLfloat f) { ctx->fog_coord_value = f; } static void WINE_GLAPI wine_glFogCoorddEXT(GLdouble f) { - wine_glFogCoordfEXT(f); + wine_glFogCoordfEXT((GLfloat) f); } static void WINE_GLAPI wine_glFogCoordfvEXT(const GLfloat *f) { wine_glFogCoordfEXT(*f); } static void WINE_GLAPI wine_glFogCoorddvEXT(const GLdouble *f) { - wine_glFogCoordfEXT(*f); + wine_glFogCoordfEXT((GLfloat) *f); } /* End GL_EXT_fog_coord emulation */ diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index f1049a3..41e1e62 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -829,7 +829,7 @@ static void shader_glsl_load_constants(const struct wined3d_context *context, correction_params[1] = 1.0f; } else { /* position is window relative, not viewport relative */ - correction_params[0] = context->current_rt->resource.height; + correction_params[0] = (float) context->current_rt->resource.height; correction_params[1] = -1.0f; } GL_EXTCALL(glUniform4fvARB(prog->ycorrection_location, 1, correction_params)); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 05e4631..d03a5e5 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2554,7 +2554,7 @@ HRESULT surface_load(struct wined3d_surface *surface, BOOL srgb) static inline unsigned short float_32_to_16(const float *in) { int exp = 0; - float tmp = fabs(*in); + float tmp = fabsf(*in); unsigned int mantissa; unsigned short ret;

1 0

Alexandre Julliard : makefiles: Tools must be built before includes now.
by Alexandre Julliard 13 May '11

13 May '11

Module: wine Branch: master Commit: 9f93b5fa3103594867dab78a43ea9cc3f0e6c133 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f93b5fa3103594867dab78a4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 13 10:45:02 2011 +0200 makefiles: Tools must be built before includes now. --- Makefile.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile.in b/Makefile.in index b8cd6af..af4a4a7 100644 --- a/Makefile.in +++ b/Makefile.in @@ -61,7 +61,7 @@ __builddeps__: __tooldeps__ include loader server: libs/port libs/wine tools fonts: tools -include: tools/widl +include: tools tools/widl libs/wine: libs/port tools/wmc tools/wrc: tools tools tools/wmc tools/wrc: libs/wine

1 0

Aric Stewart : usp10: Implementation of ScriptShapeOpenType.
by Alexandre Julliard 13 May '11

13 May '11

Module: wine Branch: master Commit: 3ad7822d8560a39e024646b20f176f798652d118 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ad7822d8560a39e024646b20… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu May 12 13:57:26 2011 -0500 usp10: Implementation of ScriptShapeOpenType. --- dlls/usp10/shape.c | 12 ++++- dlls/usp10/usp10.c | 111 ++++++++++++++++++++++++++++++++++++------- dlls/usp10/usp10.spec | 2 +- dlls/usp10/usp10_internal.h | 3 + include/usp10.h | 12 +++++ 5 files changed, 119 insertions(+), 21 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index dff1f4f..b718190 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -762,10 +762,13 @@ static INT GSUB_apply_feature(const GSUB_Header * header, const GSUB_Feature* fe return out_index; } -static const char* get_opentype_script(HDC hdc, SCRIPT_ANALYSIS *psa) +static const char* get_opentype_script(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache *psc) { UINT charset; + if (psc->userScript != 0) + return (char*)&psc->userScript; + if (ShapingData[psa->eScript].otTag[0] != 0) return ShapingData[psa->eScript].otTag; @@ -810,10 +813,13 @@ static LPCVOID load_GSUB_feature(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache *psc const GSUB_Script *script; const GSUB_LangSys *language; - script = GSUB_get_script_table(psc->GSUB_Table, get_opentype_script(hdc,psa)); + script = GSUB_get_script_table(psc->GSUB_Table, get_opentype_script(hdc,psa,psc)); if (script) { - language = GSUB_get_lang_table(script, "xxxx"); /* Need to get Lang tag */ + 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); } diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index d818015..e7bda77 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1477,61 +1477,84 @@ HRESULT WINAPI ScriptIsComplex(const WCHAR *chars, int len, DWORD flag) } /*********************************************************************** - * ScriptShape (USP10.@) + * ScriptShapeOpenType (USP10.@) * * Produce glyphs and visual attributes for a run. * * PARAMS * hdc [I] Device context. * psc [I/O] Opaque pointer to a script cache. + * psa [I/O] Script analysis. + * tagScript [I] The OpenType tag for the Script + * tagLangSys [I] The OpenType tag for the Language + * rcRangeChars[I] Array of Character counts in each range + * rpRangeProperties [I] Array of TEXTRANGE_PROPERTIES structures + * cRanges [I] Count of ranges * pwcChars [I] Array of characters specifying the run. * cChars [I] Number of characters in pwcChars. * cMaxGlyphs [I] Length of pwOutGlyphs. - * psa [I/O] Script analysis. - * pwOutGlyphs [O] Array of glyphs. * pwLogClust [O] Array of logical cluster info. - * psva [O] Array of visual attributes. + * pCharProps [O] Array of character property values + * pwOutGlyphs [O] Array of glyphs. + * pOutGlyphProps [O] Array of attributes for the retrieved glyphs * pcGlyphs [O] Number of glyphs returned. * * RETURNS * Success: S_OK * Failure: Non-zero HRESULT value. */ -HRESULT WINAPI ScriptShape(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcChars, - int cChars, int cMaxGlyphs, - SCRIPT_ANALYSIS *psa, WORD *pwOutGlyphs, WORD *pwLogClust, - SCRIPT_VISATTR *psva, int *pcGlyphs) +HRESULT WINAPI ScriptShapeOpenType( HDC hdc, SCRIPT_CACHE *psc, + SCRIPT_ANALYSIS *psa, OPENTYPE_TAG tagScript, + OPENTYPE_TAG tagLangSys, int *rcRangeChars, + TEXTRANGE_PROPERTIES **rpRangeProperties, + int cRanges, const WCHAR *pwcChars, int cChars, + int cMaxGlyphs, WORD *pwLogClust, + SCRIPT_CHARPROP *pCharProps, WORD *pwOutGlyphs, + SCRIPT_GLYPHPROP *pOutGlyphProps, int *pcGlyphs) { HRESULT hr; unsigned int i; BOOL rtl; - TRACE("(%p, %p, %s, %d, %d, %p, %p, %p, %p, %p)\n", hdc, psc, debugstr_wn(pwcChars, cChars), - cChars, cMaxGlyphs, psa, pwOutGlyphs, pwLogClust, psva, pcGlyphs); + TRACE("(%p, %p, %p, %s, %s, %p, %p, %d, %s, %d, %d, %p, %p, %p, %p, %p )\n", + hdc, psc, psa, + debugstr_an((char*)&tagScript,4), debugstr_an((char*)&tagLangSys,4), + rcRangeChars, rpRangeProperties, cRanges, debugstr_wn(pwcChars, cChars), + cChars, cMaxGlyphs, pwLogClust, pCharProps, pwOutGlyphs, pOutGlyphProps, pcGlyphs); if (psa) TRACE("psa values: %d, %d, %d, %d, %d, %d, %d\n", psa->eScript, psa->fRTL, psa->fLayoutRTL, psa->fLinkBefore, psa->fLinkAfter, psa->fLogicalOrder, psa->fNoGlyphIndex); - if (!psva || !pcGlyphs) return E_INVALIDARG; + if (!pOutGlyphProps || !pcGlyphs || !pCharProps) return E_INVALIDARG; if (cChars > cMaxGlyphs) return E_OUTOFMEMORY; + + if (cRanges) + FIXME("Ranges not supported yet\n"); + rtl = (!psa->fLogicalOrder && psa->fRTL); *pcGlyphs = cChars; if ((hr = init_script_cache(hdc, psc)) != S_OK) return hr; if (!pwLogClust) return E_FAIL; + ((ScriptCache *)*psc)->userScript = tagScript; + ((ScriptCache *)*psc)->userLang = tagLangSys; + /* Initialize a SCRIPT_VISATTR and LogClust for each char in this run */ for (i = 0; i < cChars; i++) { int idx = i; if (rtl) idx = cChars - 1 - i; /* FIXME: set to better values */ - psva[i].uJustification = (pwcChars[idx] == ' ') ? SCRIPT_JUSTIFY_BLANK : SCRIPT_JUSTIFY_CHARACTER; - psva[i].fClusterStart = 1; - psva[i].fDiacritic = 0; - psva[i].fZeroWidth = 0; - psva[i].fReserved = 0; - psva[i].fShapeReserved = 0; + pOutGlyphProps[i].sva.uJustification = (pwcChars[idx] == ' ') ? SCRIPT_JUSTIFY_BLANK : SCRIPT_JUSTIFY_CHARACTER; + pOutGlyphProps[i].sva.fClusterStart = 1; + pOutGlyphProps[i].sva.fDiacritic = 0; + pOutGlyphProps[i].sva.fZeroWidth = 0; + pOutGlyphProps[i].sva.fReserved = 0; + pOutGlyphProps[i].sva.fShapeReserved = 0; + + /* FIXME: have the shaping engine set this */ + pCharProps[i].fCanGlyphAlone = 1; pwLogClust[i] = idx; } @@ -1584,6 +1607,60 @@ HRESULT WINAPI ScriptShape(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcChars, return S_OK; } + +/*********************************************************************** + * ScriptShape (USP10.@) + * + * Produce glyphs and visual attributes for a run. + * + * PARAMS + * hdc [I] Device context. + * psc [I/O] Opaque pointer to a script cache. + * pwcChars [I] Array of characters specifying the run. + * cChars [I] Number of characters in pwcChars. + * cMaxGlyphs [I] Length of pwOutGlyphs. + * psa [I/O] Script analysis. + * pwOutGlyphs [O] Array of glyphs. + * pwLogClust [O] Array of logical cluster info. + * psva [O] Array of visual attributes. + * pcGlyphs [O] Number of glyphs returned. + * + * RETURNS + * Success: S_OK + * Failure: Non-zero HRESULT value. + */ +HRESULT WINAPI ScriptShape(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcChars, + int cChars, int cMaxGlyphs, + SCRIPT_ANALYSIS *psa, WORD *pwOutGlyphs, WORD *pwLogClust, + SCRIPT_VISATTR *psva, int *pcGlyphs) +{ + HRESULT hr; + int i; + SCRIPT_CHARPROP *charProps; + SCRIPT_GLYPHPROP *glyphProps; + + if (!psva || !pcGlyphs) return E_INVALIDARG; + if (cChars > cMaxGlyphs) return E_OUTOFMEMORY; + + charProps = heap_alloc_zero(sizeof(SCRIPT_CHARPROP)*cChars); + if (!charProps) return E_OUTOFMEMORY; + glyphProps = heap_alloc_zero(sizeof(SCRIPT_GLYPHPROP)*cMaxGlyphs); + if (!glyphProps) return E_OUTOFMEMORY; + + hr = ScriptShapeOpenType(hdc, psc, psa, scriptInformation[psa->eScript].scriptTag, 0, NULL, NULL, 0, pwcChars, cChars, cMaxGlyphs, pwLogClust, charProps, pwOutGlyphs, glyphProps, pcGlyphs); + + if (SUCCEEDED(hr)) + { + for (i = 0; i < *pcGlyphs; i++) + psva[i] = glyphProps[i].sva; + } + + heap_free(charProps); + heap_free(glyphProps); + + return hr; +} + /*********************************************************************** * ScriptPlace (USP10.@) * diff --git a/dlls/usp10/usp10.spec b/dlls/usp10/usp10.spec index 21e7c31..bc2eb73 100644 --- a/dlls/usp10/usp10.spec +++ b/dlls/usp10/usp10.spec @@ -24,7 +24,7 @@ @ stub ScriptPositionSingleGlyph @ stdcall ScriptRecordDigitSubstitution(ptr ptr) @ stdcall ScriptShape(ptr ptr ptr long long ptr ptr ptr ptr ptr) -@ stub ScriptShapeOpenType +@ stdcall ScriptShapeOpenType(ptr ptr ptr long long ptr ptr long wstr long long ptr ptr ptr ptr ptr) @ stdcall ScriptStringAnalyse(ptr ptr long long long long long ptr ptr ptr ptr ptr ptr) @ stdcall ScriptStringCPtoX(ptr long long ptr) @ stdcall ScriptStringFree(ptr) diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index fae1066..a61e56e 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -69,6 +69,9 @@ typedef struct { LPVOID GSUB_Table; INT feature_count; LoadedFeature *features; + + OPENTYPE_TAG userScript; + OPENTYPE_TAG userLang; } ScriptCache; #define odd(x) ((x) & 1) diff --git a/include/usp10.h b/include/usp10.h index d947e6e..1940176 100644 --- a/include/usp10.h +++ b/include/usp10.h @@ -210,6 +210,18 @@ typedef struct tagOPENTYPE_FEATURE_RECORD LONG lParameter; } OPENTYPE_FEATURE_RECORD; +typedef struct tagSCRIPT_GLYPHPROP +{ + SCRIPT_VISATTR sva; + WORD reserved; +} SCRIPT_GLYPHPROP; + +typedef struct tagSCRIPT_CHARPROP +{ + WORD fCanGlyphAlone :1; + WORD reserved :15; +} SCRIPT_CHARPROP; + typedef struct tagTEXTRANGE_PROPERTIES { OPENTYPE_FEATURE_RECORD *potfRecords;

1 0

Aric Stewart : usp10: Implementation of ScriptPlaceOpenType.
by Alexandre Julliard 13 May '11

13 May '11

Module: wine Branch: master Commit: e3ed47bf952aabef9d50dc649eb243d91cc2e060 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3ed47bf952aabef9d50dc649… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu May 12 13:57:32 2011 -0500 usp10: Implementation of ScriptPlaceOpenType. --- dlls/usp10/usp10.c | 93 +++++++++++++++++++++++++++++++++++++++++++----- dlls/usp10/usp10.spec | 2 +- 2 files changed, 84 insertions(+), 11 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index e7bda77..da4fbb1 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1662,17 +1662,26 @@ HRESULT WINAPI ScriptShape(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcChars, } /*********************************************************************** - * ScriptPlace (USP10.@) + * ScriptPlaceOpenType (USP10.@) * * Produce advance widths for a run. * * PARAMS * hdc [I] Device context. * psc [I/O] Opaque pointer to a script cache. - * pwGlyphs [I] Array of glyphs. - * cGlyphs [I] Number of glyphs in pwGlyphs. - * psva [I] Array of visual attributes. * psa [I/O] String analysis. + * tagScript [I] The OpenType tag for the Script + * tagLangSys [I] The OpenType tag for the Language + * rcRangeChars[I] Array of Character counts in each range + * rpRangeProperties [I] Array of TEXTRANGE_PROPERTIES structures + * cRanges [I] Count of ranges + * pwcChars [I] Array of characters specifying the run. + * pwLogClust [I] Array of logical cluster info + * pCharProps [I] Array of character property values + * cChars [I] Number of characters in pwcChars. + * pwGlyphs [I] Array of glyphs. + * pGlyphProps [I] Array of attributes for the retrieved glyphs + * cGlyphs [I] Count of Glyphs * piAdvance [O] Array of advance widths. * pGoffset [O] Glyph offsets. * pABC [O] Combined ABC width. @@ -1681,20 +1690,37 @@ HRESULT WINAPI ScriptShape(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcChars, * Success: S_OK * Failure: Non-zero HRESULT value. */ -HRESULT WINAPI ScriptPlace(HDC hdc, SCRIPT_CACHE *psc, const WORD *pwGlyphs, - int cGlyphs, const SCRIPT_VISATTR *psva, - SCRIPT_ANALYSIS *psa, int *piAdvance, GOFFSET *pGoffset, ABC *pABC ) + +HRESULT WINAPI ScriptPlaceOpenType( HDC hdc, SCRIPT_CACHE *psc, SCRIPT_ANALYSIS *psa, + OPENTYPE_TAG tagScript, OPENTYPE_TAG tagLangSys, + int *rcRangeChars, TEXTRANGE_PROPERTIES **rpRangeProperties, + int cRanges, const WCHAR *pwcChars, WORD *pwLogClust, + SCRIPT_CHARPROP *pCharProps, int cChars, + const WORD *pwGlyphs, const SCRIPT_GLYPHPROP *pGlyphProps, + int cGlyphs, int *piAdvance, + GOFFSET *pGoffset, ABC *pABC +) { HRESULT hr; int i; - TRACE("(%p, %p, %p, %d, %p, %p, %p, %p, %p)\n", hdc, psc, pwGlyphs, cGlyphs, psva, psa, - piAdvance, pGoffset, pABC); + TRACE("(%p, %p, %p, %s, %s, %p, %p, %d, %s, %p, %p, %d, %p, %p, %d, %p %p %p)\n", + hdc, psc, psa, + debugstr_an((char*)&tagScript,4), debugstr_an((char*)&tagLangSys,4), + rcRangeChars, rpRangeProperties, cRanges, debugstr_wn(pwcChars, cChars), + pwLogClust, pCharProps, cChars, pwGlyphs, pGlyphProps, cGlyphs, piAdvance, + pGoffset, pABC); - if (!psva) return E_INVALIDARG; + if (!pGlyphProps) return E_INVALIDARG; if ((hr = init_script_cache(hdc, psc)) != S_OK) return hr; if (!pGoffset) return E_FAIL; + if (cRanges) + FIXME("Ranges not supported yet\n"); + + ((ScriptCache *)*psc)->userScript = tagScript; + ((ScriptCache *)*psc)->userLang = tagLangSys; + if (pABC) memset(pABC, 0, sizeof(ABC)); for (i = 0; i < cGlyphs; i++) { @@ -1731,6 +1757,53 @@ HRESULT WINAPI ScriptPlace(HDC hdc, SCRIPT_CACHE *psc, const WORD *pwGlyphs, } /*********************************************************************** + * ScriptPlace (USP10.@) + * + * Produce advance widths for a run. + * + * PARAMS + * hdc [I] Device context. + * psc [I/O] Opaque pointer to a script cache. + * pwGlyphs [I] Array of glyphs. + * cGlyphs [I] Number of glyphs in pwGlyphs. + * psva [I] Array of visual attributes. + * psa [I/O] String analysis. + * piAdvance [O] Array of advance widths. + * pGoffset [O] Glyph offsets. + * pABC [O] Combined ABC width. + * + * RETURNS + * Success: S_OK + * Failure: Non-zero HRESULT value. + */ +HRESULT WINAPI ScriptPlace(HDC hdc, SCRIPT_CACHE *psc, const WORD *pwGlyphs, + int cGlyphs, const SCRIPT_VISATTR *psva, + SCRIPT_ANALYSIS *psa, int *piAdvance, GOFFSET *pGoffset, ABC *pABC ) +{ + HRESULT hr; + SCRIPT_GLYPHPROP *glyphProps; + int i; + + TRACE("(%p, %p, %p, %d, %p, %p, %p, %p, %p)\n", hdc, psc, pwGlyphs, cGlyphs, psva, psa, + piAdvance, pGoffset, pABC); + + if (!psva) return E_INVALIDARG; + if (!pGoffset) return E_FAIL; + + glyphProps = heap_alloc(sizeof(SCRIPT_GLYPHPROP)*cGlyphs); + if (!glyphProps) return E_OUTOFMEMORY; + + for (i = 0; i < cGlyphs; i++) + glyphProps[i].sva = psva[i]; + + hr = ScriptPlaceOpenType(hdc, psc, psa, scriptInformation[psa->eScript].scriptTag, 0, NULL, NULL, 0, NULL, NULL, NULL, 0, pwGlyphs, glyphProps, cGlyphs, piAdvance, pGoffset, pABC); + + heap_free(glyphProps); + + return hr; +} + +/*********************************************************************** * ScriptGetCMap (USP10.@) * * Retrieve glyph indices. diff --git a/dlls/usp10/usp10.spec b/dlls/usp10/usp10.spec index bc2eb73..05269c5 100644 --- a/dlls/usp10/usp10.spec +++ b/dlls/usp10/usp10.spec @@ -20,7 +20,7 @@ @ stdcall ScriptJustify(ptr ptr long long long ptr) @ stdcall ScriptLayout(long ptr ptr ptr) @ stdcall ScriptPlace(ptr ptr ptr long ptr ptr ptr ptr ptr) -@ stub ScriptPlaceOpenType +@ stdcall ScriptPlaceOpenType(ptr ptr ptr long long ptr ptr long wstr ptr ptr long ptr ptr long ptr ptr ptr) @ stub ScriptPositionSingleGlyph @ stdcall ScriptRecordDigitSubstitution(ptr ptr) @ stdcall ScriptShape(ptr ptr ptr long long ptr ptr ptr ptr ptr)

1 0

Frédéric Delanoy : kernel32/tests: Fix typo.
by Alexandre Julliard 13 May '11

13 May '11

Module: wine Branch: master Commit: f5304c4f73508adddb05e881fadb9a27d250795d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5304c4f73508adddb05e881f… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu May 12 22:10:52 2011 +0200 kernel32/tests: Fix typo. --- dlls/kernel32/tests/locale.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 19f630b..1268c1d 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -1348,7 +1348,7 @@ static void test_CompareStringA(void) /* \xB9 character lies between a and b */ ret = CompareStringA(lcid, 0, "a", 1, "\xB9", 1); - todo_wine ok(ret == CSTR_LESS_THAN, "\'\\xB9\' character should be grater than \'a\'\n"); + todo_wine ok(ret == CSTR_LESS_THAN, "\'\\xB9\' character should be greater than \'a\'\n"); ret = CompareStringA(lcid, 0, "\xB9", 1, "b", 1); ok(ret == CSTR_LESS_THAN, "\'\\xB9\' character should be smaller than \'b\'\n"); }

1 0

Nikolay Sivov : comctl32/tab: Send NM_RCLICK on WM_RBUTTONUP.
by Alexandre Julliard 13 May '11

13 May '11

Module: wine Branch: master Commit: 4daa5459f48a8b1f2f9a9818cdd775280ede4f01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4daa5459f48a8b1f2f9a9818c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 13 00:46:39 2011 +0400 comctl32/tab: Send NM_RCLICK on WM_RBUTTONUP. --- dlls/comctl32/tab.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index bd34358..0424f7f 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -707,7 +707,7 @@ TAB_LButtonUp (const TAB_INFO *infoPtr) } static inline LRESULT -TAB_RButtonDown (const TAB_INFO *infoPtr) +TAB_RButtonUp (const TAB_INFO *infoPtr) { TAB_SendSimpleNotify(infoPtr, NM_RCLICK); return 0; @@ -3427,8 +3427,8 @@ TAB_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_NOTIFY: return SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, wParam, lParam); - case WM_RBUTTONDOWN: - return TAB_RButtonDown (infoPtr); + case WM_RBUTTONUP: + return TAB_RButtonUp (infoPtr); case WM_MOUSEMOVE: return TAB_MouseMove (infoPtr, wParam, lParam);

1 0

Anders Jonsson : winecfg: Update Swedish translation.
by Alexandre Julliard 13 May '11

13 May '11

Module: wine Branch: master Commit: 2096d9014113b7cb1eeb38f819731a037aa3a255 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2096d9014113b7cb1eeb38f81… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Thu May 12 21:46:56 2011 +0200 winecfg: Update Swedish translation. --- programs/winecfg/Sv.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winecfg/Sv.rc b/programs/winecfg/Sv.rc index 10fc98a..cffc415 100644 --- a/programs/winecfg/Sv.rc +++ b/programs/winecfg/Sv.rc @@ -62,7 +62,7 @@ STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN GROUPBOX " F�nsterinst�llningar ",IDC_STATIC,8,4,244,84 - CONTROL "Automatically capture the &mouse in full-screen windows",IDC_FULLSCREEN_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 + CONTROL "F�nga &musen automatiskt i fullsk�rmsf�nster",IDC_FULLSCREEN_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 CONTROL "Till�t f�nsterhanteraren att &dekorera f�nstren",IDC_ENABLE_DECORATED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,32,230,8 CONTROL "Till�t &f�nsterhanteraren att styra f�nstren",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,44,230,8 CONTROL "Emulera ett virtuellt skriv&bord",IDC_ENABLE_DESKTOP,"Button",

1 0