August 2013 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Assume the buffer has a buffer object in buffer_add_dirty_area().
by Alexandre Julliard 15 Aug '13

15 Aug '13

Module: wine Branch: master Commit: cbaa17d3cf7d6f3bd6a050aff33cce9942287c2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbaa17d3cf7d6f3bd6a050aff… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 13 08:51:46 2013 +0200 wined3d: Assume the buffer has a buffer object in buffer_add_dirty_area(). --- dlls/wined3d/buffer.c | 27 ++++++++++++--------------- 1 files changed, 12 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index f2ba88e..4bfca33 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -34,11 +34,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); #define VB_MAXFULLCONVERSIONS 5 /* Number of full conversions before we stop converting */ #define VB_RESETFULLCONVS 20 /* Reset full conversion counts after that number of draws */ -static void buffer_add_dirty_area(struct wined3d_buffer *buffer, UINT offset, UINT size) +static void buffer_invalidate_bo_range(struct wined3d_buffer *buffer, UINT offset, UINT size) { - if (!buffer->buffer_object) - return; - if (!offset && !size) goto invalidate_all; @@ -188,7 +185,7 @@ static void buffer_create_buffer_object(struct wined3d_buffer *This, const struc if (This->flags & WINED3D_BUFFER_DOUBLEBUFFER) { - buffer_add_dirty_area(This, 0, 0); + buffer_invalidate_bo_range(This, 0, 0); } else { @@ -808,7 +805,7 @@ void CDECL wined3d_buffer_preload(struct wined3d_buffer *buffer) /* The declaration changed, reload the whole buffer. */ WARN("Reloading buffer because of a vertex declaration change.\n"); - buffer_add_dirty_area(buffer, 0, 0); + buffer_invalidate_bo_range(buffer, 0, 0); /* Avoid unfenced updates, we might overwrite more areas of the buffer than the application * cleared for unsynchronized updates @@ -990,19 +987,19 @@ HRESULT CDECL wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UIN TRACE("buffer %p, offset %u, size %u, data %p, flags %#x\n", buffer, offset, size, data, flags); flags = buffer_sanitize_flags(buffer, flags); - /* DISCARD invalidates the entire buffer, regardless of the specified - * offset and size. Some applications also depend on the entire buffer - * being uploaded in that case. Two such applications are Port Royale - * and Darkstar One. */ - if (flags & WINED3D_MAP_DISCARD) - buffer_add_dirty_area(buffer, 0, 0); - else if (!(flags & WINED3D_MAP_READONLY)) - buffer_add_dirty_area(buffer, offset, size); - count = ++buffer->resource.map_count; if (buffer->buffer_object) { + /* DISCARD invalidates the entire buffer, regardless of the specified + * offset and size. Some applications also depend on the entire buffer + * being uploaded in that case. Two such applications are Port Royale + * and Darkstar One. */ + if (flags & WINED3D_MAP_DISCARD) + buffer_invalidate_bo_range(buffer, 0, 0); + else if (!(flags & WINED3D_MAP_READONLY)) + buffer_invalidate_bo_range(buffer, offset, size); + if (!(buffer->flags & WINED3D_BUFFER_DOUBLEBUFFER)) { if (count == 1)

1 0

Henri Verbeet : d3drm: Avoid LPDIRECT3DRMPICKEDARRAY.
by Alexandre Julliard 15 Aug '13

15 Aug '13

