March 2008 - Wine-Commits - list.winehq.org

Alexandre Julliard : winex11: Remove leftover debugging output.
by Alexandre Julliard March 20, 2008

March 20, 2008

Module: wine Branch: master Commit: 6677e15389909ffa29cd9149bade541c3c5008be URL: http://source.winehq.org/git/wine.git/?a=commit;h=6677e15389909ffa29cd9149b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 19 13:39:37 2008 +0100 winex11: Remove leftover debugging output. --- dlls/winex11.drv/winpos.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c index b444423..25e643e 100644 --- a/dlls/winex11.drv/winpos.c +++ b/dlls/winex11.drv/winpos.c @@ -196,10 +196,7 @@ static void update_net_wm_states( Display *display, struct x11drv_win_data *data ex_style = GetWindowLongW( data->hwnd, GWL_EXSTYLE ); if (ex_style & WS_EX_TOPMOST) - { new_state |= (1 << NET_WM_STATE_ABOVE); - ERR("switching window %p/%lx to STATE_ABOVE\n", data->hwnd, data->whole_window); - } if (ex_style & WS_EX_TOOLWINDOW) new_state |= (1 << NET_WM_STATE_SKIP_TASKBAR) | (1 << NET_WM_STATE_SKIP_PAGER);

1 0

Jacek Caban : jscript: Added IActiveScriptProperty stub implementation.
by Alexandre Julliard March 19, 2008

March 19, 2008

Module: wine Branch: master Commit: 9ff3c3955d4dbe48d5160ae769c17a83f6c8f84b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ff3c3955d4dbe48d5160ae76… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 19 11:31:54 2008 +0100 jscript: Added IActiveScriptProperty stub implementation. --- dlls/jscript/jscript.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 52 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index c128906..21ffeff 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -26,12 +26,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(jscript); typedef struct { const IActiveScriptVtbl *lpIActiveScriptVtbl; const IActiveScriptParseVtbl *lpIActiveScriptParseVtbl; + const IActiveScriptPropertyVtbl *lpIActiveScriptPropertyVtbl; LONG ref; } JScript; #define ACTSCRIPT(x) ((IActiveScript*) &(x)->lpIActiveScriptVtbl) #define ASPARSE(x) ((IActiveScriptParse*) &(x)->lpIActiveScriptParseVtbl) +#define ACTSCPPROP(x) ((IActiveScriptProperty*) &(x)->lpIActiveScriptPropertyVtbl) #define ACTSCRIPT_THIS(iface) DEFINE_THIS(JScript, IActiveScript, iface) @@ -50,6 +52,9 @@ static HRESULT WINAPI JScript_QueryInterface(IActiveScript *iface, REFIID riid, }else if(IsEqualGUID(riid, &IID_IActiveScriptParse)) { TRACE("(%p)->(IID_IActiveScriptParse %p)\n", This, ppv); *ppv = ASPARSE(This); + }else if(IsEqualGUID(riid, &IID_IActiveScriptProperty)) { + TRACE("(%p)->(IID_IActiveScriptProperty %p)\n", This, ppv); + *ppv = ACTSCPPROP(This); } if(*ppv) { @@ -269,6 +274,52 @@ static const IActiveScriptParseVtbl JScriptParseVtbl = { JScriptParse_ParseScriptText }; +#define ACTSCPPROP_THIS(iface) DEFINE_THIS(JScript, IActiveScriptProperty, iface) + +static HRESULT WINAPI JScriptProperty_QueryInterface(IActiveScriptProperty *iface, REFIID riid, void **ppv) +{ + JScript *This = ACTSCPPROP_THIS(iface); + return IActiveScript_QueryInterface(ACTSCRIPT(This), riid, ppv); +} + +static ULONG WINAPI JScriptProperty_AddRef(IActiveScriptProperty *iface) +{ + JScript *This = ACTSCPPROP_THIS(iface); + return IActiveScript_AddRef(ACTSCRIPT(This)); +} + +static ULONG WINAPI JScriptProperty_Release(IActiveScriptProperty *iface) +{ + JScript *This = ACTSCPPROP_THIS(iface); + return IActiveScript_Release(ACTSCRIPT(This)); +} + +static HRESULT WINAPI JScriptProperty_GetProperty(IActiveScriptProperty *iface, DWORD dwProperty, + VARIANT *pvarIndex, VARIANT *pvarValue) +{ + JScript *This = ACTSCPPROP_THIS(iface); + FIXME("(%p)->(%x %p %p)\n", This, dwProperty, pvarIndex, pvarValue); + return E_NOTIMPL; +} + +static HRESULT WINAPI JScriptProperty_SetProperty(IActiveScriptProperty *iface, DWORD dwProperty, + VARIANT *pvarIndex, VARIANT *pvarValue) +{ + JScript *This = ACTSCPPROP_THIS(iface); + FIXME("(%p)->(%x %p %p)\n", This, dwProperty, pvarIndex, pvarValue); + return E_NOTIMPL; +} + +#undef ACTSCPPROP_THIS + +static const IActiveScriptPropertyVtbl JScriptPropertyVtbl = { + JScriptProperty_QueryInterface, + JScriptProperty_AddRef, + JScriptProperty_Release, + JScriptProperty_GetProperty, + JScriptProperty_SetProperty +}; + HRESULT WINAPI JScriptFactory_CreateInstance(IClassFactory *iface, IUnknown *pUnkOuter, REFIID riid, void **ppv) { @@ -281,6 +332,7 @@ HRESULT WINAPI JScriptFactory_CreateInstance(IClassFactory *iface, IUnknown *pUn ret->lpIActiveScriptVtbl = &JScriptVtbl; ret->lpIActiveScriptParseVtbl = &JScriptParseVtbl; + ret->lpIActiveScriptPropertyVtbl = &JScriptPropertyVtbl; ret->ref = 1; hres = IActiveScript_QueryInterface(ACTSCRIPT(ret), riid, ppv);

