January 2013 - Wine-commits

Aric Stewart : usp10: Add ShapeCharGlyphProp_Latin to properly handle zero width character properties for Latin .
by Alexandre Julliard 25 Jan '13

25 Jan '13

Module: wine Branch: master Commit: 8df64b8589aa463b75788e0bf14fe2d9b1501a51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8df64b8589aa463b75788e0bf… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Jan 24 13:42:18 2013 -0600 usp10: Add ShapeCharGlyphProp_Latin to properly handle zero width character properties for Latin. --- dlls/usp10/shape.c | 24 ++++++++++++++++++------ 1 files changed, 18 insertions(+), 6 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index e40a404..a4c6d90 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -64,6 +64,7 @@ static void ContextualShape_Mongolian(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS typedef VOID (*ShapeCharGlyphPropProc)( HDC , ScriptCache*, SCRIPT_ANALYSIS*, const WCHAR*, const INT, const WORD*, const INT, WORD*, SCRIPT_CHARPROP*, SCRIPT_GLYPHPROP*); static void ShapeCharGlyphProp_Default( 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); +static void ShapeCharGlyphProp_Latin( 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 ); static void ShapeCharGlyphProp_Arabic( 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 ); static void ShapeCharGlyphProp_Hebrew( 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 ); 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 ); @@ -453,11 +454,11 @@ typedef struct ScriptShapeDataTag { static const ScriptShapeData ShapingData[] = { {{ standard_features, 2}, {NULL, 0}, NULL, 0, NULL, NULL}, - {{ latin_features, 4}, {latin_gpos_features, 3}, NULL, 0, NULL, NULL}, - {{ latin_features, 4}, {latin_gpos_features, 3}, NULL, 0, NULL, NULL}, - {{ latin_features, 4}, {latin_gpos_features, 3}, NULL, 0, NULL, NULL}, + {{ latin_features, 4}, {latin_gpos_features, 3}, NULL, 0, NULL, ShapeCharGlyphProp_Latin}, + {{ latin_features, 4}, {latin_gpos_features, 3}, NULL, 0, NULL, ShapeCharGlyphProp_Latin}, + {{ latin_features, 4}, {latin_gpos_features, 3}, NULL, 0, NULL, ShapeCharGlyphProp_Latin}, {{ standard_features, 2}, {NULL, 0}, NULL, 0, NULL, NULL}, - {{ latin_features, 4}, {latin_gpos_features, 3}, NULL, 0, NULL, NULL}, + {{ latin_features, 4}, {latin_gpos_features, 3}, NULL, 0, NULL, ShapeCharGlyphProp_Latin}, {{ arabic_features, 6}, {arabic_gpos_features, 4}, required_arabic_features, 0, ContextualShape_Arabic, ShapeCharGlyphProp_Arabic}, {{ arabic_features, 6}, {arabic_gpos_features, 4}, required_arabic_features, 0, ContextualShape_Arabic, ShapeCharGlyphProp_Arabic}, {{ hebrew_features, 2}, {hebrew_gpos_features, 2}, NULL, 0, ContextualShape_Hebrew, ShapeCharGlyphProp_Hebrew}, @@ -497,7 +498,7 @@ static const ScriptShapeData ShapingData[] = {{ devanagari_features, 6}, {devanagari_gpos_features, 4}, required_telugu_features, MS_MAKE_TAG('m','l','m','2'), ContextualShape_Malayalam, ShapeCharGlyphProp_Malayalam}, {{ devanagari_features, 6}, {devanagari_gpos_features, 4}, required_telugu_features, MS_MAKE_TAG('m','l','m','2'), ContextualShape_Malayalam, NULL}, {{ standard_features, 2}, {NULL, 0}, NULL, 0, NULL, NULL}, - {{ latin_features, 4}, {latin_gpos_features, 3}, NULL, 0, NULL, NULL}, + {{ latin_features, 4}, {latin_gpos_features, 3}, NULL, 0, NULL, ShapeCharGlyphProp_Latin}, {{ standard_features, 2}, {NULL, 0}, NULL, 0, NULL, NULL}, {{ myanmar_features, 2}, {NULL, 0}, NULL, 0, NULL, NULL}, {{ myanmar_features, 2}, {NULL, 0}, NULL, 0, NULL, NULL}, @@ -532,7 +533,7 @@ static const ScriptShapeData ShapingData[] = {{ NULL, 0}, {NULL, 0}, NULL, 0, NULL, NULL}, {{ NULL, 0}, {NULL, 0}, NULL, 0, NULL, NULL}, {{ hebrew_features, 2}, {hebrew_gpos_features, 2}, NULL, 0, ContextualShape_Hebrew, NULL}, - {{ latin_features, 4}, {latin_gpos_features, 3}, NULL, 0, NULL, NULL}, + {{ latin_features, 4}, {latin_gpos_features, 3}, NULL, 0, NULL, ShapeCharGlyphProp_Latin}, {{ thai_features, 1}, {thai_gpos_features, 3}, NULL, 0, ContextualShape_Thai, ShapeCharGlyphProp_Thai}, }; @@ -2831,6 +2832,17 @@ static void ShapeCharGlyphProp_Default( ScriptCache* psc, SCRIPT_ANALYSIS* psa, UpdateClustersFromGlyphProp(cGlyphs, cChars, pwLogClust, pGlyphProp); } +static void ShapeCharGlyphProp_Latin( 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; + + ShapeCharGlyphProp_Default( psc, psa, pwcChars, cChars, pwGlyphs, cGlyphs, pwLogClust, pCharProp, pGlyphProp); + + for (i = 0; i < cGlyphs; i++) + if (pGlyphProp[i].sva.fZeroWidth) + pGlyphProp[i].sva.uJustification = SCRIPT_JUSTIFY_NONE; +} + static void ShapeCharGlyphProp_Arabic( 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;

1 0

Aric Stewart : usp10: Add ShapeCharGlyphProp and ContextualShape for Control characters.
by Alexandre Julliard 25 Jan '13

25 Jan '13

Module: wine Branch: master Commit: 6d1d7eedd93fb2a225d4d91b6c985784720df89f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d1d7eedd93fb2a225d4d91b6… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Jan 24 13:42:26 2013 -0600 usp10: Add ShapeCharGlyphProp and ContextualShape for Control characters. --- dlls/usp10/shape.c | 37 ++++++++++++++++++++++++++++++++++++- 1 files changed, 36 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index a4c6d90..d30a615 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -41,6 +41,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(uniscribe); typedef VOID (*ContextualShapingProc)(HDC, ScriptCache*, SCRIPT_ANALYSIS*, WCHAR*, INT, WORD*, INT*, INT, WORD*); +static void ContextualShape_Control(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs, WORD *pwLogClust); static void ContextualShape_Arabic(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs, WORD *pwLogClust); static void ContextualShape_Hebrew(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs, WORD *pwLogClust); static void ContextualShape_Syriac(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs, WORD *pwLogClust); @@ -64,6 +65,7 @@ static void ContextualShape_Mongolian(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS typedef VOID (*ShapeCharGlyphPropProc)( HDC , ScriptCache*, SCRIPT_ANALYSIS*, const WCHAR*, const INT, const WORD*, const INT, WORD*, SCRIPT_CHARPROP*, SCRIPT_GLYPHPROP*); static void ShapeCharGlyphProp_Default( 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); +static void ShapeCharGlyphProp_Control( 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 ); static void ShapeCharGlyphProp_Latin( 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 ); static void ShapeCharGlyphProp_Arabic( 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 ); static void ShapeCharGlyphProp_Hebrew( 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 ); @@ -457,7 +459,7 @@ static const ScriptShapeData ShapingData[] = {{ latin_features, 4}, {latin_gpos_features, 3}, NULL, 0, NULL, ShapeCharGlyphProp_Latin}, {{ latin_features, 4}, {latin_gpos_features, 3}, NULL, 0, NULL, ShapeCharGlyphProp_Latin}, {{ latin_features, 4}, {latin_gpos_features, 3}, NULL, 0, NULL, ShapeCharGlyphProp_Latin}, - {{ standard_features, 2}, {NULL, 0}, NULL, 0, NULL, NULL}, + {{ standard_features, 2}, {NULL, 0}, NULL, 0, ContextualShape_Control, ShapeCharGlyphProp_Control}, {{ latin_features, 4}, {latin_gpos_features, 3}, NULL, 0, NULL, ShapeCharGlyphProp_Latin}, {{ arabic_features, 6}, {arabic_gpos_features, 4}, required_arabic_features, 0, ContextualShape_Arabic, ShapeCharGlyphProp_Arabic}, {{ arabic_features, 6}, {arabic_gpos_features, 4}, required_arabic_features, 0, ContextualShape_Arabic, ShapeCharGlyphProp_Arabic}, @@ -941,6 +943,23 @@ static void mark_invalid_combinations(HDC hdc, const WCHAR* pwcChars, INT cChars HeapFree(GetProcessHeap(),0,context_type); } +static void ContextualShape_Control(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs, WORD *pwLogClust) +{ + int i; + for (i=0; i < cChars; i++) + { + switch (pwcChars[i]) + { + case 0x000D: pwOutGlyphs[i] = psc->sfp.wgBlank; break; + default: + if (pwcChars[i] < 0x1C) + pwOutGlyphs[i] = psc->sfp.wgDefault; + else + pwOutGlyphs[i] = psc->sfp.wgBlank; + } + } +} + static WCHAR neighbour_char(int i, int delta, const WCHAR* chars, INT cchLen) { if (i + delta < 0) @@ -2843,6 +2862,22 @@ static void ShapeCharGlyphProp_Latin( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS pGlyphProp[i].sva.uJustification = SCRIPT_JUSTIFY_NONE; } +static void ShapeCharGlyphProp_Control( 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; + for (i = 0; i < cGlyphs; i++) + { + pGlyphProp[i].sva.fClusterStart = 1; + pGlyphProp[i].sva.fDiacritic = 0; + pGlyphProp[i].sva.uJustification = SCRIPT_JUSTIFY_BLANK; + + if (pwGlyphs[i] == psc->sfp.wgDefault) + pGlyphProp[i].sva.fZeroWidth = 0; + else + pGlyphProp[i].sva.fZeroWidth = 1; + } +} + static void ShapeCharGlyphProp_Arabic( 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;

1 0

Andrew Talbot : hhctrl.ocx: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard 25 Jan '13

25 Jan '13

Module: wine Branch: master Commit: 2e268d1914254203cfc91d9f3c4b84d65945a3a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e268d1914254203cfc91d9f3… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Jan 24 22:10:41 2013 +0000 hhctrl.ocx: Avoid signed-unsigned integer comparisons. --- dlls/hhctrl.ocx/help.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index 5c922b3..05e6466 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -1825,7 +1825,7 @@ void ReleaseHelpViewer(HHInfo *info) HHInfo *CreateHelpViewer(HHInfo *info, LPCWSTR filename, HWND caller) { HHInfo *tmp_info; - int i; + unsigned int i; if(!info) {

1 0

Michael Stefaniuc : mscoree: Use assignment instead of memcpy to copy a struct.
by Alexandre Julliard 25 Jan '13

25 Jan '13

Module: wine Branch: master Commit: 7fdcb092b77d6b97f79e7443015f38cef2aeb7d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fdcb092b77d6b97f79e74430… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jan 25 10:02:38 2013 +0100 mscoree: Use assignment instead of memcpy to copy a struct. --- dlls/mscoree/corruntimehost.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index da46d61..b4ee38b 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -988,7 +988,7 @@ static void FixupVTableEntry(HMODULE hmodule, VTableFixup *vtable_fixup) memcpy(tokens, vtable, sizeof(*tokens) * vtable_fixup->count); for (i=0; i<vtable_fixup->count; i++) { - memcpy(&thunks[i], &thunk_template, sizeof(thunk_template)); + thunks[i] = thunk_template; thunks[i].fixup = fixup; thunks[i].function = ReallyFixupVTable; thunks[i].vtable_entry = &vtable[i];

1 0

Andrew Talbot : gphoto2.ds: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard 25 Jan '13

25 Jan '13

Module: wine Branch: master Commit: 0020c5f9dd788efced216b75f9f14f3034cdf574 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0020c5f9dd788efced216b75f… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Jan 24 22:10:35 2013 +0000 gphoto2.ds: Avoid signed-unsigned integer comparisons. --- dlls/gphoto2.ds/ds_image.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/gphoto2.ds/ds_image.c b/dlls/gphoto2.ds/ds_image.c index 632ff66..cb3bbed 100644 --- a/dlls/gphoto2.ds/ds_image.c +++ b/dlls/gphoto2.ds/ds_image.c @@ -435,7 +435,8 @@ TW_UINT16 GPHOTO2_ImageNativeXferGet (pTW_IDENTITY pOrigin, samprow = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,activeDS.jd.output_width*activeDS.jd.output_components); oldsamprow = samprow; while ( activeDS.jd.output_scanline<activeDS.jd.output_height ) { - int i, x = pjpeg_read_scanlines(&activeDS.jd,&samprow,1); + unsigned int i; + int x = pjpeg_read_scanlines(&activeDS.jd,&samprow,1); if (x != 1) { FIXME("failed to read current scanline?\n"); break; @@ -641,7 +642,8 @@ _get_gphoto2_file_as_DIB( samprow = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,jd.output_width*jd.output_components); oldsamprow = samprow; while ( jd.output_scanline<jd.output_height ) { - int i, x = pjpeg_read_scanlines(&jd,&samprow,1); + unsigned int i; + int x = pjpeg_read_scanlines(&jd,&samprow,1); if (x != 1) { FIXME("failed to read current scanline?\n"); break;

1 0

Henri Verbeet : d3drm: Avoid LPD3DRMBOX.
by Alexandre Julliard 25 Jan '13

25 Jan '13

Module: wine Branch: master Commit: 1557d2e4ff6e919ff252e5affd77781cf5eb3141 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1557d2e4ff6e919ff252e5aff… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 25 10:57:16 2013 +0100 d3drm: Avoid LPD3DRMBOX. --- dlls/d3drm/frame.c | 12 +++++------- include/d3drmobj.h | 14 +++++++------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 09dfea4..03f0184 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -1260,7 +1260,7 @@ static HRESULT WINAPI IDirect3DRMFrame2Impl_AddMoveCallback2(IDirect3DRMFrame2* return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMFrame2Impl_GetBox(IDirect3DRMFrame2* iface, LPD3DRMBOX box) +static HRESULT WINAPI IDirect3DRMFrame2Impl_GetBox(IDirect3DRMFrame2 *iface, D3DRMBOX *box) { IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame2(iface); @@ -1307,8 +1307,7 @@ static BOOL WINAPI IDirect3DRMFrame2Impl_GetInheritAxes(IDirect3DRMFrame2* iface return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMFrame2Impl_GetHierarchyBox(IDirect3DRMFrame2* iface, - LPD3DRMBOX box) +static HRESULT WINAPI IDirect3DRMFrame2Impl_GetHierarchyBox(IDirect3DRMFrame2 *iface, D3DRMBOX *box) { IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame2(iface); @@ -2336,7 +2335,7 @@ static HRESULT WINAPI IDirect3DRMFrame3Impl_Transform(IDirect3DRMFrame3* iface, return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMFrame3Impl_GetBox(IDirect3DRMFrame3* iface, LPD3DRMBOX box) +static HRESULT WINAPI IDirect3DRMFrame3Impl_GetBox(IDirect3DRMFrame3 *iface, D3DRMBOX *box) { IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame3(iface); @@ -2382,8 +2381,7 @@ static BOOL WINAPI IDirect3DRMFrame3Impl_GetInheritAxes(IDirect3DRMFrame3* iface return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMFrame3Impl_GetHierarchyBox(IDirect3DRMFrame3* iface, - LPD3DRMBOX box) +static HRESULT WINAPI IDirect3DRMFrame3Impl_GetHierarchyBox(IDirect3DRMFrame3* iface, D3DRMBOX *box) { IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame3(iface); @@ -2392,7 +2390,7 @@ static HRESULT WINAPI IDirect3DRMFrame3Impl_GetHierarchyBox(IDirect3DRMFrame3* i return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMFrame3Impl_SetBox(IDirect3DRMFrame3* iface, LPD3DRMBOX box) +static HRESULT WINAPI IDirect3DRMFrame3Impl_SetBox(IDirect3DRMFrame3 *iface, D3DRMBOX *box) { IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame3(iface); diff --git a/include/d3drmobj.h b/include/d3drmobj.h index 71bc005..4fef2d4 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -1389,13 +1389,13 @@ DECLARE_INTERFACE_(IDirect3DRMFrame2,IDirect3DRMFrame) STDMETHOD(Transform)(THIS_ D3DVECTOR *d, D3DVECTOR *s) PURE; /*** IDirect3DRMFrame2 methods ***/ STDMETHOD(AddMoveCallback2)(THIS_ D3DRMFRAMEMOVECALLBACK, VOID *arg, DWORD flags) PURE; - STDMETHOD(GetBox)(THIS_ LPD3DRMBOX) PURE; + STDMETHOD(GetBox)(THIS_ D3DRMBOX *box) PURE; STDMETHOD_(BOOL, GetBoxEnable)(THIS) PURE; STDMETHOD(GetAxes)(THIS_ D3DVECTOR *dir, D3DVECTOR *up); STDMETHOD(GetMaterial)(THIS_ LPDIRECT3DRMMATERIAL *) PURE; STDMETHOD_(BOOL, GetInheritAxes)(THIS); - STDMETHOD(GetHierarchyBox)(THIS_ LPD3DRMBOX) PURE; - STDMETHOD(SetBox)(THIS_ LPD3DRMBOX) PURE; + STDMETHOD(GetHierarchyBox)(THIS_ D3DRMBOX *box) PURE; + STDMETHOD(SetBox)(THIS_ D3DRMBOX *box) PURE; STDMETHOD(SetBoxEnable)(THIS_ BOOL) PURE; STDMETHOD(SetAxes)(THIS_ D3DVALUE dx, D3DVALUE dy, D3DVALUE dz, D3DVALUE ux, D3DVALUE uy, D3DVALUE uz); STDMETHOD(SetInheritAxes)(THIS_ BOOL inherit_from_parent); @@ -1668,13 +1668,13 @@ DECLARE_INTERFACE_(IDirect3DRMFrame3,IDirect3DRMVisual) BOOL with_rotation) PURE; STDMETHOD(SetZbufferMode)(THIS_ D3DRMZBUFFERMODE) PURE; STDMETHOD(Transform)(THIS_ D3DVECTOR *d, D3DVECTOR *s) PURE; - STDMETHOD(GetBox)(THIS_ LPD3DRMBOX) PURE; + STDMETHOD(GetBox)(THIS_ D3DRMBOX *box) PURE; STDMETHOD_(BOOL, GetBoxEnable)(THIS) PURE; STDMETHOD(GetAxes)(THIS_ D3DVECTOR *dir, D3DVECTOR *up); STDMETHOD(GetMaterial)(THIS_ LPDIRECT3DRMMATERIAL2 *) PURE; STDMETHOD_(BOOL, GetInheritAxes)(THIS); - STDMETHOD(GetHierarchyBox)(THIS_ LPD3DRMBOX) PURE; - STDMETHOD(SetBox)(THIS_ LPD3DRMBOX) PURE; + STDMETHOD(GetHierarchyBox)(THIS_ D3DRMBOX *box) PURE; + STDMETHOD(SetBox)(THIS_ D3DRMBOX *box) PURE; STDMETHOD(SetBoxEnable)(THIS_ BOOL) PURE; STDMETHOD(SetAxes)(THIS_ D3DVALUE dx, D3DVALUE dy, D3DVALUE dz, D3DVALUE ux, D3DVALUE uy, D3DVALUE uz); STDMETHOD(SetInheritAxes)(THIS_ BOOL inherit_from_parent); @@ -2035,7 +2035,7 @@ DECLARE_INTERFACE_(IDirect3DRMProgressiveMesh,IDirect3DRMVisual) STDMETHOD(RegisterEvents) (THIS_ HANDLE event, DWORD flags, DWORD reserved) PURE; STDMETHOD(CreateMesh) (THIS_ LPDIRECT3DRMMESH *ppD3DRMMesh) PURE; STDMETHOD(Duplicate) (THIS_ LPDIRECT3DRMPROGRESSIVEMESH *ppD3DRMPMesh) PURE; - STDMETHOD(GetBox) (THIS_ LPD3DRMBOX pBBox) PURE; + STDMETHOD(GetBox) (THIS_ D3DRMBOX *box) PURE; STDMETHOD(SetQuality) (THIS_ D3DRMRENDERQUALITY) PURE; STDMETHOD(GetQuality) (THIS_ LPD3DRMRENDERQUALITY pQuality) PURE; };

1 0

Henri Verbeet : d3drm: Avoid LPD3DRMRENDERQUALITY.
by Alexandre Julliard 25 Jan '13

25 Jan '13

Module: wine Branch: master Commit: 23e15404751b641a23a9a3aea7031e4d5393ffef URL: http://source.winehq.org/git/wine.git/?a=commit;h=23e15404751b641a23a9a3aea… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 25 10:57:17 2013 +0100 d3drm: Avoid LPD3DRMRENDERQUALITY. --- include/d3drmobj.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/d3drmobj.h b/include/d3drmobj.h index 4fef2d4..7c7a913 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -2036,8 +2036,8 @@ DECLARE_INTERFACE_(IDirect3DRMProgressiveMesh,IDirect3DRMVisual) STDMETHOD(CreateMesh) (THIS_ LPDIRECT3DRMMESH *ppD3DRMMesh) PURE; STDMETHOD(Duplicate) (THIS_ LPDIRECT3DRMPROGRESSIVEMESH *ppD3DRMPMesh) PURE; STDMETHOD(GetBox) (THIS_ D3DRMBOX *box) PURE; - STDMETHOD(SetQuality) (THIS_ D3DRMRENDERQUALITY) PURE; - STDMETHOD(GetQuality) (THIS_ LPD3DRMRENDERQUALITY pQuality) PURE; + STDMETHOD(SetQuality) (THIS_ D3DRMRENDERQUALITY quality) PURE; + STDMETHOD(GetQuality) (THIS_ D3DRMRENDERQUALITY *quality) PURE; }; #undef INTERFACE

1 0

Francois Gouget : testbot/TestAgent: Fix handling of EAGAIN errors in _SendFile().
by Alexandre Julliard 25 Jan '13

25 Jan '13

Module: tools Branch: master Commit: 070fa93c111a22903b8c0403643f0a8e17524603 URL: http://source.winehq.org/git/tools.git/?a=commit;h=070fa93c111a22903b8c0403… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jan 25 14:48:26 2013 +0100 testbot/TestAgent: Fix handling of EAGAIN errors in _SendFile(). We can get EAGAIN errors when tunneling through SSH, particularly for larger $BLOCK_SIZE values. --- testbot/lib/WineTestBot/TestAgent.pm | 54 +++++++++++++++++++-------------- 1 files changed, 31 insertions(+), 23 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index 6b8bff7..f06bd71 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -556,6 +556,32 @@ sub _RecvErrorList($) # Low-level functions to send raw data # +sub _Write($$) +{ + my ($self, $Data) = @_; + return undef if (!defined $self->{fd}); + + my $Size = length($Data); + my $Sent = 0; + while ($Size) + { + my $w = syswrite($self->{fd}, $Data, $Size, $Sent); + if (!defined $w) + { + $self->_SetError($FATAL, "network write error: $!"); + return undef; + } + if ($w == 0) + { + $self->_SetError($FATAL, "unable to send more data"); + return $Sent; + } + $Sent += $w; + $Size -= $w; + } + return $Sent; +} + sub _SendRawData($$) { my ($self, $Data) = @_; @@ -566,29 +592,11 @@ sub _SendRawData($$) { local $SIG{ALRM} = sub { die "timeout" }; $self->_SetAlarm(); - - my $Size = length($Data); - my $Pos = 0; - while ($Size) - { - my $n = syswrite($self->{fd}, $Data, $Size, $Pos); - if (!defined $n) - { - alarm(0); - $self->_SetError($FATAL, "network write error: $!"); - return; - } - if ($n == 0) - { - alarm(0); - $self->_SetError($FATAL, "unable to send more data"); - return; - } - $Pos += $n; - $Size -= $n; - } + $self->_Write($Data); alarm(0); - $Success = 1; + + # _Write() errors are fatal and break the connection + $Success = 1 if (defined $self->{fd}); }; if ($@) { @@ -694,7 +702,7 @@ sub _SendFile($$$) return; } $Size -= $r; - my $w = syswrite($self->{fd}, $Buffer, $r, 0); + my $w = $self->_Write($Buffer); if (!defined $w or $w != $r) { alarm(0);

1 0

Michael Stefaniuc : msvcrt/tests: Use assignment instead of memcpy to copy structs.
by Alexandre Julliard 24 Jan '13

24 Jan '13

Module: wine Branch: master Commit: a8b63acc0388584e7788ae1ead14cacbdc85d3e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8b63acc0388584e7788ae1ea… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 24 15:11:44 2013 +0100 msvcrt/tests: Use assignment instead of memcpy to copy structs. --- dlls/msvcrt/tests/cpp.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index 88f8225..fc223c5 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -967,7 +967,7 @@ static void test_rtti(void) call_func1(pexception_dtor, &e); call_func1(pbad_typeid_dtor, &b); - memcpy(&simple_class_sig0_rtti, &simple_class_rtti, sizeof(struct rtti_data)); + simple_class_sig0_rtti = simple_class_rtti; simple_class_sig0_rtti.object_locator.signature = 0; simple_class_sig0_rtti.base_descriptor[0].type_descriptor = RTTI_REF_SIG0(simple_class_sig0_rtti, type_info[0], base); simple_class_sig0_rtti.base_array.bases[0] = RTTI_REF_SIG0(simple_class_sig0_rtti, base_descriptor[0], base); @@ -975,7 +975,7 @@ static void test_rtti(void) simple_class_sig0_rtti.object_locator.type_descriptor = RTTI_REF_SIG0(simple_class_sig0_rtti, type_info[0], base); simple_class_sig0_rtti.object_locator.type_hierarchy = RTTI_REF_SIG0(simple_class_sig0_rtti, object_hierarchy, base); - memcpy(&child_class_sig0_rtti, &child_class_rtti, sizeof(struct rtti_data)); + child_class_sig0_rtti = child_class_rtti; child_class_sig0_rtti.object_locator.signature = 0; child_class_sig0_rtti.base_descriptor[0].type_descriptor = RTTI_REF_SIG0(child_class_sig0_rtti, type_info[1], base); child_class_sig0_rtti.base_descriptor[1].type_descriptor = RTTI_REF_SIG0(child_class_sig0_rtti, type_info[0], base);

1 0

Michael Stefaniuc : mscms: Use assignment instead of memcpy to copy structs .
by Alexandre Julliard 24 Jan '13

24 Jan '13

Module: wine Branch: master Commit: 184f167b190d99b47ff263c8818aee9c5f748e4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=184f167b190d99b47ff263c88… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 24 15:18:09 2013 +0100 mscms: Use assignment instead of memcpy to copy structs. --- dlls/mscms/handle.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mscms/handle.c b/dlls/mscms/handle.c index 1fec810..2f9eaec 100644 --- a/dlls/mscms/handle.c +++ b/dlls/mscms/handle.c @@ -140,7 +140,7 @@ HPROFILE create_profile( struct profile *profile ) if ((handle = alloc_profile_handle())) { DWORD_PTR index = (DWORD_PTR)handle - 1; - memcpy( &profiletable[index], profile, sizeof(struct profile) ); + profiletable[index] = *profile; } LeaveCriticalSection( &MSCMS_handle_cs ); return handle; @@ -221,7 +221,7 @@ HTRANSFORM create_transform( struct transform *transform ) if ((handle = alloc_transform_handle())) { DWORD_PTR index = (DWORD_PTR)handle - 1; - memcpy( &transformtable[index], transform, sizeof(struct transform) ); + transformtable[index] = *transform; } LeaveCriticalSection( &MSCMS_handle_cs ); return handle;

1 0