December 2010 - Wine-commits

Michael Stefaniuc : mshtml: Use an iface instead of a vtbl pointer in HTMLBodyElement.
by Alexandre Julliard 06 Dec '10

06 Dec '10

Module: wine Branch: master Commit: f419f8e0b7ecec9f42ff1c4f6d143e8a48c8220b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f419f8e0b7ecec9f42ff1c4f6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 6 16:44:18 2010 +0100 mshtml: Use an iface instead of a vtbl pointer in HTMLBodyElement. --- dlls/mshtml/htmlbody.c | 103 ++++++++++++++++++++++++------------------------ 1 files changed, 51 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f419f8e0b7ecec9f42ff1…

1 0

Michael Stefaniuc : mshtml: Use an iface instead of a vtbl pointer in HTMLRect.
by Alexandre Julliard 06 Dec '10

06 Dec '10

Module: wine Branch: master Commit: 28c0256635ad704c122b2c9231f730fdc45585d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28c0256635ad704c122b2c923… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 6 16:44:58 2010 +0100 mshtml: Use an iface instead of a vtbl pointer in HTMLRect. --- dlls/mshtml/htmlelem2.c | 51 +++++++++++++++++++++++------------------------ 1 files changed, 25 insertions(+), 26 deletions(-) diff --git a/dlls/mshtml/htmlelem2.c b/dlls/mshtml/htmlelem2.c index 0c20723..f6d7bfc 100644 --- a/dlls/mshtml/htmlelem2.c +++ b/dlls/mshtml/htmlelem2.c @@ -36,27 +36,28 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); typedef struct { DispatchEx dispex; - const IHTMLRectVtbl *lpIHTMLRectVtbl; + IHTMLRect IHTMLRect_iface; LONG ref; nsIDOMClientRect *nsrect; } HTMLRect; -#define HTMLRECT(x) ((IHTMLRect*) &(x)->lpIHTMLRectVtbl) - -#define HTMLRECT_THIS(iface) DEFINE_THIS(HTMLRect, IHTMLRect, iface) +static inline HTMLRect *impl_from_IHTMLRect(IHTMLRect *iface) +{ + return CONTAINING_RECORD(iface, HTMLRect, IHTMLRect_iface); +} static HRESULT WINAPI HTMLRect_QueryInterface(IHTMLRect *iface, REFIID riid, void **ppv) { - HTMLRect *This = HTMLRECT_THIS(iface); + HTMLRect *This = impl_from_IHTMLRect(iface); if(IsEqualGUID(&IID_IUnknown, riid)) { TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); - *ppv = HTMLRECT(This); + *ppv = &This->IHTMLRect_iface; }else if(IsEqualGUID(&IID_IHTMLRect, riid)) { TRACE("(%p)->(IID_IHTMLRect %p)\n", This, ppv); - *ppv = HTMLRECT(This); + *ppv = &This->IHTMLRect_iface; }else if(dispex_query_interface(&This->dispex, riid, ppv)) { return *ppv ? S_OK : E_NOINTERFACE; }else { @@ -71,7 +72,7 @@ static HRESULT WINAPI HTMLRect_QueryInterface(IHTMLRect *iface, REFIID riid, voi static ULONG WINAPI HTMLRect_AddRef(IHTMLRect *iface) { - HTMLRect *This = HTMLRECT_THIS(iface); + HTMLRect *This = impl_from_IHTMLRect(iface); LONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); @@ -81,7 +82,7 @@ static ULONG WINAPI HTMLRect_AddRef(IHTMLRect *iface) static ULONG WINAPI HTMLRect_Release(IHTMLRect *iface) { - HTMLRect *This = HTMLRECT_THIS(iface); + HTMLRect *This = impl_from_IHTMLRect(iface); LONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); @@ -97,7 +98,7 @@ static ULONG WINAPI HTMLRect_Release(IHTMLRect *iface) static HRESULT WINAPI HTMLRect_GetTypeInfoCount(IHTMLRect *iface, UINT *pctinfo) { - HTMLRect *This = HTMLRECT_THIS(iface); + HTMLRect *This = impl_from_IHTMLRect(iface); FIXME("(%p)->(%p)\n", This, pctinfo); return E_NOTIMPL; } @@ -105,7 +106,7 @@ static HRESULT WINAPI HTMLRect_GetTypeInfoCount(IHTMLRect *iface, UINT *pctinfo) static HRESULT WINAPI HTMLRect_GetTypeInfo(IHTMLRect *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { - HTMLRect *This = HTMLRECT_THIS(iface); + HTMLRect *This = impl_from_IHTMLRect(iface); return IDispatchEx_GetTypeInfo(DISPATCHEX(&This->dispex), iTInfo, lcid, ppTInfo); } @@ -113,7 +114,7 @@ static HRESULT WINAPI HTMLRect_GetTypeInfo(IHTMLRect *iface, UINT iTInfo, static HRESULT WINAPI HTMLRect_GetIDsOfNames(IHTMLRect *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { - HTMLRect *This = HTMLRECT_THIS(iface); + HTMLRect *This = impl_from_IHTMLRect(iface); return IDispatchEx_GetIDsOfNames(DISPATCHEX(&This->dispex), riid, rgszNames, cNames, lcid, rgDispId); } @@ -122,7 +123,7 @@ static HRESULT WINAPI HTMLRect_Invoke(IHTMLRect *iface, DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { - HTMLRect *This = HTMLRECT_THIS(iface); + HTMLRect *This = impl_from_IHTMLRect(iface); return IDispatchEx_Invoke(DISPATCHEX(&This->dispex), dispIdMember, riid, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); @@ -130,14 +131,14 @@ static HRESULT WINAPI HTMLRect_Invoke(IHTMLRect *iface, DISPID dispIdMember, static HRESULT WINAPI HTMLRect_put_left(IHTMLRect *iface, LONG v) { - HTMLRect *This = HTMLRECT_THIS(iface); + HTMLRect *This = impl_from_IHTMLRect(iface); FIXME("(%p)->(%d)\n", This, v); return E_NOTIMPL; } static HRESULT WINAPI HTMLRect_get_left(IHTMLRect *iface, LONG *p) { - HTMLRect *This = HTMLRECT_THIS(iface); + HTMLRect *This = impl_from_IHTMLRect(iface); float left; nsresult nsres; @@ -155,14 +156,14 @@ static HRESULT WINAPI HTMLRect_get_left(IHTMLRect *iface, LONG *p) static HRESULT WINAPI HTMLRect_put_top(IHTMLRect *iface, LONG v) { - HTMLRect *This = HTMLRECT_THIS(iface); + HTMLRect *This = impl_from_IHTMLRect(iface); FIXME("(%p)->(%d)\n", This, v); return E_NOTIMPL; } static HRESULT WINAPI HTMLRect_get_top(IHTMLRect *iface, LONG *p) { - HTMLRect *This = HTMLRECT_THIS(iface); + HTMLRect *This = impl_from_IHTMLRect(iface); float top; nsresult nsres; @@ -180,14 +181,14 @@ static HRESULT WINAPI HTMLRect_get_top(IHTMLRect *iface, LONG *p) static HRESULT WINAPI HTMLRect_put_right(IHTMLRect *iface, LONG v) { - HTMLRect *This = HTMLRECT_THIS(iface); + HTMLRect *This = impl_from_IHTMLRect(iface); FIXME("(%p)->(%d)\n", This, v); return E_NOTIMPL; } static HRESULT WINAPI HTMLRect_get_right(IHTMLRect *iface, LONG *p) { - HTMLRect *This = HTMLRECT_THIS(iface); + HTMLRect *This = impl_from_IHTMLRect(iface); float right; nsresult nsres; @@ -205,14 +206,14 @@ static HRESULT WINAPI HTMLRect_get_right(IHTMLRect *iface, LONG *p) static HRESULT WINAPI HTMLRect_put_bottom(IHTMLRect *iface, LONG v) { - HTMLRect *This = HTMLRECT_THIS(iface); + HTMLRect *This = impl_from_IHTMLRect(iface); FIXME("(%p)->(%d)\n", This, v); return E_NOTIMPL; } static HRESULT WINAPI HTMLRect_get_bottom(IHTMLRect *iface, LONG *p) { - HTMLRect *This = HTMLRECT_THIS(iface); + HTMLRect *This = impl_from_IHTMLRect(iface); float bottom; nsresult nsres; @@ -228,8 +229,6 @@ static HRESULT WINAPI HTMLRect_get_bottom(IHTMLRect *iface, LONG *p) return S_OK; } -#undef HTMLRECT_THIS - static const IHTMLRectVtbl HTMLRectVtbl = { HTMLRect_QueryInterface, HTMLRect_AddRef, @@ -267,15 +266,15 @@ static HRESULT create_html_rect(nsIDOMClientRect *nsrect, IHTMLRect **ret) if(!rect) return E_OUTOFMEMORY; - rect->lpIHTMLRectVtbl = &HTMLRectVtbl; + rect->IHTMLRect_iface.lpVtbl = &HTMLRectVtbl; rect->ref = 1; - init_dispex(&rect->dispex, (IUnknown*)HTMLRECT(rect), &HTMLRect_dispex); + init_dispex(&rect->dispex, (IUnknown*)&rect->IHTMLRect_iface, &HTMLRect_dispex); nsIDOMClientRect_AddRef(nsrect); rect->nsrect = nsrect; - *ret = HTMLRECT(rect); + *ret = &rect->IHTMLRect_iface; return S_OK; }