Module: wine Branch: master Commit: cf3053f504b0946791c61af4c79abcde6524177a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf3053f504b0946791c61af4c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 13 08:51:47 2013 +0200 d3drm: Avoid LPDIRECT3DRMPICKEDARRAY. --- dlls/d3drm/viewport.c | 16 ++++++---------- include/d3drmobj.h | 4 ++-- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/dlls/d3drm/viewport.c b/dlls/d3drm/viewport.c index 49cceb0..ee4cbb3 100644 --- a/dlls/d3drm/viewport.c +++ b/dlls/d3drm/viewport.c @@ -341,12 +341,10 @@ static HRESULT WINAPI IDirect3DRMViewportImpl_GetPlane(IDirect3DRMViewport* ifac return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMViewportImpl_Pick(IDirect3DRMViewport* iface, LONG x, LONG y, - LPDIRECT3DRMPICKEDARRAY *return_visuals) +static HRESULT WINAPI IDirect3DRMViewportImpl_Pick(IDirect3DRMViewport *iface, + LONG x, LONG y, IDirect3DRMPickedArray **visuals) { - IDirect3DRMViewportImpl *This = impl_from_IDirect3DRMViewport(iface); - - FIXME("(%p/%p)->(%u, %u, %p): stub\n", iface, This, x, y, return_visuals); + FIXME("iface %p, x %d, y %d, visuals %p stub!\n", iface, x, y, visuals); return E_NOTIMPL; } @@ -760,12 +758,10 @@ static HRESULT WINAPI IDirect3DRMViewport2Impl_GetPlane(IDirect3DRMViewport2* if return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMViewport2Impl_Pick(IDirect3DRMViewport2* iface, LONG x, LONG y, - LPDIRECT3DRMPICKEDARRAY *return_visuals) +static HRESULT WINAPI IDirect3DRMViewport2Impl_Pick(IDirect3DRMViewport2 *iface, + LONG x, LONG y, IDirect3DRMPickedArray **visuals) { - IDirect3DRMViewportImpl *This = impl_from_IDirect3DRMViewport2(iface); - - FIXME("(%p/%p)->(%u, %u, %p): stub\n", iface, This, x, y, return_visuals); + FIXME("iface %p, x %d, y %d, visuals %p stub!\n", iface, x, y, visuals); return E_NOTIMPL; } diff --git a/include/d3drmobj.h b/include/d3drmobj.h index 0253b89..7bae278 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -826,7 +826,7 @@ DECLARE_INTERFACE_(IDirect3DRMViewport,IDirect3DRMObject) STDMETHOD(GetCamera)(THIS_ struct IDirect3DRMFrame **camera) PURE; STDMETHOD(GetDevice)(THIS_ IDirect3DRMDevice **device) PURE; STDMETHOD(GetPlane)(THIS_ D3DVALUE *left, D3DVALUE *right, D3DVALUE *bottom, D3DVALUE *top) PURE; - STDMETHOD(Pick)(THIS_ LONG x, LONG y, LPDIRECT3DRMPICKEDARRAY *return_visuals) PURE; + STDMETHOD(Pick)(THIS_ LONG x, LONG y, struct IDirect3DRMPickedArray **visuals) PURE; STDMETHOD_(BOOL, GetUniformScaling)(THIS) PURE; STDMETHOD_(LONG, GetX)(THIS) PURE; STDMETHOD_(LONG, GetY)(THIS) PURE; @@ -966,7 +966,7 @@ DECLARE_INTERFACE_(IDirect3DRMViewport2,IDirect3DRMObject) STDMETHOD(GetCamera)(THIS_ struct IDirect3DRMFrame3 **camera) PURE; STDMETHOD(GetDevice)(THIS_ IDirect3DRMDevice3 **device) PURE; STDMETHOD(GetPlane)(THIS_ D3DVALUE *left, D3DVALUE *right, D3DVALUE *bottom, D3DVALUE *top) PURE; - STDMETHOD(Pick)(THIS_ LONG x, LONG y, LPDIRECT3DRMPICKEDARRAY *return_visuals) PURE; + STDMETHOD(Pick)(THIS_ LONG x, LONG y, struct IDirect3DRMPickedArray **visuals) PURE; STDMETHOD_(BOOL, GetUniformScaling)(THIS) PURE; STDMETHOD_(LONG, GetX)(THIS) PURE; STDMETHOD_(LONG, GetY)(THIS) PURE;

1 0

Jacek Caban : winetest: Added www.winehq.org snapshot for test purposes.
by Alexandre Julliard 15 Aug '13

15 Aug '13

Module: tools Branch: master Commit: 8571ee72bee49901d9e2dcf5e1c7adc89ea196ce URL: http://source.winehq.org/git/tools.git/?a=commit;h=8571ee72bee49901d9e2dcf5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 13 14:26:34 2013 +0200 winetest: Added www.winehq.org snapshot for test purposes. --- winetest/tests/winehq_snapshot/index.html | 322 +++++++++++++++++++ winetest/tests/winehq_snapshot/index_files/brand | 109 +++++++ .../winehq_snapshot/index_files/cw_logo_sm.png | Bin 0 -> 4383 bytes winetest/tests/winehq_snapshot/index_files/ga.js | 64 ++++ .../winehq_snapshot/index_files/images/bg.jpg | Bin 0 -> 86167 bytes .../index_files/images/home_icons.png | Bin 0 -> 21418 bytes .../winehq_snapshot/index_files/images/tab_h.png | Bin 0 -> 584 bytes .../winehq_snapshot/index_files/images/tab_s.png | Bin 0 -> 614 bytes .../winehq_snapshot/index_files/images/tab_u.png | Bin 0 -> 616 bytes .../tests/winehq_snapshot/index_files/jquery.js | 32 ++ .../tests/winehq_snapshot/index_files/styles.css | 324 ++++++++++++++++++++ .../tests/winehq_snapshot/index_files/utils.js | 21 ++ .../index_files/winehq_logo_glass.png | Bin 0 -> 36271 bytes .../index_files/winehq_logo_text.png | Bin 0 -> 6870 bytes 14 files changed, 872 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=8571ee72bee49901d9e2…

1 0

Jacek Caban : winetest: Removed Google Analytics from winehq snapshot.
by Alexandre Julliard 15 Aug '13

15 Aug '13

Module: tools Branch: master Commit: 5876c8015253399ceac2defb8b705d88b102426d URL: http://source.winehq.org/git/tools.git/?a=commit;h=5876c8015253399ceac2defb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 13 14:27:05 2013 +0200 winetest: Removed Google Analytics from winehq snapshot. --- winetest/tests/winehq_snapshot/index.html | 18 +----- winetest/tests/winehq_snapshot/index_files/ga.js | 64 ---------------------- 2 files changed, 3 insertions(+), 79 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=5876c8015253399ceac2…

1 0

Jacek Caban : winegecko.php: Added 2.24-beta1 release.
by Alexandre Julliard 15 Aug '13

15 Aug '13

Module: tools Branch: master Commit: d25c77748e4b7b41205c42b5082f9ac9f82f3531 URL: http://source.winehq.org/git/tools.git/?a=commit;h=d25c77748e4b7b41205c42b5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 14 14:38:04 2013 +0200 winegecko.php: Added 2.24-beta1 release. --- winegecko.php | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/winegecko.php b/winegecko.php index 963966f..5120880 100644 --- a/winegecko.php +++ b/winegecko.php @@ -76,7 +76,9 @@ $aFileSizes = array( '2.21-beta1-x86'=>20875264, '2.21-beta1-x86_64'=>21648896, '2.21-x86'=>20871680, - '2.21-x86_64'=>21646336 + '2.21-x86_64'=>21646336, + '2.24-beta1-x86'=>22354944, + '2.24-beta1-x86_64'=>23590400 ); // Exact size of the file:

1 0

Frédéric Delanoy : winelib: Assorted formatting & tagging fixes.
by Alexandre Julliard 15 Aug '13

15 Aug '13

Module: docs Branch: master Commit: b4fc598786041af46fc60b79223d012485bc1758 URL: http://source.winehq.org/git/docs.git/?a=commit;h=b4fc598786041af46fc60b792… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Aug 2 21:54:59 2013 +0200 winelib: Assorted formatting & tagging fixes. --- en/winelib-bindlls.sgml | 85 ++++++++++++---------- en/winelib-intro.sgml | 107 +++++++++++++++-------------- en/winelib-mfc.sgml | 13 ++-- en/winelib-porting.sgml | 24 +++--- en/winelib-toolkit.sgml | 176 ++++++++++++++++++++++++----------------------- 5 files changed, 211 insertions(+), 194 deletions(-) Diff: http://source.winehq.org/git/docs.git/?a=commitdiff;h=b4fc598786041af46fc60…

1 0

Frédéric Delanoy : winedev: configure. ac is used instead of configure.in.
by Alexandre Julliard 15 Aug '13

15 Aug '13

Module: docs Branch: master Commit: 411ba3448ba50eab1c85dc2c6e10b8800698752d URL: http://source.winehq.org/git/docs.git/?a=commit;h=411ba3448ba50eab1c85dc2c6… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Aug 15 17:22:37 2013 +0200 winedev: configure.ac is used instead of configure.in. --- en/winedev-coding.sgml | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/en/winedev-coding.sgml b/en/winedev-coding.sgml index 69f2479..b5eb660 100644 --- a/en/winedev-coding.sgml +++ b/en/winedev-coding.sgml @@ -309,7 +309,7 @@ code <para> This first step is to make <command>autoconf</command> check - for this header. In <filename>configure.in</filename> you + for this header. In <filename>configure.ac</filename> you add a segment like this in the section that checks for header files (search for "header files"): </para> @@ -363,7 +363,7 @@ AC_CHECK_HEADER(foo.h, AC_DEFINE(HAVE_FOO_H)) function. To solve this problem you would add <function>memmove</function> to the list of functions that <command>autoconf</command> checks for. In - <filename>configure.in</filename> you search for + <filename>configure.ac</filename> you search for <function>AC_CHECK_FUNCS</function> and add <function>memmove</function> (you will notice that someone already did this for this particular function).

1 0

Frédéric Delanoy : winedev: 'doc-html' make target doesn't exist anymore.
by Alexandre Julliard 15 Aug '13

15 Aug '13

Module: docs Branch: master Commit: ba4be23d7ee7729e7c5355392b43c736565fc118 URL: http://source.winehq.org/git/docs.git/?a=commit;h=ba4be23d7ee7729e7c5355392… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Aug 15 17:22:38 2013 +0200 winedev: 'doc-html' make target doesn't exist anymore. --- en/winedev-documentation.sgml | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/en/winedev-documentation.sgml b/en/winedev-documentation.sgml index 9f30b87..3ca0060 100644 --- a/en/winedev-documentation.sgml +++ b/en/winedev-documentation.sgml @@ -574,11 +574,12 @@ <para> You can also generate HTML output for the API documentation, in this case the - make command is <command>make doc-html</command> in the dll directory, - or <command>make htmlpages</command> from the root. The output will be + make command is <command>make htmlpages</command> in the dll directory, + or from the root. The output will be placed by default under <filename>documentation/html</filename>. Similarly - you can create SGML source code to produce the <emphasis>Wine Api Guide</emphasis> - with the command <command>make sgmlpages</command>. + you can create SGML/XML Docbook source code to produce the <emphasis>Wine API + Guide</emphasis> with the command <command>make sgmlpages</command>/<command>make + xmlpages</command> respectively. </para> </sect2> </sect1>

1 0

Frédéric Delanoy : winedev: wine-kthread is obsolete.
by Alexandre Julliard 15 Aug '13

15 Aug '13

Module: docs Branch: master Commit: 46f0aa00efb29873560316bf0355c6f62b3f04f5 URL: http://source.winehq.org/git/docs.git/?a=commit;h=46f0aa00efb29873560316bf0… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Aug 15 17:22:39 2013 +0200 winedev: wine-kthread is obsolete. --- en/winedev-debugger.sgml | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/en/winedev-debugger.sgml b/en/winedev-debugger.sgml index 0003f01..de627f1 100644 --- a/en/winedev-debugger.sgml +++ b/en/winedev-debugger.sgml @@ -2426,9 +2426,7 @@ set $BreakAllThreadsStartup = 1 <listitem> <para> In ddd, use the 'Open File' or 'Open Program' to - point to the Wine executable (which is either - wine-pthread or wine-kthread depending on your - settings). + point to the Wine executable. </para> </listitem> <listitem> @@ -2473,8 +2471,7 @@ kdbg -r localhost:32878 wine </screen> localhost:32878 is not a fixed value, but has been printed in step 1/. 'wine' should also be the full - path to the Wine executable (which is either - wine-pthread or wine-kthread depending on your settings). + path to the Wine executable. </para> </listitem> </orderedlist>

1 0

Frédéric Delanoy : winedev: Wine Packager' s Guide is no more.
by Alexandre Julliard 15 Aug '13

15 Aug '13

Module: docs Branch: master Commit: 4741a6c29726ca7eadd234b81705128ee59ea7d1 URL: http://source.winehq.org/git/docs.git/?a=commit;h=4741a6c29726ca7eadd234b81… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Aug 15 17:22:40 2013 +0200 winedev: Wine Packager's Guide is no more. --- en/winedev-documentation.sgml | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/en/winedev-documentation.sgml b/en/winedev-documentation.sgml index 3ca0060..1ac0400 100644 --- a/en/winedev-documentation.sgml +++ b/en/winedev-documentation.sgml @@ -60,13 +60,6 @@ </para></listitem> <listitem><para> - The <emphasis>Wine Packager's Guide</emphasis>. This book contains - information for anyone who will be distributing Wine to end users - in a prepackaged format. It is also the exception to the rule as - it has intentionally been kept in text format. - </para></listitem> - - <listitem><para> The <emphasis>Wine FAQ</emphasis>. This book contains frequently asked questions about Wine with their answers. </para></listitem>

1 0