1 0

Jacek Caban : jscript: Added IActiveScriptParse stub implementation.
by Alexandre Julliard March 19, 2008

March 19, 2008

Module: wine Branch: master Commit: 12a589843607bd413086dea9596fa1b426e4a559 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12a589843607bd413086dea95… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 19 11:31:36 2008 +0100 jscript: Added IActiveScriptParse stub implementation. --- dlls/jscript/jscript.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 73 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 948b340..c128906 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -24,12 +24,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(jscript); typedef struct { - const IActiveScriptVtbl *lpIActiveScriptVtbl; + const IActiveScriptVtbl *lpIActiveScriptVtbl; + const IActiveScriptParseVtbl *lpIActiveScriptParseVtbl; LONG ref; } JScript; -#define ACTSCRIPT(x) ((IActiveScript*) &(x)->lpIActiveScriptVtbl) +#define ACTSCRIPT(x) ((IActiveScript*) &(x)->lpIActiveScriptVtbl) +#define ASPARSE(x) ((IActiveScriptParse*) &(x)->lpIActiveScriptParseVtbl) #define ACTSCRIPT_THIS(iface) DEFINE_THIS(JScript, IActiveScript, iface) @@ -45,6 +47,9 @@ static HRESULT WINAPI JScript_QueryInterface(IActiveScript *iface, REFIID riid, }else if(IsEqualGUID(riid, &IID_IActiveScript)) { TRACE("(%p)->(IID_IActiveScript %p)\n", This, ppv); *ppv = ACTSCRIPT(This); + }else if(IsEqualGUID(riid, &IID_IActiveScriptParse)) { + TRACE("(%p)->(IID_IActiveScriptParse %p)\n", This, ppv); + *ppv = ASPARSE(This); } if(*ppv) { @@ -200,6 +205,70 @@ static const IActiveScriptVtbl JScriptVtbl = { JScript_Clone }; +#define ASPARSE_THIS(iface) DEFINE_THIS(JScript, IActiveScriptParse, iface) + +static HRESULT WINAPI JScriptParse_QueryInterface(IActiveScriptParse *iface, REFIID riid, void **ppv) +{ + JScript *This = ASPARSE_THIS(iface); + return IActiveScript_QueryInterface(ACTSCRIPT(This), riid, ppv); +} + +static ULONG WINAPI JScriptParse_AddRef(IActiveScriptParse *iface) +{ + JScript *This = ASPARSE_THIS(iface); + return IActiveScript_AddRef(ACTSCRIPT(This)); +} + +static ULONG WINAPI JScriptParse_Release(IActiveScriptParse *iface) +{ + JScript *This = ASPARSE_THIS(iface); + return IActiveScript_Release(ACTSCRIPT(This)); +} + +static HRESULT WINAPI JScriptParse_InitNew(IActiveScriptParse *iface) +{ + JScript *This = ASPARSE_THIS(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI JScriptParse_AddScriptlet(IActiveScriptParse *iface, + LPCOLESTR pstrDefaultName, LPCOLESTR pstrCode, LPCOLESTR pstrItemName, + LPCOLESTR pstrSubItemName, LPCOLESTR pstrEventName, LPCOLESTR pstrDelimiter, + DWORD dwSourceContextCookie, ULONG ulStartingLineNumber, DWORD dwFlags, + BSTR *pbstrName, EXCEPINFO *pexcepinfo) +{ + JScript *This = ASPARSE_THIS(iface); + FIXME("(%p)->(%s %s %s %s %s %s %x %u %x %p %p)\n", This, debugstr_w(pstrDefaultName), + debugstr_w(pstrCode), debugstr_w(pstrItemName), debugstr_w(pstrSubItemName), + debugstr_w(pstrEventName), debugstr_w(pstrDelimiter), dwSourceContextCookie, + ulStartingLineNumber, dwFlags, pbstrName, pexcepinfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI JScriptParse_ParseScriptText(IActiveScriptParse *iface, + LPCOLESTR pstrCode, LPCOLESTR pstrItemName, IUnknown *punkContext, + LPCOLESTR pstrDelimiter, DWORD dwSourceContextCookie, ULONG ulStartingLine, + DWORD dwFlags, VARIANT *pvarResult, EXCEPINFO *pexcepinfo) +{ + JScript *This = ASPARSE_THIS(iface); + FIXME("(%p)->(%s %s %p %s %x %u %x %p %p)\n", This, debugstr_w(pstrCode), + debugstr_w(pstrItemName), punkContext, debugstr_w(pstrDelimiter), + dwSourceContextCookie, ulStartingLine, dwFlags, pvarResult, pexcepinfo); + return E_NOTIMPL; +} + +#undef ASPARSE_THIS + +static const IActiveScriptParseVtbl JScriptParseVtbl = { + JScriptParse_QueryInterface, + JScriptParse_AddRef, + JScriptParse_Release, + JScriptParse_InitNew, + JScriptParse_AddScriptlet, + JScriptParse_ParseScriptText +}; + HRESULT WINAPI JScriptFactory_CreateInstance(IClassFactory *iface, IUnknown *pUnkOuter, REFIID riid, void **ppv) { @@ -210,7 +279,8 @@ HRESULT WINAPI JScriptFactory_CreateInstance(IClassFactory *iface, IUnknown *pUn ret = heap_alloc(sizeof(*ret)); - ret->lpIActiveScriptVtbl = &JScriptVtbl; + ret->lpIActiveScriptVtbl = &JScriptVtbl; + ret->lpIActiveScriptParseVtbl = &JScriptParseVtbl; ret->ref = 1; hres = IActiveScript_QueryInterface(ACTSCRIPT(ret), riid, ppv);