1 0

Michael Stefaniuc : mmdevapi: Use an iface instead of a vtbl pointer in IClassFactoryImpl.
by Alexandre Julliard 06 Dec '10

06 Dec '10

Module: wine Branch: master Commit: ef039627a5cc193f6308aab554c207992439579e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef039627a5cc193f6308aab55… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Dec 5 15:16:39 2010 +0100 mmdevapi: Use an iface instead of a vtbl pointer in IClassFactoryImpl. --- dlls/mmdevapi/main.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/mmdevapi/main.c b/dlls/mmdevapi/main.c index b916df0..cb23dd0 100644 --- a/dlls/mmdevapi/main.c +++ b/dlls/mmdevapi/main.c @@ -342,15 +342,20 @@ HRESULT WINAPI DllCanUnloadNow(void) typedef HRESULT (*FnCreateInstance)(REFIID riid, LPVOID *ppobj); typedef struct { - const IClassFactoryVtbl *lpVtbl; + IClassFactory IClassFactory_iface; REFCLSID rclsid; FnCreateInstance pfnCreateInstance; } IClassFactoryImpl; +static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) +{ + return CONTAINING_RECORD(iface, IClassFactoryImpl, IClassFactory_iface); +} + static HRESULT WINAPI MMCF_QueryInterface(LPCLASSFACTORY iface, REFIID riid, LPVOID *ppobj) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + IClassFactoryImpl *This = impl_from_IClassFactory(iface); TRACE("(%p, %s, %p)\n", This, debugstr_guid(riid), ppobj); if (ppobj == NULL) return E_POINTER; @@ -382,7 +387,7 @@ static HRESULT WINAPI MMCF_CreateInstance( REFIID riid, LPVOID *ppobj) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + IClassFactoryImpl *This = impl_from_IClassFactory(iface); TRACE("(%p, %p, %s, %p)\n", This, pOuter, debugstr_guid(riid), ppobj); if (pOuter) @@ -398,7 +403,7 @@ static HRESULT WINAPI MMCF_CreateInstance( static HRESULT WINAPI MMCF_LockServer(LPCLASSFACTORY iface, BOOL dolock) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + IClassFactoryImpl *This = impl_from_IClassFactory(iface); FIXME("(%p, %d) stub!\n", This, dolock); return S_OK; } @@ -412,7 +417,7 @@ static const IClassFactoryVtbl MMCF_Vtbl = { }; static IClassFactoryImpl MMDEVAPI_CF[] = { - { &MMCF_Vtbl, &CLSID_MMDeviceEnumerator, (FnCreateInstance)MMDevEnum_Create } + { { &MMCF_Vtbl }, &CLSID_MMDeviceEnumerator, (FnCreateInstance)MMDevEnum_Create } }; HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) @@ -436,7 +441,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) for (i = 0; i < sizeof(MMDEVAPI_CF)/sizeof(MMDEVAPI_CF[0]); ++i) { if (IsEqualGUID(rclsid, MMDEVAPI_CF[i].rclsid)) { - IUnknown_AddRef((IClassFactory*) &MMDEVAPI_CF[i]); + IUnknown_AddRef(&MMDEVAPI_CF[i].IClassFactory_iface); *ppv = &MMDEVAPI_CF[i]; return S_OK; }

1 0

Michael Stefaniuc : dinput8: Use an iface instead of a vtbl pointer in IClassFactoryImpl.
by Alexandre Julliard 06 Dec '10

06 Dec '10

Module: wine Branch: master Commit: ed5260ba92a86a9ad4f98fd935e454ed8d43af2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed5260ba92a86a9ad4f98fd93… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Dec 5 15:15:10 2010 +0100 dinput8: Use an iface instead of a vtbl pointer in IClassFactoryImpl. --- dlls/dinput8/dinput8_main.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/dinput8/dinput8_main.c b/dlls/dinput8/dinput8_main.c index 9d426fb..a5efc54 100644 --- a/dlls/dinput8/dinput8_main.c +++ b/dlls/dinput8/dinput8_main.c @@ -94,11 +94,16 @@ HRESULT WINAPI DECLSPEC_HOTPATCH DirectInput8Create(HINSTANCE hinst, DWORD dwVer typedef struct { /* IUnknown fields */ - const IClassFactoryVtbl *lpVtbl; + IClassFactory IClassFactory_iface; } IClassFactoryImpl; +static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) +{ + return CONTAINING_RECORD(iface, IClassFactoryImpl, IClassFactory_iface); +} + static HRESULT WINAPI DI8CF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + IClassFactoryImpl *This = impl_from_IClassFactory(iface); FIXME("%p %s %p\n",This,debugstr_guid(riid),ppobj); return E_NOINTERFACE; } @@ -114,7 +119,7 @@ static ULONG WINAPI DI8CF_Release(LPCLASSFACTORY iface) { } static HRESULT WINAPI DI8CF_CreateInstance(LPCLASSFACTORY iface,LPUNKNOWN pOuter,REFIID riid,LPVOID *ppobj) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + IClassFactoryImpl *This = impl_from_IClassFactory(iface); TRACE("(%p)->(%p,%s,%p)\n",This,pOuter,debugstr_guid(riid),ppobj); if( IsEqualGUID( &IID_IDirectInput8A, riid ) || IsEqualGUID( &IID_IDirectInput8W, riid ) || IsEqualGUID( &IID_IUnknown, riid )) { @@ -143,7 +148,7 @@ static const IClassFactoryVtbl DI8CF_Vtbl = { DI8CF_CreateInstance, DI8CF_LockServer }; -static IClassFactoryImpl DINPUT8_CF = { &DI8CF_Vtbl }; +static IClassFactoryImpl DINPUT8_CF = { { &DI8CF_Vtbl } }; /***********************************************************************

1 0

Michael Stefaniuc : oledb32: Use an iface instead of a vtbl pointer in IClassFactoryImpl.
by Alexandre Julliard 06 Dec '10

06 Dec '10

Module: wine Branch: master Commit: 1c0982e85fa97a0d65f6d6d050b3c8af1da13738 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c0982e85fa97a0d65f6d6d05… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Dec 5 15:17:05 2010 +0100 oledb32: Use an iface instead of a vtbl pointer in IClassFactoryImpl. --- dlls/oledb32/main.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/oledb32/main.c b/dlls/oledb32/main.c index ec39c2f..2669d3e 100644 --- a/dlls/oledb32/main.c +++ b/dlls/oledb32/main.c @@ -59,13 +59,18 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID lpv) */ typedef struct { - const IClassFactoryVtbl *lpVtbl; + IClassFactory IClassFactory_iface; HRESULT (*create_object)( IUnknown*, LPVOID* ); } cf; +static inline cf *impl_from_IClassFactory(IClassFactory *iface) +{ + return CONTAINING_RECORD(iface, cf, IClassFactory_iface); +} + static HRESULT WINAPI CF_QueryInterface(IClassFactory *iface, REFIID riid, void **obj) { - cf *This = (cf *)iface; + cf *This = impl_from_IClassFactory(iface); TRACE("(%p, %s, %p)\n", This, debugstr_guid(riid), obj); @@ -91,7 +96,7 @@ static ULONG WINAPI CF_Release(IClassFactory *iface) static HRESULT WINAPI CF_CreateInstance(IClassFactory *iface, IUnknown *pOuter, REFIID riid, void **obj) { - cf *This = (cf *)iface; + cf *This = impl_from_IClassFactory(iface); IUnknown *unk = NULL; HRESULT r; @@ -121,7 +126,7 @@ static const IClassFactoryVtbl CF_Vtbl = CF_LockServer }; -static cf oledb_convert_cf = { &CF_Vtbl, create_oledb_convert }; +static cf oledb_convert_cf = { { &CF_Vtbl }, create_oledb_convert }; /****************************************************************** * DllGetClassObject

1 0

Peter Schlaile : winedbg: Adds an rwatch command to winedbg.
by Alexandre Julliard 06 Dec '10

06 Dec '10

Module: wine Branch: master Commit: 95a3cd8e30f72434a8ae3f71a97b5679937fdbf3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95a3cd8e30f72434a8ae3f71a… Author: Peter Schlaile <peter(a)schlaile.de> Date: Sun Dec 5 17:35:55 2010 +0100 winedbg: Adds an rwatch command to winedbg. --- programs/winedbg/break.c | 8 ++++---- programs/winedbg/dbg.y | 9 ++++++--- programs/winedbg/debug.l | 1 + programs/winedbg/debugger.h | 4 ++-- programs/winedbg/info.c | 2 +- programs/winedbg/winedbg.man.in | 5 +++++ 6 files changed, 19 insertions(+), 10 deletions(-) diff --git a/programs/winedbg/break.c b/programs/winedbg/break.c index 2f502ce..b8627b6 100644 --- a/programs/winedbg/break.c +++ b/programs/winedbg/break.c @@ -415,14 +415,14 @@ static void break_add_watch(const struct dbg_lvalue* lvalue, BOOL is_write) * * Adds a watch point from an address (stored in a lvalue) */ -void break_add_watch_from_lvalue(const struct dbg_lvalue* lvalue) +void break_add_watch_from_lvalue(const struct dbg_lvalue* lvalue,BOOL is_write) { struct dbg_lvalue lval; types_extract_as_address(lvalue, &lval.addr); lval.type.id = dbg_itype_none; - break_add_watch(&lval, TRUE); + break_add_watch(&lval, is_write); } /*********************************************************************** @@ -430,14 +430,14 @@ void break_add_watch_from_lvalue(const struct dbg_lvalue* lvalue) * * Add a watchpoint from a symbol name */ -void break_add_watch_from_id(const char *name) +void break_add_watch_from_id(const char *name, BOOL is_write) { struct dbg_lvalue lvalue; switch (symbol_get_lvalue(name, -1, &lvalue, TRUE)) { case sglv_found: - break_add_watch(&lvalue, 1); + break_add_watch(&lvalue, is_write); break; case sglv_unknown: dbg_printf("Unable to add watchpoint\n"); diff --git a/programs/winedbg/dbg.y b/programs/winedbg/dbg.y index 685ca6c..7c92565 100644 --- a/programs/winedbg/dbg.y +++ b/programs/winedbg/dbg.y @@ -52,7 +52,7 @@ static void parser(const char*); } %token tCONT tPASS tSTEP tLIST tNEXT tQUIT tHELP tBACKTRACE tALL tINFO tUP tDOWN -%token tENABLE tDISABLE tBREAK tHBREAK tWATCH tDELETE tSET tPRINT tEXAM +%token tENABLE tDISABLE tBREAK tHBREAK tWATCH tRWATCH tDELETE tSET tPRINT tEXAM %token tABORT tECHO %token tCLASS tMAPS tSTACK tSEGMENTS tSYMBOL tREGS tALLREGS tWND tLOCAL tEXCEPTION %token tPROCESS tTHREAD tEOL tEOF @@ -250,10 +250,13 @@ break_command: ; watch_command: - tWATCH '*' expr_lvalue { break_add_watch_from_lvalue(&$3); } - | tWATCH identifier { break_add_watch_from_id($2); } + tWATCH '*' expr_lvalue { break_add_watch_from_lvalue(&$3, TRUE); } + | tWATCH identifier { break_add_watch_from_id($2, TRUE); } + | tRWATCH '*' expr_lvalue { break_add_watch_from_lvalue(&$3, FALSE); } + | tRWATCH identifier { break_add_watch_from_id($2, FALSE); } ; + display_command: tDISPLAY { display_print(); } | tDISPLAY expr { display_add($2, 1, 0); } diff --git a/programs/winedbg/debug.l b/programs/winedbg/debug.l index 4348140..bdacb78 100644 --- a/programs/winedbg/debug.l +++ b/programs/winedbg/debug.l @@ -203,6 +203,7 @@ STRING \"[^\n"]+\" <INITIAL,INFO_CMD,BD_CMD>break|brea|bre|br|b { BEGIN(NOCMD); return tBREAK; } <INITIAL,INFO_CMD,BD_CMD>hbreak|hbrea|hbre|hbr|hb { BEGIN(NOCMD); return tHBREAK; } <INITIAL>watch|watc|wat { BEGIN(NOCMD); return tWATCH; } +<INITIAL>rwatch|rwatc|rwat { BEGIN(NOCMD); return tRWATCH; } <INITIAL>whatis|whati|what { BEGIN(NOCMD); return tWHATIS; } <INITIAL,NOPROCESS>run|ru|r { BEGIN(ASTRING_EXPECTED); return tRUN;} <INITIAL>detach|detac|deta|det { BEGIN(NOCMD); return tDETACH; } diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index eb05cda..5be0943 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -294,8 +294,8 @@ extern BOOL break_add_break(const ADDRESS64* addr, BOOL verbose, BOO extern BOOL break_add_break_from_lvalue(const struct dbg_lvalue* value, BOOL swbp); extern void break_add_break_from_id(const char* name, int lineno, BOOL swbp); extern void break_add_break_from_lineno(int lineno, BOOL swbp); -extern void break_add_watch_from_lvalue(const struct dbg_lvalue* lvalue); -extern void break_add_watch_from_id(const char* name); +extern void break_add_watch_from_lvalue(const struct dbg_lvalue* lvalue, BOOL is_write); +extern void break_add_watch_from_id(const char* name, BOOL is_write); extern void break_check_delayed_bp(void); extern void break_delete_xpoint(int num); extern void break_delete_xpoints_from_module(DWORD64 base); diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c index 8d91cc9..51cf207 100644 --- a/programs/winedbg/info.c +++ b/programs/winedbg/info.c @@ -49,7 +49,7 @@ void print_help(void) "subset of the commands that gdb accepts.", "The commands currently are:", " help quit", - " break [*<addr>] watch *<addr>", + " break [*<addr>] watch | rwatch *<addr>", " delete break bpnum disable bpnum", " enable bpnum condition <bpnum> [<expr>]", " finish cont [N]", diff --git a/programs/winedbg/winedbg.man.in b/programs/winedbg/winedbg.man.in index 8b26e32..1155111 100644 --- a/programs/winedbg/winedbg.man.in +++ b/programs/winedbg/winedbg.man.in @@ -185,6 +185,11 @@ Adds a watch command (on write) at address \fBN\fR (on 4 bytes). .IP \fBwatch\ <id>\fR Adds a watch command (on write) at the address of symbol \fB<id>\fR. Size depends on size of \fB<id>\fR. +.IP \fBrwatch\ *\ N\fR +Adds a watch command (on read) at address \fBN\fR (on 4 bytes). +.IP \fBrwatch\ <id>\fR +Adds a watch command (on read) at the address of symbol +\fB<id>\fR. Size depends on size of \fB<id>\fR. .IP \fBinfo\ break\fR Lists all (break|watch)-points (with their state). .PP

1 0

Henri Verbeet : wined3d: Explicitly pass shader_data and reg_maps to need_helper_const().
by Alexandre Julliard 06 Dec '10

06 Dec '10

Module: wine Branch: master Commit: a564101630f689a866678077991e214f2ea1de69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a564101630f689a8666780779… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Dec 5 23:46:52 2010 +0100 wined3d: Explicitly pass shader_data and reg_maps to need_helper_const(). --- dlls/wined3d/arb_program_shader.c | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index d16ea28..63d1495 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -331,16 +331,16 @@ static inline BOOL use_nv_clip(const struct wined3d_gl_info *gl_info) && !(gl_info->quirks & WINED3D_QUIRK_NV_CLIP_BROKEN); } -static BOOL need_helper_const(IWineD3DVertexShaderImpl *shader, const struct wined3d_gl_info *gl_info) +static BOOL need_helper_const(const struct arb_vshader_private *shader_data, + const struct shader_reg_maps *reg_maps, const struct wined3d_gl_info *gl_info) { - if (need_rel_addr_const(shader->baseShader.backend_data, - &shader->baseShader.reg_maps, gl_info)) return TRUE; + if (need_rel_addr_const(shader_data, reg_maps, gl_info)) return TRUE; if (!gl_info->supported[NV_VERTEX_PROGRAM]) return TRUE; /* Need to init colors. */ if (gl_info->quirks & WINED3D_QUIRK_ARB_VS_OFFSET_LIMIT) return TRUE; /* Load the immval offset. */ if (gl_info->quirks & WINED3D_QUIRK_SET_TEXCOORD_W) return TRUE; /* Have to init texcoords. */ if (!use_nv_clip(gl_info)) return TRUE; /* Init the clip texcoord */ - if (shader->baseShader.reg_maps.usesnrm) return TRUE; /* 0.0 */ - if (shader->baseShader.reg_maps.usesrcp) return TRUE; /* EPS */ + if (reg_maps->usesnrm) return TRUE; /* 0.0 */ + if (reg_maps->usesrcp) return TRUE; /* EPS */ return FALSE; } @@ -349,7 +349,8 @@ static unsigned int reserved_vs_const(IWineD3DVertexShaderImpl *shader, const st unsigned int ret = 1; /* We use one PARAM for the pos fixup, and in some cases one to load * some immediate values into the shader. */ - if (need_helper_const(shader, gl_info)) ++ret; + if (need_helper_const(shader->baseShader.backend_data, + &shader->baseShader.reg_maps, gl_info)) ++ret; if (need_rel_addr_const(shader->baseShader.backend_data, &shader->baseShader.reg_maps, gl_info)) ++ret; return ret; @@ -3096,6 +3097,7 @@ static void shader_hw_label(const struct wined3d_shader_instruction *ins) static void vshader_add_footer(IWineD3DVertexShaderImpl *This, struct wined3d_shader_buffer *buffer, const struct arb_vs_compile_args *args, struct shader_arb_ctx_priv *priv_ctx) { + const struct arb_vshader_private *shader_data = This->baseShader.backend_data; const shader_reg_maps *reg_maps = &This->baseShader.reg_maps; IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *)This->baseShader.device; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; @@ -3170,7 +3172,7 @@ static void vshader_add_footer(IWineD3DVertexShaderImpl *This, struct wined3d_sh /* Z coord [0;1]->[-1;1] mapping, see comment in transform_projection in state.c * and the glsl equivalent */ - if (need_helper_const(This, gl_info)) + if (need_helper_const(shader_data, reg_maps, gl_info)) { const char *two = arb_get_helper_value(WINED3D_SHADER_TYPE_VERTEX, ARB_TWO); shader_addline(buffer, "MAD TMP_OUT.z, TMP_OUT.z, %s, -TMP_OUT.w;\n", two); @@ -4104,7 +4106,7 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShaderImpl *This, struct } shader_addline(buffer, "TEMP TMP_OUT;\n"); - if (need_helper_const(This, gl_info)) + if (need_helper_const(shader_data, reg_maps, gl_info)) { shader_addline(buffer, "PARAM helper_const = { 0.0, 1.0, 2.0, %1.10f};\n", eps); }

1 0

Henri Verbeet : wined3d: Explicitly pass shader_data and reg_maps to reserved_vs_const().
by Alexandre Julliard 06 Dec '10

06 Dec '10

Module: wine Branch: master Commit: 0405733ff72ecaec591dc80d62602a8c6bf091cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=0405733ff72ecaec591dc80d6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Dec 5 23:46:53 2010 +0100 wined3d: Explicitly pass shader_data and reg_maps to reserved_vs_const(). --- dlls/wined3d/arb_program_shader.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 63d1495..05e4fcd 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -344,15 +344,14 @@ static BOOL need_helper_const(const struct arb_vshader_private *shader_data, return FALSE; } -static unsigned int reserved_vs_const(IWineD3DVertexShaderImpl *shader, const struct wined3d_gl_info *gl_info) +static unsigned int reserved_vs_const(const struct arb_vshader_private *shader_data, + const struct shader_reg_maps *reg_maps, const struct wined3d_gl_info *gl_info) { unsigned int ret = 1; /* We use one PARAM for the pos fixup, and in some cases one to load * some immediate values into the shader. */ - if (need_helper_const(shader->baseShader.backend_data, - &shader->baseShader.reg_maps, gl_info)) ++ret; - if (need_rel_addr_const(shader->baseShader.backend_data, - &shader->baseShader.reg_maps, gl_info)) ++ret; + if (need_helper_const(shader_data, reg_maps, gl_info)) ++ret; + if (need_rel_addr_const(shader_data, reg_maps, gl_info)) ++ret; return ret; } @@ -725,6 +724,7 @@ static DWORD shader_generate_arb_declarations(IWineD3DBaseShader *iface, const s } else { + const struct arb_vshader_private *shader_data = This->baseShader.backend_data; max_constantsF = gl_info->limits.arb_vs_native_constants; /* 96 is the minimum MAX_PROGRAM_ENV_PARAMETERS_ARB value. * Also prevents max_constantsF from becoming less than 0 and @@ -735,7 +735,7 @@ static DWORD shader_generate_arb_declarations(IWineD3DBaseShader *iface, const s if(This->baseShader.reg_maps.usesrelconstF) { DWORD highest_constf = 0, clip_limit; - max_constantsF -= reserved_vs_const((IWineD3DVertexShaderImpl *)This, gl_info); + max_constantsF -= reserved_vs_const(shader_data, reg_maps, gl_info); max_constantsF -= count_bits(This->baseShader.reg_maps.integer_constants); for(i = 0; i < This->baseShader.limits.constant_float; i++)

1 0

Henri Verbeet : wined3d: Use local reg_maps variables where possible.
by Alexandre Julliard 06 Dec '10

06 Dec '10

Module: wine Branch: master Commit: e9ff40d9183197232dfc3ac5b92558edc37f4d2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9ff40d9183197232dfc3ac5b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Dec 5 23:46:54 2010 +0100 wined3d: Use local reg_maps variables where possible. --- dlls/wined3d/arb_program_shader.c | 16 +++++++++------- dlls/wined3d/glsl_shader.c | 26 +++++++++++++++----------- dlls/wined3d/shader.c | 4 ++-- 3 files changed, 26 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 05e4fcd..d7626af 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -732,11 +732,12 @@ static DWORD shader_generate_arb_declarations(IWineD3DBaseShader *iface, const s if (max_constantsF < 96) max_constantsF = gl_info->limits.arb_vs_float_constants; - if(This->baseShader.reg_maps.usesrelconstF) { + if (reg_maps->usesrelconstF) + { DWORD highest_constf = 0, clip_limit; max_constantsF -= reserved_vs_const(shader_data, reg_maps, gl_info); - max_constantsF -= count_bits(This->baseShader.reg_maps.integer_constants); + max_constantsF -= count_bits(reg_maps->integer_constants); for(i = 0; i < This->baseShader.limits.constant_float; i++) { @@ -821,7 +822,8 @@ static DWORD shader_generate_arb_declarations(IWineD3DBaseShader *iface, const s * local constants do not declare the loaded constants as an array because ARB compilers usually * do not optimize unused constants away */ - if(This->baseShader.reg_maps.usesrelconstF) { + if (reg_maps->usesrelconstF) + { /* Need to PARAM the environment parameters (constants) so we can use relative addressing */ shader_addline(buffer, "PARAM C[%d] = { program.env[0..%d] };\n", max_constantsF, max_constantsF - 1); @@ -830,7 +832,8 @@ static DWORD shader_generate_arb_declarations(IWineD3DBaseShader *iface, const s DWORD idx, mask; idx = i >> 5; mask = 1 << (i & 0x1f); - if(!shader_constant_is_local(This, i) && (This->baseShader.reg_maps.constf[idx] & mask)) { + if (!shader_constant_is_local(This, i) && (reg_maps->constf[idx] & mask)) + { shader_addline(buffer, "PARAM C%d = program.env[%d];\n",i, i); } } @@ -3588,7 +3591,7 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShaderImpl *This, struct priv_ctx.target_version = ARB; } - if(This->baseShader.reg_maps.highest_render_target > 0) + if (reg_maps->highest_render_target > 0) { shader_addline(buffer, "OPTION ARB_draw_buffers;\n"); } @@ -4169,8 +4172,7 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShaderImpl *This, struct const char *one = arb_get_helper_value(WINED3D_SHADER_TYPE_VERTEX, ARB_ONE); for(i = 0; i < min(8, MAX_REG_TEXCRD); i++) { - if (This->baseShader.reg_maps.texcoord_mask[i] - && This->baseShader.reg_maps.texcoord_mask[i] != WINED3DSP_WRITEMASK_ALL) + if (reg_maps->texcoord_mask[i] && reg_maps->texcoord_mask[i] != WINED3DSP_WRITEMASK_ALL) shader_addline(buffer, "MOV result.texcoord[%u].w, %s\n", i, one); } } diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 8b55eb8..6d92a3c 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -951,25 +951,29 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont } else { - if(This->baseShader.reg_maps.usesrelconstF) { - /* Subtract the other potential uniforms from the max available (bools, ints, and 1 row of projection matrix). - * Subtract another uniform for immediate values, which have to be loaded via uniform by the driver as well. - * The shader code only uses 0.5, 2.0, 1.0, 128 and -128 in vertex shader code, so one vec4 should be enough - * (Unfortunately the Nvidia driver doesn't store 128 and -128 in one float). + if (reg_maps->usesrelconstF) + { + /* Subtract the other potential uniforms from the max + * available (bools, ints, and 1 row of projection matrix). + * Subtract another uniform for immediate values, which have + * to be loaded via uniform by the driver as well. The shader + * code only uses 0.5, 2.0, 1.0, 128 and -128 in vertex + * shader code, so one vec4 should be enough. (Unfortunately + * the Nvidia driver doesn't store 128 and -128 in one float). * - * Writing gl_ClipVertex requires one uniform for each clipplane as well. - */ + * Writing gl_ClipVertex requires one uniform for each + * clipplane as well. */ max_constantsF = gl_info->limits.glsl_vs_float_constants - 3; if(ctx_priv->cur_vs_args->clip_enabled) { max_constantsF -= gl_info->limits.clipplanes; } - max_constantsF -= count_bits(This->baseShader.reg_maps.integer_constants); + max_constantsF -= count_bits(reg_maps->integer_constants); /* Strictly speaking a bool only uses one scalar, but the nvidia(Linux) compiler doesn't pack them properly, * so each scalar requires a full vec4. We could work around this by packing the booleans ourselves, but * for now take this into account when calculating the number of available constants */ - max_constantsF -= count_bits(This->baseShader.reg_maps.boolean_constants); + max_constantsF -= count_bits(reg_maps->boolean_constants); /* Set by driver quirks in directx.c */ max_constantsF -= gl_info->reserved_glsl_constants; } @@ -985,10 +989,10 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont /* Always declare the full set of constants, the compiler can remove the unused ones because d3d doesn't(yet) * support indirect int and bool constant addressing. This avoids problems if the app uses e.g. i0 and i9. */ - if (This->baseShader.limits.constant_int > 0 && This->baseShader.reg_maps.integer_constants) + if (This->baseShader.limits.constant_int > 0 && reg_maps->integer_constants) shader_addline(buffer, "uniform ivec4 %cI[%u];\n", prefix, This->baseShader.limits.constant_int); - if (This->baseShader.limits.constant_bool > 0 && This->baseShader.reg_maps.boolean_constants) + if (This->baseShader.limits.constant_bool > 0 && reg_maps->boolean_constants) shader_addline(buffer, "uniform bool %cB[%u];\n", prefix, This->baseShader.limits.constant_bool); if (!pshader) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index ef6816f..59fe937 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1864,7 +1864,7 @@ HRESULT vertexshader_init(IWineD3DVertexShaderImpl *shader, IWineD3DDeviceImpl * return hr; } - map = shader->baseShader.reg_maps.input_registers; + map = reg_maps->input_registers; for (i = 0; map; map >>= 1, ++i) { if (!(map & 1) || !shader->baseShader.input_signature[i].semantic_name) continue; @@ -1886,7 +1886,7 @@ HRESULT vertexshader_init(IWineD3DVertexShaderImpl *shader, IWineD3DDeviceImpl * vertexshader_set_limits(shader); - shader->baseShader.load_local_constsF = shader->baseShader.reg_maps.usesrelconstF + shader->baseShader.load_local_constsF = reg_maps->usesrelconstF && !list_empty(&shader->baseShader.constantsF); return WINED3D_OK;

1 0

Frédéric Delanoy : French translation for release 1.2.2
by Jeremy Newman 06 Dec '10

06 Dec '10

Module: website Branch: master Commit: 11fc29e5ed501fecd04f4c672b08183daef1a8c9 URL: http://source.winehq.org/git/website.git/?a=commit;h=11fc29e5ed501fecd04f4c… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Dec 4 02:32:44 2010 +0100 French translation for release 1.2.2 --- news/fr/2010120301.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/fr/2010120301.xml b/news/fr/2010120301.xml new file mode 100644 index 0000000..e8f47df --- /dev/null +++ b/news/fr/2010120301.xml @@ -0,0 +1,17 @@ +<news> +<date>3 décembre 2010</date> +<title>Sortie de Wine 1.2.2</title> +<body> + La version de maintenance 1.2.2 de Wine est disponible. + <a href="{$root}/announce/1.2.x">Nouveautés</a> de cette version : +<ul> + <li>Prise en charge des curseurs animés.</li> + <li>Mises à jour de traductions.</li> + <li>Diverses corrections de bogues.</li> +</ul> +Le <a +href="http://prdownloads.sourceforge.net/wine/wine-1.2.2.tar.bz2">code +source</a> est disponible dès à présent. +Les paquets binaires sont en cours de construction, et apparaîtront sous peu +sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0