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

Maarten Lankhorst : quartz: Fix time discontinuities in the acm wrapper.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: b7e20bfdd1bc9777e56cb3fe73976e38146c1741 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7e20bfdd1bc9777e56cb3fe7… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Apr 25 14:15:42 2008 -0700 quartz: Fix time discontinuities in the acm wrapper. --- dlls/quartz/acmwrapper.c | 42 ++++++++++++++++++++++++++++++++++-------- 1 files changed, 34 insertions(+), 8 deletions(-) diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index 11b07f1..65f196a 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -47,6 +47,9 @@ typedef struct ACMWrapperImpl HACMSTREAM has; LPWAVEFORMATEX pWfIn; LPWAVEFORMATEX pWfOut; + + LONGLONG lasttime_real; + LONGLONG lasttime_sent; } ACMWrapperImpl; static HRESULT ACMWrapper_ProcessSampleData(TransformFilterImpl* pTransformFilter, IMediaSample *pSample) @@ -75,6 +78,19 @@ static HRESULT ACMWrapper_ProcessSampleData(TransformFilterImpl* pTransformFilte IMediaSample_GetTime(pSample, &tStart, &tStop); cbSrcStream = IMediaSample_GetActualDataLength(pSample); + /* Prevent discontinuities when codecs 'absorb' data but not give anything back in return */ + if (IMediaSample_IsDiscontinuity(pSample) == S_OK) + { + This->lasttime_real = tStart; + This->lasttime_sent = tStart; + } + else if (This->lasttime_real == tStart) + tStart = This->lasttime_sent; + else + WARN("Discontinuity\n"); + + tMed = tStart; + TRACE("Sample data ptr = %p, size = %ld\n", pbSrcStream, (long)cbSrcStream); hr = IPin_ConnectionMediaType(This->tf.ppPins[0], &amt); @@ -132,19 +148,20 @@ static HRESULT ACMWrapper_ProcessSampleData(TransformFilterImpl* pTransformFilte if (res) { - if(res != MMSYSERR_MOREDATA) - ERR("Cannot convert data header %d\n", res); - goto error; - } + if(res != MMSYSERR_MOREDATA) + ERR("Cannot convert data header %d\n", res); + goto error; + } - TRACE("used in %u/%u, used out %u/%u\n", ash.cbSrcLengthUsed, ash.cbSrcLength, ash.cbDstLengthUsed, ash.cbDstLength); + TRACE("used in %u/%u, used out %u/%u\n", ash.cbSrcLengthUsed, ash.cbSrcLength, ash.cbDstLengthUsed, ash.cbDstLength); - hr = IMediaSample_SetActualDataLength(pOutSample, ash.cbDstLengthUsed); - assert(hr == S_OK); + hr = IMediaSample_SetActualDataLength(pOutSample, ash.cbDstLengthUsed); + assert(hr == S_OK); + /* Bug in acm codecs? It apparantly uses the input, but doesn't necessarily output immediately kl*/ if (!ash.cbSrcLengthUsed) { - WARN("Sample was skipped\n"); + WARN("Sample was skipped? Outputted: %u\n", ash.cbDstLengthUsed); ash.cbSrcLength = 0; goto error; } @@ -187,8 +204,15 @@ error: if (pOutSample) IMediaSample_Release(pOutSample); pOutSample = NULL; + } + This->lasttime_real = tStop; + This->lasttime_sent = tMed; + + if (hr != S_OK) + FIXME("FATALITY: %08x\n", hr); + return hr; } @@ -252,6 +276,7 @@ static HRESULT ACMWrapper_Cleanup(TransformFilterImpl* pTransformFilter) acmStreamClose(This->has, 0); This->has = 0; + This->lasttime_real = This->lasttime_sent = -1; return S_OK; } @@ -287,6 +312,7 @@ HRESULT ACMWrapper_create(IUnknown * pUnkOuter, LPVOID * ppv) return hr; *ppv = (LPVOID)This; + This->lasttime_real = This->lasttime_sent = -1; return hr; }

1 0