1 0

Andrew Riedi : reg: Add stub 'reg' program.
by Alexandre Julliard March 19, 2008

March 19, 2008

Module: wine Branch: master Commit: 2087ad46a92d8bda9a00e1a2ca7a203401355ac0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2087ad46a92d8bda9a00e1a2c… Author: Andrew Riedi <andrewriedi(a)gmail.com> Date: Tue Mar 18 23:36:28 2008 -0700 reg: Add stub 'reg' program. --- .gitignore | 1 + Makefile.in | 2 + configure | 3 + configure.ac | 1 + programs/Makefile.in | 2 + programs/reg/En.rc | 30 +++++++ programs/reg/Makefile.in | 16 ++++ programs/reg/reg.c | 200 ++++++++++++++++++++++++++++++++++++++++++++++ programs/reg/reg.h | 25 ++++++ programs/reg/rsrc.rc | 25 ++++++ 10 files changed, 305 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2087ad46a92d8bda9a00e…

1 0

Jacek Caban : activscp.idl: Added IActiveScriptProperty declaration.
by Alexandre Julliard March 19, 2008

March 19, 2008

Module: wine Branch: master Commit: e553c56956470f9fe9f0413bc9a75273a16537a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e553c56956470f9fe9f0413bc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 19 11:31:19 2008 +0100 activscp.idl: Added IActiveScriptProperty declaration. --- include/activscp.idl | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/include/activscp.idl b/include/activscp.idl index ea201f5..fe7497f 100644 --- a/include/activscp.idl +++ b/include/activscp.idl @@ -29,6 +29,19 @@ cpp_quote("DEFINE_GUID(CATID_ActiveScriptParse, 0xf0b7a1a2,0x9847,0x11cf,0x8f,0 cpp_quote("DEFINE_GUID(CATID_ActiveScriptEncode, 0xf0b7a1a3,0x9847,0x11cf,0x8f,0x20,0x00,0x80,0x5f,0x2c,0xd0,0x64);") cpp_quote("#endif") + +cpp_quote("#define SCRIPTPROP_NAME 0x00000000") +cpp_quote("#define SCRIPTPROP_MAJORVERSION 0x00000001") +cpp_quote("#define SCRIPTPROP_MINORVERSION 0x00000002") +cpp_quote("#define SCRIPTPROP_BUILDNUMBER 0x00000003") +cpp_quote("#define SCRIPTPROP_DELAYEDEVENTSINKING 0x00001000") +cpp_quote("#define SCRIPTPROP_CATCHEXCEPTION 0x00001001") +cpp_quote("#define SCRIPTPROP_CONVERSIONLCID 0x00001002") +cpp_quote("#define SCRIPTPROP_HOSTSTACKREQUIRED 0x00001003") +cpp_quote("#define SCRIPTPROP_DEBUGGER 0x00001100") +cpp_quote("#define SCRIPTPROP_JITDEBUG 0x00001101") +cpp_quote("#define SCRIPTPROP_HACK_FIBERSUPPORT 0x70000000") +cpp_quote("#define SCRIPTPROP_HACK_TRIDENTEVENTSINK 0x70000001") typedef enum tagSCRIPTSTATE { SCRIPTSTATE_UNINITIALIZED = 0, @@ -363,3 +376,21 @@ interface IActiveScriptStats : IUnknown HRESULT ResetStats(void); } + +[ + object, + uuid(4954e0d0-fbc7-11d1-8410-006008c3fbfc), + pointer_default(unique) +] +interface IActiveScriptProperty : IUnknown +{ + HRESULT GetProperty( + [in] DWORD dwProperty, + [in] VARIANT *pvarIndex, + [out] VARIANT *pvarValue); + + HRESULT SetProperty( + [in] DWORD dwProperty, + [in] VARIANT *pvarIndex, + [in] VARIANT *pvarValue); +}

1 0

Herve Chanal : msiexec: A nicer icon.
by Alexandre Julliard March 19, 2008

March 19, 2008

Module: wine Branch: master Commit: 2115a90a686959bcf28ebbcdc154c408abb75c1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2115a90a686959bcf28ebbcdc… Author: Herve Chanal <chanal_herve(a)yahoo.fr> Date: Tue Mar 18 16:30:19 2008 +0100 msiexec: A nicer icon. --- programs/msiexec/msiexec.ico | Bin 766 -> 19622 bytes 1 files changed, 0 insertions(+), 0 deletions(-) diff --git a/programs/msiexec/msiexec.ico b/programs/msiexec/msiexec.ico index f6bea3c..c8b10d9 100644 Binary files a/programs/msiexec/msiexec.ico and b/programs/msiexec/msiexec.ico differ

1 0

Maarten Lankhorst : quartz: Move IMediaSeeking from the parser pin to the parser filter.
by Alexandre Julliard March 19, 2008

March 19, 2008

Module: wine Branch: master Commit: 796bb9233322df53ea5c772c166484c7754ef822 URL: http://source.winehq.org/git/wine.git/?a=commit;h=796bb9233322df53ea5c772c1… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Mar 18 16:05:00 2008 -0700 quartz: Move IMediaSeeking from the parser pin to the parser filter. This interface really shouldn't be in a pin, but rather in the implementation of the filter, since any seeking is done on the entire filtergraph, so implementing it in the filter makes more sense. --- dlls/quartz/avisplit.c | 30 ++++++++++++++++----- dlls/quartz/control.c | 5 +-- dlls/quartz/control_private.h | 6 ++-- dlls/quartz/filtergraph.c | 2 +- dlls/quartz/mpegsplit.c | 25 ++++++++--------- dlls/quartz/parser.c | 59 +++++++++++++++++++++-------------------- dlls/quartz/parser.h | 9 ++---- dlls/quartz/waveparser.c | 26 ++++++++++------- 8 files changed, 89 insertions(+), 73 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=796bb9233322df53ea5c7…

1 0

Maarten Lankhorst : quartz: Call send flush/ endofstream and segment messages downstream.
by Alexandre Julliard March 19, 2008

March 19, 2008

Module: wine Branch: master Commit: ebf6bbd50f40bb0616607b27fa1040285841a5ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebf6bbd50f40bb0616607b27f… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Mar 18 18:47:17 2008 -0700 quartz: Call send flush/endofstream and segment messages downstream. --- dlls/quartz/pin.c | 156 +++++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 146 insertions(+), 10 deletions(-) diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index c895185..77dabf0 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -37,6 +37,105 @@ static const IPinVtbl PullPin_Vtbl; #define ALIGNDOWN(value,boundary) ((value)/(boundary)*(boundary)) #define ALIGNUP(value,boundary) (ALIGNDOWN((value)+(boundary)-1, (boundary))) +typedef HRESULT (*SendPinFunc)( IPin *to, LPVOID arg ); + +/** Helper function, there are a lot of places where the error code is inherited + * The following rules apply: + * + * Return the first received error code (E_NOTIMPL is ignored) + * If no errors occur: return the first received non-error-code that isn't S_OK + */ +static HRESULT updatehres( HRESULT original, HRESULT new ) +{ + if (FAILED( original ) || new == E_NOTIMPL) + return original; + + if (FAILED( new ) || original == S_OK) + return new; + + return original; +} + +/** Sends a message from a pin further to other, similar pins + * fnMiddle is called on each pin found further on the stream. + * fnEnd (can be NULL) is called when the message can't be sent any further (this is a renderer or source) + * + * If the pin given is an input pin, the message will be sent downstream to other input pins + * If the pin given is an output pin, the message will be sent upstream to other output pins + */ +static HRESULT SendFurther( IPin *from, SendPinFunc fnMiddle, LPVOID arg, SendPinFunc fnEnd ) +{ + PIN_INFO pin_info; + ULONG amount = 0; + HRESULT hr = S_OK; + HRESULT hr_return = S_OK; + IEnumPins *enumpins = NULL; + BOOL foundend = TRUE; + PIN_DIRECTION from_dir; + + IPin_QueryDirection( from, &from_dir ); + + hr = IPin_QueryInternalConnections( from, NULL, &amount ); + if (hr != E_NOTIMPL && amount) + FIXME("Use QueryInternalConnections!\n"); + hr = S_OK; + + pin_info.pFilter = NULL; + hr = IPin_QueryPinInfo( from, &pin_info ); + if (FAILED(hr)) + goto out; + + hr = IBaseFilter_EnumPins( pin_info.pFilter, &enumpins ); + if (FAILED(hr)) + goto out; + + hr = IEnumPins_Reset( enumpins ); + while (hr == S_OK) { + IPin *pin = NULL; + hr = IEnumPins_Next( enumpins, 1, &pin, NULL ); + if (hr == VFW_E_ENUM_OUT_OF_SYNC) + { + hr = IEnumPins_Reset( enumpins ); + continue; + } + if (pin) + { + PIN_DIRECTION dir; + + IPin_QueryDirection( pin, &dir ); + if (dir != from_dir) + { + IPin *connected = NULL; + + foundend = FALSE; + IPin_ConnectedTo( pin, &connected ); + if (connected) + { + HRESULT hr_local; + + hr_local = fnMiddle( pin, arg ); + hr_return = updatehres( hr_return, hr_local ); + IPin_Release(connected); + } + } + IPin_Release( pin ); + } + } while (hr == S_OK); + if (!foundend) + hr = hr_return; + else if (fnEnd) { + HRESULT hr_local; + + hr_local = fnEnd( from, arg ); + hr_return = updatehres( hr_return, hr_local ); + } + +out: + if (pin_info.pFilter) + IBaseFilter_Release( pin_info.pFilter ); + return hr; +} + static inline InputPin *impl_from_IMemInputPin( IMemInputPin *iface ) { return (InputPin *)((char*)iface - FIELD_OFFSET(InputPin, lpVtblMemInput)); @@ -488,36 +587,73 @@ HRESULT WINAPI InputPin_ReceiveConnection(IPin * iface, IPin * pReceivePin, cons return hr; } +static HRESULT deliver_endofstream(IPin* pin, LPVOID unused) +{ + return IPin_EndOfStream( pin ); +} + HRESULT WINAPI InputPin_EndOfStream(IPin * iface) { - TRACE("()\n"); + FIXME("() stub\n"); - return S_OK; + /* Should do an end of stream notification? + * Also, don't accept any more samples from now! + * TODO: Don't accept any more packets + */ + + return SendFurther( iface, deliver_endofstream, NULL, NULL ); +} + +static HRESULT deliver_beginflush(IPin* pin, LPVOID unused) +{ + return IPin_BeginFlush( pin ); } HRESULT WINAPI InputPin_BeginFlush(IPin * iface) { - FIXME("()\n"); - return E_NOTIMPL; + FIXME("() stub\n"); + + /* TODO: Drop all cached packets, and don't accept any more samples! */ + return SendFurther( iface, deliver_beginflush, NULL, NULL ); +} + +static HRESULT deliver_endflush(IPin* pin, LPVOID unused) +{ + return IPin_EndFlush( pin ); } HRESULT WINAPI InputPin_EndFlush(IPin * iface) { - FIXME("()\n"); - return E_NOTIMPL; + FIXME("() stub\n"); + + /* TODO: Accept any samples again */ + return SendFurther( iface, deliver_endflush, NULL, NULL ); +} + +typedef struct newsegmentargs +{ + REFERENCE_TIME tStart, tStop; + double rate; +} newsegmentargs; + +static HRESULT deliver_newsegment(IPin *pin, LPVOID data) +{ + newsegmentargs *args = data; + return IPin_NewSegment(pin, args->tStart, args->tStop, args->rate); } HRESULT WINAPI InputPin_NewSegment(IPin * iface, REFERENCE_TIME tStart, REFERENCE_TIME tStop, double dRate) { InputPin *This = (InputPin *)iface; + newsegmentargs args; TRACE("(%x%08x, %x%08x, %e)\n", (ULONG)(tStart >> 32), (ULONG)tStart, (ULONG)(tStop >> 32), (ULONG)tStop, dRate); - This->tStart = tStart; - This->tStop = tStop; - This->dRate = dRate; + args.tStart = This->tStart = tStart; + args.tStop = This->tStop = tStop; + args.rate = This->dRate = dRate; - return S_OK; + return SendFurther( iface, deliver_newsegment, &args, NULL ); } static const IPinVtbl InputPin_Vtbl =

1 0

Aric Stewart : freetype: Fix a typo that prevented checking more than the first range in Range Format 2 .
by Alexandre Julliard March 19, 2008

March 19, 2008

Module: wine Branch: master Commit: bdaa54e64f9ecdc0daeaf8b3d9dc091e956bebba URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdaa54e64f9ecdc0daeaf8b3d… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Mar 19 13:29:21 2008 +0900 freetype: Fix a typo that prevented checking more than the first range in Range Format 2. --- dlls/gdi32/freetype.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 8c59005..40ada6d 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3830,8 +3830,8 @@ static INT GSUB_is_glyph_covered(LPCVOID table , UINT glyph) return (GET_BE_WORD(cf2->RangeRecord[i].StartCoverageIndex) + glyph - GET_BE_WORD(cf2->RangeRecord[i].Start)); } - return -1; } + return -1; } else ERR("Unknown CoverageFormat %i\n",GET_BE_WORD(cf1->CoverageFormat));

