February 2010 - Wine-Commits

Jacek Caban : mshtml: Added IHTMLElement2::detachEvent implementation.
by Alexandre Julliard Feb. 9, 2010

Feb. 9, 2010

Module: wine Branch: master Commit: 29389b8742469031caa10b10b31e7e215d68e370 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29389b8742469031caa10b10b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 8 21:49:37 2010 +0100 mshtml: Added IHTMLElement2::detachEvent implementation. --- dlls/mshtml/htmlelem2.c | 6 ++++-- dlls/mshtml/htmlevent.c | 31 +++++++++++++++++++++++++++++++ dlls/mshtml/htmlevent.h | 1 + dlls/mshtml/tests/events.c | 37 +++++++++++++++++++++++++++++++++++++ 4 files changed, 73 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlelem2.c b/dlls/mshtml/htmlelem2.c index 356ce46..cd877ce 100644 --- a/dlls/mshtml/htmlelem2.c +++ b/dlls/mshtml/htmlelem2.c @@ -655,8 +655,10 @@ static HRESULT WINAPI HTMLElement2_attachEvent(IHTMLElement2 *iface, BSTR event, static HRESULT WINAPI HTMLElement2_detachEvent(IHTMLElement2 *iface, BSTR event, IDispatch *pDisp) { HTMLElement *This = HTMLELEM2_THIS(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_w(event), pDisp); - return E_NOTIMPL; + + TRACE("(%p)->(%s %p)\n", This, debugstr_w(event), pDisp); + + return detach_event(*get_node_event_target(&This->node), &This->node.doc->basedoc, event, pDisp); } static HRESULT WINAPI HTMLElement2_get_readyState(IHTMLElement2 *iface, VARIANT *p) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 3ff41a6..129f7dd 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -867,6 +867,9 @@ static void call_event_handlers(HTMLDocumentNode *doc, IHTMLEventObj *event_obj, for(cp = cp_container->cp_list; cp; cp = cp->next) { if(cp->sinks_size && is_cp_event(cp->data, event_info[eid].dispid)) { for(i=0; i < cp->sinks_size; i++) { + if(!cp->sinks[i].disp) + continue; + TRACE("cp %s [%d] >>>\n", debugstr_w(event_info[eid].name), i); hres = call_cp_func(cp->sinks[i].disp, event_info[eid].dispid); if(hres == S_OK) @@ -1128,6 +1131,34 @@ HRESULT attach_event(event_target_t **event_target_ptr, HTMLDocument *doc, BSTR return S_OK; } +HRESULT detach_event(event_target_t *event_target, HTMLDocument *doc, BSTR name, IDispatch *disp) +{ + eventid_t eid; + DWORD i = 0; + + if(!event_target) + return S_OK; + + eid = attr_to_eid(name); + if(eid == EVENTID_LAST) { + WARN("Unknown event\n"); + return S_OK; + } + + if(!event_target->event_table[eid]) + return S_OK; + + while(i < event_target->event_table[eid]->handler_cnt) { + if(event_target->event_table[eid]->handlers[i] == disp) { + IDispatch_Release(event_target->event_table[eid]->handlers[i]); + event_target->event_table[eid]->handlers[i] = NULL; + } + i++; + } + + return S_OK; +} + void update_cp_events(HTMLWindow *window, cp_static_data_t *cp) { int i; diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 1a8572f..96ff4cd 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -46,6 +46,7 @@ void fire_event(HTMLDocumentNode*,eventid_t,nsIDOMNode*,nsIDOMEvent*); HRESULT set_event_handler(event_target_t**,HTMLDocumentNode*,eventid_t,VARIANT*); HRESULT get_event_handler(event_target_t**,eventid_t,VARIANT*); HRESULT attach_event(event_target_t**,HTMLDocument*,BSTR,IDispatch*,VARIANT_BOOL*); +HRESULT detach_event(event_target_t*,HTMLDocument*,BSTR,IDispatch*); HRESULT dispatch_event(HTMLDOMNode*,const WCHAR*,VARIANT*,VARIANT_BOOL*); HRESULT call_event(HTMLDOMNode*,eventid_t); void update_cp_events(HTMLWindow*,cp_static_data_t*); diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index 81e7cab..16f727f 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -675,6 +675,20 @@ static void _elem_attach_event(unsigned line, IUnknown *unk, const char *namea, ok_(__FILE__,line)(res == VARIANT_TRUE, "attachEvent returned %x\n", res); } +#define elem_detach_event(a,b,c) _elem_detach_event(__LINE__,a,b,c) +static void _elem_detach_event(unsigned line, IUnknown *unk, const char *namea, IDispatch *disp) +{ + IHTMLElement2 *elem = _get_elem2_iface(line, unk); + BSTR name; + HRESULT hres; + + name = a2bstr(namea); + hres = IHTMLElement2_detachEvent(elem, name, disp); + IHTMLElement2_Release(elem); + SysFreeString(name); + ok_(__FILE__,line)(hres == S_OK, "detachEvent failed: %08x\n", hres); +} + static HRESULT WINAPI DispatchEx_QueryInterface(IDispatchEx *iface, REFIID riid, void **ppv) { *ppv = NULL; @@ -1228,6 +1242,29 @@ static void test_onclick(IHTMLDocument2 *doc) unregister_cp((IUnknown*)doc, &DIID_HTMLDocumentEvents, cp_cookie); + V_VT(&v) = VT_NULL; + hres = IHTMLElement_put_onclick(div, v); + ok(hres == S_OK, "put_onclick failed: %08x\n", hres); + + hres = IHTMLElement_get_onclick(div, &v); + ok(hres == S_OK, "get_onclick failed: %08x\n", hres); + ok(V_VT(&v) == VT_NULL, "get_onclick returned vt %d\n", V_VT(&v)); + + elem_detach_event((IUnknown*)div, "onclick", (IDispatch*)&div_onclick_disp); + elem_detach_event((IUnknown*)div, "onclick", (IDispatch*)&div_onclick_disp); + elem_detach_event((IUnknown*)div, "test", (IDispatch*)&div_onclick_disp); + + SET_EXPECT(div_onclick_attached); + SET_EXPECT(body_onclick); + SET_EXPECT(document_onclick); + + hres = IHTMLElement_click(div); + ok(hres == S_OK, "click failed: %08x\n", hres); + + CHECK_CALLED(div_onclick_attached); + CHECK_CALLED(body_onclick); + CHECK_CALLED(document_onclick); + IHTMLElement_Release(div); IHTMLElement_Release(body); }

1 0

Jacek Caban : mshtml: Don't free nsstr in HTMLFormElement_get_dispid twice.
by Alexandre Julliard Feb. 9, 2010

Feb. 9, 2010

Module: wine Branch: master Commit: 07b62a8dd7e3e7577cdc565e39cfd6a424eb9e44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07b62a8dd7e3e7577cdc565e3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 8 21:49:11 2010 +0100 mshtml: Don't free nsstr in HTMLFormElement_get_dispid twice. --- dlls/mshtml/htmlform.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlform.c b/dlls/mshtml/htmlform.c index 05486f4..6886056 100644 --- a/dlls/mshtml/htmlform.c +++ b/dlls/mshtml/htmlform.c @@ -414,7 +414,6 @@ static HRESULT HTMLFormElement_get_dispid(HTMLDOMNode *iface, hres = S_OK; break; } - nsAString_Finish(&nsstr); } nsAString_Finish(&nsname); nsAString_Finish(&nsstr);

1 0

Stefan Dösinger : d3d: Make sure vertexbuffer lock doesn't return a NULL pointer.
by Alexandre Julliard Feb. 9, 2010

Feb. 9, 2010

Module: wine Branch: master Commit: bb035638d0ee54dcda843cbc7ada1aa90637a91d URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb035638d0ee54dcda843cbc7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Feb 8 12:28:26 2010 +0100 d3d: Make sure vertexbuffer lock doesn't return a NULL pointer. --- dlls/d3d8/tests/buffer.c | 1 + dlls/d3d9/tests/buffer.c | 1 + dlls/ddraw/tests/d3d.c | 1 + 3 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/tests/buffer.c b/dlls/d3d8/tests/buffer.c index 725e642..a4082c5 100644 --- a/dlls/d3d8/tests/buffer.c +++ b/dlls/d3d8/tests/buffer.c @@ -104,6 +104,7 @@ static void lock_flag_test(IDirect3DDevice8 *device) if(SUCCEEDED(hr)) { + ok(data != NULL, "The data pointer returned by Lock is NULL\n"); hr = IDirect3DVertexBuffer8_Unlock(buffer); ok(hr == D3D_OK, "IDirect3DVertexBuffer8_Unlock failed, 0x%08x\n", hr); } diff --git a/dlls/d3d9/tests/buffer.c b/dlls/d3d9/tests/buffer.c index a10cefd..1347121 100644 --- a/dlls/d3d9/tests/buffer.c +++ b/dlls/d3d9/tests/buffer.c @@ -103,6 +103,7 @@ static void lock_flag_test(IDirect3DDevice9 *device) if(SUCCEEDED(hr)) { + ok(data != NULL, "The data pointer returned by Lock is NULL\n"); hr = IDirect3DVertexBuffer9_Unlock(buffer); ok(hr == D3D_OK, "IDirect3DVertexBuffer9_Unlock failed, 0x%08x\n", hr); } diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 2d17487..134db9f 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -3216,6 +3216,7 @@ static void VertexBufferLockRest(void) test_data[i].debug_string, hr, test_data[i].result); if(SUCCEEDED(hr)) { + ok(data != NULL, "The data pointer returned by Lock is NULL\n"); hr = IDirect3DVertexBuffer7_Unlock(buffer); ok(hr == D3D_OK, "IDirect3DVertexBuffer7_Unlock failed, 0x%08x\n", hr); }

1 0

Stefan Dösinger : wined3d: Don' t record dirty areas in a readonly lock.
by Alexandre Julliard Feb. 9, 2010

Feb. 9, 2010

Module: wine Branch: master Commit: 8625f0cdbf28cb6c456323d6b5589ad80bffb380 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8625f0cdbf28cb6c456323d6b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Feb 8 12:22:24 2010 +0100 wined3d: Don't record dirty areas in a readonly lock. --- dlls/wined3d/buffer.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index f3d3492..3c7a2b9 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1086,7 +1086,10 @@ static HRESULT STDMETHODCALLTYPE buffer_Map(IWineD3DBuffer *iface, UINT offset, TRACE("iface %p, offset %u, size %u, data %p, flags %#x\n", iface, offset, size, data, flags); flags = buffer_sanitize_flags(flags); - if (!buffer_add_dirty_area(This, offset, size)) return E_OUTOFMEMORY; + if (!(flags & WINED3DLOCK_READONLY)) + { + if (!buffer_add_dirty_area(This, offset, size)) return E_OUTOFMEMORY; + } count = InterlockedIncrement(&This->lock_count);

1 0

Alexandre Julliard : makefiles: Move the CROSSOBJS dependency to the generated default dependencies.
by Alexandre Julliard Feb. 9, 2010

Feb. 9, 2010

Module: wine Branch: master Commit: bf84c6120ae0c76eebed3f31884547cfdda0be1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf84c6120ae0c76eebed3f318… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 8 20:54:05 2010 +0100 makefiles: Move the CROSSOBJS dependency to the generated default dependencies. Get rid of a remaining C_SRCS16 reference. --- configure | 2 +- configure.ac | 2 +- dlls/Maketest.rules.in | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 9edb711..a0935bd 100755 --- a/configure +++ b/configure @@ -13644,7 +13644,7 @@ DEPENDENCIES="### Dependencies: Makefile: dummy -\$(MAKEDEP) \$(MAKEDEPFLAGS) -C\$(SRCDIR) -S\$(TOPSRCDIR) -T\$(TOPOBJDIR) \$(EXTRAINCL) \$(DEPEND_SRCS) -\$(OBJS) \$(C_SRCS16:.c=.o): \$(IDL_GEN_HEADERS) +\$(OBJS) \$(CROSSOBJS): \$(IDL_GEN_HEADERS) \$(IDL_GEN_C_SRCS:.c=.o): \$(IDL_GEN_C_SRCS) \$(RC_SRCS:.rc=.res): \$(IDL_TLB_SRCS:.idl=.tlb) \$(LEX_SRCS:.l=.yy.o): \$(LEX_SRCS:.l=.yy.c) diff --git a/configure.ac b/configure.ac index 0549119..3c651be 100644 --- a/configure.ac +++ b/configure.ac @@ -2088,7 +2088,7 @@ AC_SUBST(DEPENDENCIES,["### Dependencies: Makefile: dummy -\$(MAKEDEP) \$(MAKEDEPFLAGS) -C\$(SRCDIR) -S\$(TOPSRCDIR) -T\$(TOPOBJDIR) \$(EXTRAINCL) \$(DEPEND_SRCS) -\$(OBJS) \$(C_SRCS16:.c=.o): \$(IDL_GEN_HEADERS) +\$(OBJS) \$(CROSSOBJS): \$(IDL_GEN_HEADERS) \$(IDL_GEN_C_SRCS:.c=.o): \$(IDL_GEN_C_SRCS) \$(RC_SRCS:.rc=.res): \$(IDL_TLB_SRCS:.idl=.tlb) \$(LEX_SRCS:.l=.yy.o): \$(LEX_SRCS:.l=.yy.c) diff --git a/dlls/Maketest.rules.in b/dlls/Maketest.rules.in index 446ae72..2cd642b 100644 --- a/dlls/Maketest.rules.in +++ b/dlls/Maketest.rules.in @@ -51,8 +51,6 @@ crosstest:: @CROSSTEST@ $(CROSSTEST): $(CROSSOBJS) Makefile.in $(CROSSWINEGCC) $(CROSSOBJS) -o $@ $(ALL_LIBS) -$(CROSSOBJS): $(IDL_GEN_HEADERS) - # Rules for cleaning testclean::

1 0

Alexandre Julliard : makefiles: Generate the winetest rules from the WINE_CONFIG_TEST macro.
by Alexandre Julliard Feb. 9, 2010

Feb. 9, 2010

Module: wine Branch: master Commit: d5addea2794311d8220b760b271468afcb3b77bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5addea2794311d8220b760b2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 8 21:27:54 2010 +0100 makefiles: Generate the winetest rules from the WINE_CONFIG_TEST macro. --- aclocal.m4 | 10 +- configure | 658 ++++++++++++++++++++++++++++++++++++++++++++++++-- configure.ac | 20 +-- tools/make_makefiles | 4 +- 4 files changed, 652 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d5addea2794311d8220b7…

1 0

Alexandre Julliard : makefiles: Generate the list of test binaries from configure.
by Alexandre Julliard Feb. 9, 2010

Feb. 9, 2010

Module: wine Branch: master Commit: 454fb3c1daf1da43f2d270188b12610f68240b72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=454fb3c1daf1da43f2d270188… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 8 21:29:13 2010 +0100 makefiles: Generate the list of test binaries from configure. --- aclocal.m4 | 2 + configure | 215 +++++++++++++++++++++++++++++++++++++++++ configure.ac | 1 + programs/winetest/Makefile.in | 4 +- 4 files changed, 219 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=454fb3c1daf1da43f2d27…

1 0

Alexandre Julliard : makefiles: Generate a general catch-all dependency on .tab.h files to replace the manually maintained ones.
by Alexandre Julliard Feb. 9, 2010

Feb. 9, 2010

Module: wine Branch: master Commit: 9644d1dcd7e0ea6a5ec77f667e9c07d3ab938186 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9644d1dcd7e0ea6a5ec77f667… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 8 20:58:00 2010 +0100 makefiles: Generate a general catch-all dependency on .tab.h files to replace the manually maintained ones. --- configure | 2 +- configure.ac | 2 +- dlls/jscript/Makefile.in | 2 -- dlls/msi/Makefile.in | 2 -- libs/wpp/Makefile.in | 2 -- programs/winedbg/Makefile.in | 2 -- tools/widl/Makefile.in | 2 -- tools/wmc/Makefile.in | 2 -- tools/wrc/Makefile.in | 2 -- 9 files changed, 2 insertions(+), 16 deletions(-) diff --git a/configure b/configure index a0935bd..1ad05bf 100755 --- a/configure +++ b/configure @@ -13644,7 +13644,7 @@ DEPENDENCIES="### Dependencies: Makefile: dummy -\$(MAKEDEP) \$(MAKEDEPFLAGS) -C\$(SRCDIR) -S\$(TOPSRCDIR) -T\$(TOPOBJDIR) \$(EXTRAINCL) \$(DEPEND_SRCS) -\$(OBJS) \$(CROSSOBJS): \$(IDL_GEN_HEADERS) +\$(OBJS) \$(CROSSOBJS): \$(IDL_GEN_HEADERS) \$(BISON_SRCS:.y=.tab.h) \$(IDL_GEN_C_SRCS:.c=.o): \$(IDL_GEN_C_SRCS) \$(RC_SRCS:.rc=.res): \$(IDL_TLB_SRCS:.idl=.tlb) \$(LEX_SRCS:.l=.yy.o): \$(LEX_SRCS:.l=.yy.c) diff --git a/configure.ac b/configure.ac index 3c651be..4d7e1ab 100644 --- a/configure.ac +++ b/configure.ac @@ -2088,7 +2088,7 @@ AC_SUBST(DEPENDENCIES,["### Dependencies: Makefile: dummy -\$(MAKEDEP) \$(MAKEDEPFLAGS) -C\$(SRCDIR) -S\$(TOPSRCDIR) -T\$(TOPOBJDIR) \$(EXTRAINCL) \$(DEPEND_SRCS) -\$(OBJS) \$(CROSSOBJS): \$(IDL_GEN_HEADERS) +\$(OBJS) \$(CROSSOBJS): \$(IDL_GEN_HEADERS) \$(BISON_SRCS:.y=.tab.h) \$(IDL_GEN_C_SRCS:.c=.o): \$(IDL_GEN_C_SRCS) \$(RC_SRCS:.rc=.res): \$(IDL_TLB_SRCS:.idl=.tlb) \$(LEX_SRCS:.l=.yy.o): \$(LEX_SRCS:.l=.yy.c) diff --git a/dlls/jscript/Makefile.in b/dlls/jscript/Makefile.in index 6373796..587825a 100644 --- a/dlls/jscript/Makefile.in +++ b/dlls/jscript/Makefile.in @@ -45,5 +45,3 @@ BISON_SRCS = \ parser.tab.c: parser.tab.h # for parallel makes @DEPENDENCIES@ # everything below this line is overwritten by make depend - -lex.o: parser.tab.h diff --git a/dlls/msi/Makefile.in b/dlls/msi/Makefile.in index 8600b9f..ec0de40 100644 --- a/dlls/msi/Makefile.in +++ b/dlls/msi/Makefile.in @@ -91,5 +91,3 @@ RC_SRCS = \ sql.tab.c: sql.tab.h # for parallel makes @DEPENDENCIES@ # everything below this line is overwritten by make depend - -tokenize.o: sql.tab.h diff --git a/libs/wpp/Makefile.in b/libs/wpp/Makefile.in index 713ee4d..48869a7 100644 --- a/libs/wpp/Makefile.in +++ b/libs/wpp/Makefile.in @@ -23,5 +23,3 @@ $(MODULE): $(OBJS) ppy.tab.c: ppy.tab.h # for parallel makes @DEPENDENCIES@ # everything below this line is overwritten by make depend - -ppl.yy.o: ppy.tab.h diff --git a/programs/winedbg/Makefile.in b/programs/winedbg/Makefile.in index e4880fb..f3aef2c 100644 --- a/programs/winedbg/Makefile.in +++ b/programs/winedbg/Makefile.in @@ -64,5 +64,3 @@ uninstall:: dbg.tab.c: dbg.tab.h # for parallel makes @DEPENDENCIES@ # everything below this line is overwritten by make depend - -debug.yy.o: dbg.tab.h diff --git a/tools/widl/Makefile.in b/tools/widl/Makefile.in index d0fea83..21b8443 100644 --- a/tools/widl/Makefile.in +++ b/tools/widl/Makefile.in @@ -45,5 +45,3 @@ uninstall:: parser.tab.c: parser.tab.h # for parallel makes @DEPENDENCIES@ # everything below this line is overwritten by make depend - -parser.yy.o: parser.tab.h diff --git a/tools/wmc/Makefile.in b/tools/wmc/Makefile.in index fba92ea..05f7e90 100644 --- a/tools/wmc/Makefile.in +++ b/tools/wmc/Makefile.in @@ -40,5 +40,3 @@ uninstall:: mcy.tab.c: mcy.tab.h # for parallel makes @DEPENDENCIES@ # everything below this line is overwritten by make depend - -mcl.o: mcy.tab.h diff --git a/tools/wrc/Makefile.in b/tools/wrc/Makefile.in index c8a8534..3aa8647 100644 --- a/tools/wrc/Makefile.in +++ b/tools/wrc/Makefile.in @@ -45,5 +45,3 @@ uninstall:: parser.tab.c: parser.tab.h # for parallel makes @DEPENDENCIES@ # everything below this line is overwritten by make depend - -parser.yy.o: parser.tab.h

1 0

Stefan Dösinger : wined3d: Don' t use GL_MAP_FLUSH_EXPLICIT_BIT without GL_MAP_WRITE_BIT.
by Alexandre Julliard Feb. 9, 2010

Feb. 9, 2010

Module: wine Branch: master Commit: 24e2308670481513c62482d1e127e83fdf41c2f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24e2308670481513c62482d1e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Feb 8 12:24:36 2010 +0100 wined3d: Don't use GL_MAP_FLUSH_EXPLICIT_BIT without GL_MAP_WRITE_BIT. --- dlls/wined3d/buffer.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 3c7a2b9..e22d311 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1061,9 +1061,9 @@ static DWORD buffer_sanitize_flags(DWORD flags) static GLbitfield buffer_gl_map_flags(DWORD d3d_flags) { - GLbitfield ret = GL_MAP_FLUSH_EXPLICIT_BIT; + GLbitfield ret = 0; - if (!(d3d_flags & WINED3DLOCK_READONLY)) ret |= GL_MAP_WRITE_BIT; + if (!(d3d_flags & WINED3DLOCK_READONLY)) ret = GL_MAP_WRITE_BIT | GL_MAP_FLUSH_EXPLICIT_BIT; if (d3d_flags & (WINED3DLOCK_DISCARD | WINED3DLOCK_NOOVERWRITE)) {

1 0

Alexandre Julliard : makefiles: Generate dependencies to match each makefile to its subdirectory.
by Alexandre Julliard Feb. 9, 2010

Feb. 9, 2010

Module: wine Branch: master Commit: 54966368502086b3e8f8eab64d3c42ab8713a138 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54966368502086b3e8f8eab64… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 8 20:47:41 2010 +0100 makefiles: Generate dependencies to match each makefile to its subdirectory. --- Makefile.in | 30 +++++++++++++++--------------- aclocal.m4 | 3 ++- configure | 17 +++++++++++++++++ 3 files changed, 34 insertions(+), 16 deletions(-) diff --git a/Makefile.in b/Makefile.in index e1279a6..2f2c85b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -115,20 +115,19 @@ tools/wmc/__install__ tools/wmc/__install-dev__: tools/wmc tools/wrc/__install__ tools/wrc/__install-dev__: tools/wrc RECURSE_TARGETS = \ - $(SUBDIRS) \ - $(SUBDIRS:%=%/__clean__) \ - $(SUBDIRS:%=%/__depend__) \ - $(SUBDIRS:%=%/__install-dev__) \ - $(SUBDIRS:%=%/__install-lib__) \ - $(SUBDIRS:%=%/__install__) \ - $(SUBDIRS:%=%/__uninstall__) \ - $(TESTSUBDIRS:%=%/__crosstest__) \ - $(TESTSUBDIRS:%=%/__test__) \ - $(TESTSUBDIRS:%=%/__testclean__) - -depend $(RECURSE_TARGETS): $(MAKEDEP) - -$(MAKEDEP): include/config.h + __clean__ \ + __depend__ \ + __install__ \ + __instal-dev__ \ + __install-lib__ \ + __uninstall__ \ + __crosstest__ + +dlls $(RECURSE_TARGETS:%=dlls/%): $(MAKEDEP) +programs $(RECURSE_TARGETS:%=programs/%): $(MAKEDEP) +depend: $(MAKEDEP) + +$(MAKEDEP): include/config.h tools/Makefile @cd $(TOOLSDIR)/tools && $(MAKE) makedep$(TOOLSEXT) # Test rules @@ -166,7 +165,8 @@ $(ALL_CONFIGS): .BEGIN: Makefile .MAKEFILEDEPS: -$(RECURSE_TARGETS) $(MAKEDEP): $(ALL_MAKEFILES) +dlls $(RECURSE_TARGETS:%=dlls/%): $(ALL_MAKEFILES) +programs $(RECURSE_TARGETS:%=programs/%): $(ALL_MAKEFILES) distclean:: $(RM) $(ALL_CONFIGS) diff --git a/aclocal.m4 b/aclocal.m4 index 357edf8..b9f485d 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -176,7 +176,8 @@ m4_ifval([$4],[test "x$ac_enable" != xno]m4_foreach([ac_var],[$4],[ && ac_var="$ ac_dir"])) AS_VAR_POPDEF([ac_enable])dnl ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS -[$1: ]m4_ifval([$2],[$1.in $2],[$1.in]) config.status" +m4_ifval(ac_dir,m4_ifval([$3],,[\$(RECURSE_TARGETS:%=ac_dir/%) ac_dir: $1 \$(MAKEDEP) +]))[$1: ]m4_ifval([$2],[$1.in $2],[$1.in]) config.status" AC_CONFIG_FILES([$1])dnl m4_popdef([ac_dir])]) diff --git a/configure b/configure index 0adb500..9edb711 100755 --- a/configure +++ b/configure @@ -13767,6 +13767,7 @@ ALL_MAKEFILES="$ALL_MAKEFILES \\ test "x$enable_dlls" != xno && ALL_TOP_DIRS="$ALL_TOP_DIRS \\ dlls" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +\$(RECURSE_TARGETS:%=dlls/%) dlls: dlls/Makefile \$(MAKEDEP) dlls/Makefile: dlls/Makefile.in Make.rules config.status" ac_config_files="$ac_config_files dlls/Makefile" @@ -18302,6 +18303,7 @@ ALL_MAKEFILES="$ALL_MAKEFILES \\ test "x$enable_documentation" != xno && ALL_TOP_DIRS="$ALL_TOP_DIRS \\ documentation" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +\$(RECURSE_TARGETS:%=documentation/%) documentation: documentation/Makefile \$(MAKEDEP) documentation/Makefile: documentation/Makefile.in Make.rules config.status" ac_config_files="$ac_config_files documentation/Makefile" @@ -18310,6 +18312,7 @@ ALL_MAKEFILES="$ALL_MAKEFILES \\ test "x$enable_fonts" != xno && ALL_TOP_DIRS="$ALL_TOP_DIRS \\ fonts" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +\$(RECURSE_TARGETS:%=fonts/%) fonts: fonts/Makefile \$(MAKEDEP) fonts/Makefile: fonts/Makefile.in Make.rules config.status" ac_config_files="$ac_config_files fonts/Makefile" @@ -18318,6 +18321,7 @@ ALL_MAKEFILES="$ALL_MAKEFILES \\ test "x$enable_include" != xno && ALL_TOP_DIRS="$ALL_TOP_DIRS \\ include" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +\$(RECURSE_TARGETS:%=include/%) include: include/Makefile \$(MAKEDEP) include/Makefile: include/Makefile.in Make.rules config.status" ac_config_files="$ac_config_files include/Makefile" @@ -18325,6 +18329,7 @@ ALL_MAKEFILES="$ALL_MAKEFILES \\ libs/port/Makefile" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +\$(RECURSE_TARGETS:%=libs/port/%) libs/port: libs/port/Makefile \$(MAKEDEP) libs/port/Makefile: libs/port/Makefile.in Make.rules config.status" ac_config_files="$ac_config_files libs/port/Makefile" @@ -18332,6 +18337,7 @@ ALL_MAKEFILES="$ALL_MAKEFILES \\ libs/wine/Makefile" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +\$(RECURSE_TARGETS:%=libs/wine/%) libs/wine: libs/wine/Makefile \$(MAKEDEP) libs/wine/Makefile: libs/wine/Makefile.in Make.rules config.status" ac_config_files="$ac_config_files libs/wine/Makefile" @@ -18339,6 +18345,7 @@ ALL_MAKEFILES="$ALL_MAKEFILES \\ libs/wpp/Makefile" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +\$(RECURSE_TARGETS:%=libs/wpp/%) libs/wpp: libs/wpp/Makefile \$(MAKEDEP) libs/wpp/Makefile: libs/wpp/Makefile.in Make.rules config.status" ac_config_files="$ac_config_files libs/wpp/Makefile" @@ -18347,6 +18354,7 @@ ALL_MAKEFILES="$ALL_MAKEFILES \\ test "x$enable_loader" != xno && ALL_TOP_DIRS="$ALL_TOP_DIRS \\ loader" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +\$(RECURSE_TARGETS:%=loader/%) loader: loader/Makefile \$(MAKEDEP) loader/Makefile: loader/Makefile.in Make.rules config.status" ac_config_files="$ac_config_files loader/Makefile" @@ -18355,6 +18363,7 @@ ALL_MAKEFILES="$ALL_MAKEFILES \\ test "x$enable_programs" != xno && ALL_TOP_DIRS="$ALL_TOP_DIRS \\ programs" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +\$(RECURSE_TARGETS:%=programs/%) programs: programs/Makefile \$(MAKEDEP) programs/Makefile: programs/Makefile.in Make.rules config.status" ac_config_files="$ac_config_files programs/Makefile" @@ -18857,6 +18866,7 @@ ALL_MAKEFILES="$ALL_MAKEFILES \\ test "x$enable_server" != xno && ALL_TOP_DIRS="$ALL_TOP_DIRS \\ server" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +\$(RECURSE_TARGETS:%=server/%) server: server/Makefile \$(MAKEDEP) server/Makefile: server/Makefile.in Make.rules config.status" ac_config_files="$ac_config_files server/Makefile" @@ -18865,6 +18875,7 @@ ALL_MAKEFILES="$ALL_MAKEFILES \\ test "x$enable_tools" != xno && ALL_TOOL_DIRS="$ALL_TOOL_DIRS \\ tools" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +\$(RECURSE_TARGETS:%=tools/%) tools: tools/Makefile \$(MAKEDEP) tools/Makefile: tools/Makefile.in Make.rules config.status" ac_config_files="$ac_config_files tools/Makefile" @@ -18873,6 +18884,7 @@ ALL_MAKEFILES="$ALL_MAKEFILES \\ test "x$enable_tools" != xno && ALL_TOOL_DIRS="$ALL_TOOL_DIRS \\ tools/widl" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +\$(RECURSE_TARGETS:%=tools/widl/%) tools/widl: tools/widl/Makefile \$(MAKEDEP) tools/widl/Makefile: tools/widl/Makefile.in Make.rules config.status" ac_config_files="$ac_config_files tools/widl/Makefile" @@ -18881,6 +18893,7 @@ ALL_MAKEFILES="$ALL_MAKEFILES \\ test "x$enable_tools" != xno && ALL_TOOL_DIRS="$ALL_TOOL_DIRS \\ tools/winebuild" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +\$(RECURSE_TARGETS:%=tools/winebuild/%) tools/winebuild: tools/winebuild/Makefile \$(MAKEDEP) tools/winebuild/Makefile: tools/winebuild/Makefile.in Make.rules config.status" ac_config_files="$ac_config_files tools/winebuild/Makefile" @@ -18889,6 +18902,7 @@ ALL_MAKEFILES="$ALL_MAKEFILES \\ test "x$enable_tools" != xno && ALL_TOOL_DIRS="$ALL_TOOL_DIRS \\ tools/winedump" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +\$(RECURSE_TARGETS:%=tools/winedump/%) tools/winedump: tools/winedump/Makefile \$(MAKEDEP) tools/winedump/Makefile: tools/winedump/Makefile.in Make.rules config.status" ac_config_files="$ac_config_files tools/winedump/Makefile" @@ -18897,6 +18911,7 @@ ALL_MAKEFILES="$ALL_MAKEFILES \\ test "x$enable_tools" != xno && ALL_TOOL_DIRS="$ALL_TOOL_DIRS \\ tools/winegcc" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +\$(RECURSE_TARGETS:%=tools/winegcc/%) tools/winegcc: tools/winegcc/Makefile \$(MAKEDEP) tools/winegcc/Makefile: tools/winegcc/Makefile.in Make.rules config.status" ac_config_files="$ac_config_files tools/winegcc/Makefile" @@ -18905,6 +18920,7 @@ ALL_MAKEFILES="$ALL_MAKEFILES \\ test "x$enable_tools" != xno && ALL_TOOL_DIRS="$ALL_TOOL_DIRS \\ tools/wmc" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +\$(RECURSE_TARGETS:%=tools/wmc/%) tools/wmc: tools/wmc/Makefile \$(MAKEDEP) tools/wmc/Makefile: tools/wmc/Makefile.in Make.rules config.status" ac_config_files="$ac_config_files tools/wmc/Makefile" @@ -18913,6 +18929,7 @@ ALL_MAKEFILES="$ALL_MAKEFILES \\ test "x$enable_tools" != xno && ALL_TOOL_DIRS="$ALL_TOOL_DIRS \\ tools/wrc" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +\$(RECURSE_TARGETS:%=tools/wrc/%) tools/wrc: tools/wrc/Makefile \$(MAKEDEP) tools/wrc/Makefile: tools/wrc/Makefile.in Make.rules config.status" ac_config_files="$ac_config_files tools/wrc/Makefile"

1 0