Kirill K. Smirnov : winhelp: Shift by 6 not 4 in case of old 3.0 file.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: bfaeb42b09b79eb87e87c285d53ccd4b9ef46e8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfaeb42b09b79eb87e87c285d… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Fri Apr 25 19:41:44 2008 +0400 winhelp: Shift by 6 not 4 in case of old 3.0 file. This necessary piece of code was lost. Restore it. --- programs/winhelp/hlpfile.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/programs/winhelp/hlpfile.c b/programs/winhelp/hlpfile.c index ca46d3a..15ca70f 100644 --- a/programs/winhelp/hlpfile.c +++ b/programs/winhelp/hlpfile.c @@ -1267,7 +1267,10 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, BYTE format += 5; } else nc++; - format += 4; + if (buf[0x14] == 0x01) + format += 6; + else + format += 4; bits = GET_USHORT(format, 0); format += 2; if (bits & 0x0001) fetch_long(&format); if (bits & 0x0002)

1 0

Kirill K. Smirnov : winhelp: Fix possible copy/paste error.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: 471d68c1d1c85c02c91ecad7c59729ff9a44553d URL: http://source.winehq.org/git/wine.git/?a=commit;h=471d68c1d1c85c02c91ecad7c… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Fri Apr 25 19:42:34 2008 +0400 winhelp: Fix possible copy/paste error. --- programs/winhelp/hlpfile.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winhelp/hlpfile.c b/programs/winhelp/hlpfile.c index 15ca70f..e7ae75e 100644 --- a/programs/winhelp/hlpfile.c +++ b/programs/winhelp/hlpfile.c @@ -2243,7 +2243,7 @@ static BOOL HLPFILE_UncompressLZ77_Phrases(HLPFILE* hlpfile) } for (i = 0; i <= num; i++) - hlpfile->phrases_offsets[i] = GET_USHORT(buf, 0x11 + 2 * i) - 2 * num - 2; + hlpfile->phrases_offsets[i] = GET_USHORT(buf, head_size + 2 * i) - 2 * num - 2; if (hlpfile->version <= 16) memcpy(hlpfile->phrases_buffer, buf + 15 + 2*num, dec_size);

1 0

Maarten Lankhorst : quartz: Add a vtable argument to Parser_Create that individual filters can override .
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: 1f136a57f7a54b78741540ae34378d7624bb1f3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f136a57f7a54b78741540ae3… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Apr 23 11:23:43 2008 -0700 quartz: Add a vtable argument to Parser_Create that individual filters can override. --- dlls/quartz/avisplit.c | 21 ++++++++- dlls/quartz/mpegsplit.c | 21 ++++++++- dlls/quartz/parser.c | 121 +++++++++++++++++---------------------------- dlls/quartz/parser.h | 27 +++++++++-- dlls/quartz/waveparser.c | 21 ++++++++- 5 files changed, 129 insertions(+), 82 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1f136a57f7a54b7874154…

1 0

Rob Shearman : widl: Accept integer constant suffixes in the lexer.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: 0cb73cef0be2e75cefd8878837df0ecc0599508a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cb73cef0be2e75cefd887883… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Apr 27 23:05:31 2008 +0100 widl: Accept integer constant suffixes in the lexer. --- tools/widl/parser.l | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 3bc2b62..c0fbd7d 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -25,9 +25,11 @@ nl \r?\n ws [ \f\t\r] cident [a-zA-Z_][0-9a-zA-Z_]* -int [0-9]+ +u_suffix (u|U) +l_suffix (l|L) +int [0-9]+({l_suffix}?{u_suffix}?|{u_suffix}?{l_suffix}?)? hexd [0-9a-fA-F] -hex 0(x|X){hexd}+ +hex 0(x|X){hexd}+({l_suffix}?{u_suffix}?|{u_suffix}?{l_suffix}?)? uuid {hexd}{8}-{hexd}{4}-{hexd}{4}-{hexd}{4}-{hexd}{12} double [0-9]+\.[0-9]+([eE][+-]?[0-9]+)*

1 0