1 0

Frans Kool : comdlg32: Corrected Dutch translations.
by Alexandre Julliard March 19, 2008

March 19, 2008

Module: wine Branch: master Commit: 64b35d85668c75ade6d00e4d234b1b0bc1f035ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=64b35d85668c75ade6d00e4d2… Author: Frans Kool <Frans.Kool(a)gmail.com> Date: Wed Mar 19 08:47:33 2008 +0100 comdlg32: Corrected Dutch translations. --- dlls/comdlg32/cdlg_Nl.rc | 53 ++++++++++++++++++++++++++------------------- 1 files changed, 31 insertions(+), 22 deletions(-) diff --git a/dlls/comdlg32/cdlg_Nl.rc b/dlls/comdlg32/cdlg_Nl.rc index 8167d2e..3b78e6a 100644 --- a/dlls/comdlg32/cdlg_Nl.rc +++ b/dlls/comdlg32/cdlg_Nl.rc @@ -1,5 +1,6 @@ /* * Copyright 1999 Klaas van Gend + * Copyright 2008 Frans Kool * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -35,7 +36,7 @@ FONT 8, "MS Shell Dlg" LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP LTEXT "Bestands&typen:", 1089, 6, 104, 90, 9 COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP - LTEXT "Dri&ves:", 1091, 110, 104, 92, 9 + LTEXT "Schij&ven:", 1091, 110, 104, 92, 9 COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "&Openen", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Annuleren", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP @@ -57,7 +58,7 @@ FONT 8, "MS Shell Dlg" LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP LTEXT "Bestands&typen:", 1089, 6, 104, 90, 9 COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP - LTEXT "Dri&ves:", 1091, 110, 104, 92, 9 + LTEXT "Schij&ven:", 1091, 110, 104, 92, 9 COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "&Opslaan als", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Annuleren", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP @@ -85,7 +86,7 @@ FONT 8, "MS Shell Dlg" LTEXT "Afdruk&kwaliteit:", 1092, 6, 100, 76, 9 COMBOBOX 1136, 80, 100, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP CHECKBOX "Naar &bestand", 1040, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "Condensed", 1041, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "Verkort", 1041, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP } @@ -95,7 +96,7 @@ CAPTION "Afdrukeigenschappen" FONT 8, "MS Shell Dlg" { GROUPBOX "Printer", 1072, 6, 10, 180, 65, BS_GROUPBOX - RADIOBUTTON "&Default Printer", 1056, 16, 20, 80, 12 + RADIOBUTTON "Stan&daard Printer", 1056, 16, 20, 80, 12 LTEXT "[geen]", 1088, 35, 35, 120, 9 RADIOBUTTON "Specifieke &Printer", 1057, 16, 50, 80, 12 COMBOBOX 1136, 35, 65, 149, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP @@ -103,7 +104,7 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "Annuleren", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&Setup", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP GROUPBOX "Afdrukstand", 1073, 6, 85, 100, 50, BS_GROUPBOX - RADIOBUTTON "&Staand", 1058, 50, 100, 40, 12 + RADIOBUTTON "S&taand", 1058, 50, 100, 40, 12 RADIOBUTTON "&Liggend", 1059, 50, 115, 40, 12 ICON "LANDSCAP", 1097, 10, 95, 32, 32 ICON "PORTRAIT", 1098, 10, 95, 32, 32 @@ -250,7 +251,7 @@ CAPTION "Print32" FONT 8, "MS Shell Dlg" { DEFPUSHBUTTON "OK", IDOK, 180,164, 48,14, WS_GROUP | BS_DEFPUSHBUTTON - PUSHBUTTON "Cancel", IDCANCEL, 232,164, 48,14, WS_GROUP + PUSHBUTTON "Annuleren", IDCANCEL, 232,164, 48,14, WS_GROUP PUSHBUTTON "&Help", pshHelp, 50, 161, 48,14, WS_GROUP GROUPBOX "Printer", grp4, 8, 4, 272,84, WS_GROUP @@ -259,15 +260,15 @@ FONT 8, "MS Shell Dlg" LTEXT "&Naam:", stc6, 16, 20, 36,8 COMBOBOX cmb4, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP LTEXT "Status:", stc8, 16, 36, 36,10, SS_NOPREFIX - LTEXT "Dummy State", stc12, 52, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "Dummy Status", stc12, 52, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "Type:", stc7, 16, 48, 36,10, SS_NOPREFIX LTEXT "Dummy Type", stc11, 52, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "Waar:", stc10, 16, 60, 36,10, SS_NOPREFIX - LTEXT "Dummy Location", stc14, 52, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "Dummy Locatie", stc14, 52, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "Opmerking:", stc9, 16, 72, 36,10, SS_NOPREFIX - LTEXT "Dummy Remark", stc13, 52, 72, 152,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "Dummy Opmerking", stc13, 52, 72, 152,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - GROUPBOX "Aantal ", grp2, 160, 92, 120,64, WS_GROUP + GROUPBOX "Aantal", grp2, 160, 92, 120,64, WS_GROUP LTEXT "Aantal e&xemplaren:",stc5,168,108,68,8 ICON "", ico3, 162,124, 76,24, WS_GROUP | SS_CENTERIMAGE CONTROL "&Sorteren", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,240,130,36,12 @@ -290,20 +291,20 @@ CAPTION "Print Setup" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK",IDOK,180,156,48,14,WS_GROUP - PUSHBUTTON "Cancel",IDCANCEL,232,156,48,14 + PUSHBUTTON "Annuleren",IDCANCEL,232,156,48,14 GROUPBOX "Printer", grp4, 8, 4, 272,84, WS_GROUP PUSHBUTTON "&Eigenschappen", psh2, 212, 17, 60,14, WS_GROUP LTEXT "&Naam:", stc6, 16, 20, 36,8 COMBOBOX cmb1, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP LTEXT "Status:", stc8, 16, 36, 36,10, SS_NOPREFIX - LTEXT "Dummy State", stc12, 52, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "Dummy Status", stc12, 52, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "Type:", stc7, 16, 48, 36,10, SS_NOPREFIX LTEXT "Dummy Type", stc11, 52, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "Waar:", stc10, 16, 60, 36,10, SS_NOPREFIX - LTEXT "Dummy Location", stc14, 52, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "Dummy Locatie", stc14, 52, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "Opmerking:", stc9, 16, 72, 36,10, SS_NOPREFIX - LTEXT "Dummy Remark", stc13, 52, 72, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "Dummy Opmerking", stc13, 52, 72, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP GROUPBOX "Papier", grp2, 8, 92, 164,56, WS_GROUP LTEXT "&Grootte:", stc2, 16,108, 36, 8 @@ -343,7 +344,7 @@ BEGIN LTEXT "&Onder:", stc18, 159, 192, 23, 8 EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER DEFPUSHBUTTON "OK", IDOK, 71, 220, 50, 14, BS_PUSHBUTTON - PUSHBUTTON "Cancel", IDCANCEL, 126, 220, 50, 14 + PUSHBUTTON "Annuleren", IDCANCEL, 126, 220, 50, 14 PUSHBUTTON "P&rinter...", psh3, 184, 220, 48, 14 END @@ -406,11 +407,11 @@ beschikbaar" PD32_GENERIC_ERROR "Er onstond een niet nader \ gespecifieerde fout" PD32_DRIVER_UNKNOWN "De printer driver is onbekend" - PD32_NO_DEVICES "Before you can perform printer-related tasks \ -such as page setup or printing a document, you need to install a printer. \ -Please install one and retry." + PD32_NO_DEVICES "Voordat u printer-gerelateerde taken \ +zoals pagina instellingen of het printen van een document kun uitvoeren, moet u een \ +printer installeren. Installeer een printer en probeer het opnieuw." - PD32_DEFAULT_PRINTER "Default Printer, " + PD32_DEFAULT_PRINTER "Standaard Printer, " PD32_NR_OF_DOCUMENTS_IN_QUEUE "Er staan %d documenten in de \ wachtrij" PD32_MARGINS_IN_INCHES "Marges [inch]" @@ -421,7 +422,7 @@ wachtrij" PD32_PRINTER_STATUS_PAUSED "Gepauseerd, " PD32_PRINTER_STATUS_ERROR "Fout, " PD32_PRINTER_STATUS_PENDING_DELETION "Bezig met verwijderen, " - PD32_PRINTER_STATUS_PAPER_JAM "Paper jam, " + PD32_PRINTER_STATUS_PAPER_JAM "Papier opstopping, " PD32_PRINTER_STATUS_PAPER_OUT "Papier is op, " PD32_PRINTER_STATUS_MANUAL_FEED "Voer s.v.p. met de hand papier in, " PD32_PRINTER_STATUS_PAPER_PROBLEM "Papier probleem, " @@ -432,7 +433,7 @@ wachtrij" PD32_PRINTER_STATUS_OUTPUT_BIN_FULL "De uitvoerlade is vol, " PD32_PRINTER_STATUS_NOT_AVAILABLE "Niet aanwezig, " PD32_PRINTER_STATUS_WAITING "Aan het wachten, " - PD32_PRINTER_STATUS_PROCESSING "Aan het Verwerken, " + PD32_PRINTER_STATUS_PROCESSING "Aan het verwerken, " PD32_PRINTER_STATUS_INITIALIZING "Aan het opstarten, " PD32_PRINTER_STATUS_WARMING_UP "Aan het opwarmen, " PD32_PRINTER_STATUS_TONER_LOW "Er is nog maar weinig toner, " @@ -442,7 +443,15 @@ wachtrij" PD32_PRINTER_STATUS_OUT_OF_MEMORY "Onvoldoende geheugen beschikbaar, " PD32_PRINTER_STATUS_DOOR_OPEN "De printer staat is open, " PD32_PRINTER_STATUS_SERVER_UNKNOWN "Print server onbekend; " - PD32_PRINTER_STATUS_POWER_SAVE "Power safe mode; " + PD32_PRINTER_STATUS_POWER_SAVE "Power safe modus; " +} + +STRINGTABLE DISCARDABLE /* Font styles */ +{ + IDS_FONT_REGULAR "Normaal" + IDS_FONT_BOLD "Vet" + IDS_FONT_ITALIC "Cursief" + IDS_FONT_BOLD_ITALIC "Vet-Cursief" } STRINGTABLE DISCARDABLE /* Color names */

1 0