Kirill K. Smirnov : winhelp: We can reference any page in HLPFILE_BrowsePage(). Perform similar change in HLPFILE_DoReadHlpFile() for the symmetry.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: 5744fb45cfb5631dd5dbec05a426b051ef0227a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5744fb45cfb5631dd5dbec05a… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Fri Apr 25 19:38:30 2008 +0400 winhelp: We can reference any page in HLPFILE_BrowsePage(). Perform similar change in HLPFILE_DoReadHlpFile() for the symmetry. --- programs/winhelp/hlpfile.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winhelp/hlpfile.c b/programs/winhelp/hlpfile.c index f5935a1..ca46d3a 100644 --- a/programs/winhelp/hlpfile.c +++ b/programs/winhelp/hlpfile.c @@ -327,7 +327,7 @@ static BOOL HLPFILE_DoReadHlpFile(HLPFILE *hlpfile, LPCSTR lpszPath) offset = (ref - 0x0C) & 0x3FFF; } - if (hlpfile->version <= 16 && index != old_index && index != 0) + if (hlpfile->version <= 16 && index != old_index && old_index != -1) { /* we jumped to the next block, adjust pointers */ ref -= 12; @@ -1770,7 +1770,7 @@ BOOL HLPFILE_BrowsePage(HLPFILE_PAGE* page, struct RtfData* rd) offset = (ref - 0x0C) & 0x3FFF; } - if (hlpfile->version <= 16 && index != old_index && index != 0) + if (hlpfile->version <= 16 && index != old_index && old_index != -1) { /* we jumped to the next block, adjust pointers */ ref -= 12;

1 0

Rob Shearman : widl: Add typedefs to typelibs which have the public or uuid attributes, not any other attribute.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: 80be9df3a709c8da8a37de4727ba043a42ae5a7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=80be9df3a709c8da8a37de472… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sat Apr 26 09:51:28 2008 +0100 widl: Add typedefs to typelibs which have the public or uuid attributes, not any other attribute. --- tools/widl/parser.y | 7 ++++--- tools/widl/typelib.c | 2 +- tools/widl/write_msft.c | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 8e0ff86..45fbd82 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1676,8 +1676,7 @@ static type_t *reg_typedefs(type_t *type, declarator_list_t *decls, attr_list_t /* We must generate names for tagless enum, struct or union. Typedef-ing a tagless enum, struct or union means we want the typedef - to be included in a library whether it has other attributes or not, - hence the public attribute. */ + to be included in a library hence the public attribute. */ if ((type->kind == TKIND_ENUM || type->kind == TKIND_RECORD || type->kind == TKIND_UNION) && ! type->name && ! parse_only) { @@ -1685,6 +1684,8 @@ static type_t *reg_typedefs(type_t *type, declarator_list_t *decls, attr_list_t attrs = append_attr( attrs, make_attr(ATTR_PUBLIC) ); type->name = gen_name(); } + else if (is_attr(attrs, ATTR_UUID) && !is_attr(attrs, ATTR_PUBLIC)) + attrs = append_attr( attrs, make_attr(ATTR_PUBLIC) ); LIST_FOR_EACH_ENTRY( decl, decls, const declarator_t, entry ) { @@ -2650,7 +2651,7 @@ static statement_t *process_typedefs(declarator_list_t *decls) if (! parse_only && do_header) write_typedef(type); - if (in_typelib && type->attrs) + if (in_typelib && is_attr(type->attrs, ATTR_PUBLIC)) add_typelib_entry(type); type_list = &(*type_list)->next; diff --git a/tools/widl/typelib.c b/tools/widl/typelib.c index cd1c69b..7000788 100644 --- a/tools/widl/typelib.c +++ b/tools/widl/typelib.c @@ -173,7 +173,7 @@ unsigned short get_type_vt(type_t *t) if (vt) return vt; } - if (t->kind == TKIND_ALIAS && t->attrs) + if (t->kind == TKIND_ALIAS && is_attr(t->attrs, ATTR_PUBLIC)) return VT_USERDEFINED; switch (t->type) { diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index f040dbe..35c1f05 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -962,8 +962,8 @@ static int encode_type( { int typeinfo_offset; - /* typedef'd types without attributes aren't included in the typelib */ - while (type->typelib_idx < 0 && type->kind == TKIND_ALIAS && ! type->attrs) + /* typedef'd types without public attribute aren't included in the typelib */ + while (type->typelib_idx < 0 && type->kind == TKIND_ALIAS && !is_attr(type->attrs, ATTR_PUBLIC)) type = type->orig; chat("encode_type: VT_USERDEFINED - type %p name = %s type->type %d idx %d\n", type,

1 0

Rob Shearman : widl: Support hex digits that use an uppercase 0X prefix.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: 62a64755934591850420b5c45b222637ca8cfef2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62a64755934591850420b5c45… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sat Apr 26 09:51:47 2008 +0100 widl: Support hex digits that use an uppercase 0X prefix. --- tools/widl/parser.l | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 1e8460b..3bc2b62 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -27,7 +27,7 @@ ws [ \f\t\r] cident [a-zA-Z_][0-9a-zA-Z_]* int [0-9]+ hexd [0-9a-fA-F] -hex 0x{hexd}+ +hex 0(x|X){hexd}+ uuid {hexd}{8}-{hexd}{4}-{hexd}{4}-{hexd}{4}-{hexd}{12} double [0-9]+\.[0-9]+([eE][+-]?[0-9]+)*

1 0

Dmitry Timoshkov : winecfg: Update Russian translation.
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: 1d70c7ada499fe3e36e00b6b2f9dadf5b724ec9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d70c7ada499fe3e36e00b6b2… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Apr 28 17:49:51 2008 +0900 winecfg: Update Russian translation. --- programs/winecfg/Ru.rc | 25 ++++++++++++++++--------- 1 files changed, 16 insertions(+), 9 deletions(-) diff --git a/programs/winecfg/Ru.rc b/programs/winecfg/Ru.rc index 25c41bd..ac5de25 100644 --- a/programs/winecfg/Ru.rc +++ b/programs/winecfg/Ru.rc @@ -66,17 +66,24 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX " �� ",IDC_STATIC,8,4,244,180 - CONTROL "�� DirectX �� ",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,14,235,8 - CONTROL "�� Wine",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,34,230,8 + CONTROL "�� DirectX �� ",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,235,8 + + CONTROL "�� &�� ",IDC_ENABLE_DECORATED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,30,230,8 + + CONTROL "�� Wine",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,40,230,8 + + LTEXT "�� , �� , �� , � �� .\n\n�� , �� . �� , �� , �� , � �� .", + IDC_STATIC,19,51,225,80 CONTROL "�� ",IDC_ENABLE_DESKTOP,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,15,152,230,10 - LTEXT "�� , �� '�� ' �� . �� , �� , �� .", - IDC_STATIC,15,117,228,36 - LTEXT "�� :",IDC_DESKTOP_SIZE,15,167,44,8,WS_DISABLED - LTEXT "X",IDC_DESKTOP_BY,108,167,8,8,WS_DISABLED - EDITTEXT IDC_DESKTOP_WIDTH,64,167,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED - EDITTEXT IDC_DESKTOP_HEIGHT,117,167,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED + BS_AUTOCHECKBOX | WS_TABSTOP,15,128,230,10 + LTEXT "�� Windows �� , �� , �� .", + IDC_STATIC,19,138,225,28 + + LTEXT "�� :",IDC_DESKTOP_SIZE,15,168,84,8,WS_DISABLED + LTEXT "X",IDC_DESKTOP_BY,149,168,8,8,WS_DISABLED + EDITTEXT IDC_DESKTOP_WIDTH,104,166,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED + EDITTEXT IDC_DESKTOP_HEIGHT,157,166,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED GROUPBOX " Direct3D ",IDC_STATIC,8,189,244,45

1 0

Rob Shearman : rpcrt4: Use safe_copy_from_buffer instead of direct memory copy in NdrBaseTypeUnmarshall .
by Alexandre Julliard 28 Apr '08

28 Apr '08

Module: wine Branch: master Commit: 8e08b1dd7f2b0ff6f72c5bcdf3e2f67a8c1cf448 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e08b1dd7f2b0ff6f72c5bcdf… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Apr 28 10:21:33 2008 +0100 rpcrt4: Use safe_copy_from_buffer instead of direct memory copy in NdrBaseTypeUnmarshall. This makes the code check that the buffer is big enough to read from before copying the data from it. The safe_buffer_increment call is still needed for the case where we point the memory to the buffer, so move the call there. --- dlls/rpcrt4/ndr_marshall.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 25e6853..bdc5098 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -6051,15 +6051,15 @@ static unsigned char *WINAPI NdrBaseTypeUnmarshall( { \ *ppMemory = pStubMsg->Buffer; \ TRACE("*ppMemory: %p\n", *ppMemory); \ + safe_buffer_increment(pStubMsg, sizeof(type)); \ } \ else \ { \ if (fMustAlloc) \ *ppMemory = NdrAllocate(pStubMsg, sizeof(type)); \ TRACE("*ppMemory: %p\n", *ppMemory); \ - **(type **)ppMemory = *(type *)pStubMsg->Buffer; \ - } \ - safe_buffer_increment(pStubMsg, sizeof(type)); + safe_copy_from_buffer(pStubMsg, *ppMemory, sizeof(type)); \ + } switch(*pFormat) {

1 0