wine-commits October 2010

wine-commits@winehq.org

2 participants
1174 discussions

Yaron Shahrabani : website: Added wwn page translation.
by Jeremy Newman 18 Oct '10

18 Oct '10

Module: website Branch: master Commit: fea035fbe331fd74930ae6acb918d9049f35ad58 URL: http://source.winehq.org/git/website.git/?a=commit;h=fea035fbe331fd74930ae6… Author: Yaron Shahrabani <sh.yaron(a)gmail.com> Date: Sat Oct 16 05:04:36 2010 +0200 website: Added wwn page translation. --0016368330de3f1e0a0492b3358a Content-Type: text/plain; charset=UTF-8 Yaron Shahrabani <Hebrew translator> <div dir="ltr"><br clear="all"><div dir="ltr"><span style="font-size:large"><font color="#990000">Yaron</font><font color="#330000"> Shahrabani</font></span><blockquote style="margin:0 0 0 40px;border:none;padding:0px"><div> <font color="#666666"><span style="font-size:x-small"><font color="#FF0000"><</font></span>Hebrew translator<span style="font-size:x-small"><font color="#FF0000">></font></span></font></div></blockquote></div><br> </div> >From 3126b8e43765faab746c5d7e2c16c15885a53d88 Mon Sep 17 00:00:00 2001 From: Yaron Shahrabani <sh.yaron(a)gmail.com> Date: Sat, 16 Oct 2010 04:18:55 +0200 Subject: website: Added wwn translation --- templates/he/wwn.template | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/he/wwn.template b/templates/he/wwn.template index 9135c58..d29f5e2 100644 --- a/templates/he/wwn.template +++ b/templates/he/wwn.template @@ -1,8 +1,8 @@ - - + + -<h1 class="title">World Wine News</h1> -<div style="font-size: x-small; margin-top: 0;">All the news that fits, we print.</div> +<h1 class="title">חדשות Wine העולמיות</h1> +<div style="font-size: x-small; margin-top: 0;">כל החדשות שמתאימות, מופיעות כאן.</div>

1 0

Frédéric Delanoy : French translation for release 1.3.5
by Jeremy Newman 15 Oct '10

15 Oct '10

Module: website Branch: master Commit: 1709b2482c4a6a6babecc07bc21047623801b13f URL: http://source.winehq.org/git/website.git/?a=commit;h=1709b2482c4a6a6babecc0… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Oct 15 21:44:38 2010 +0200 French translation for release 1.3.5 --- news/fr/2010101501.xml | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/news/fr/2010101501.xml b/news/fr/2010101501.xml new file mode 100644 index 0000000..4e20345 --- /dev/null +++ b/news/fr/2010101501.xml @@ -0,0 +1,22 @@ +<news> +<date>15 octobre 2010</date> +<title>Sortie de Wine 1.3.5</title> +<body> +<p> La version de développement 1.3.5 de Wine est à présent disponible.</p> +<p> <a href="{$root}/announce/1.3.5">Nouveautés</a> de cette version : +<ul> + <li>Support des curseurs animés.</li> + <li>Impression directe via CUPS au lieu de lpr.</li> + <li>Corrections pour le programme d'installation d'Office 2010.</li> + <li>Un tas d'améliorations pour MSXML3.</li> + <li>Prise en charge améliorée du Shader Model 4.</li> + <li>Icônes adéquates pour l'Internet Explorer intégré.</li> + <li>Mises à jour de traductions.</li> + <li>Diverses corrections de bogues.</li> +</ul></p> +<p><p>Le <a +href="http://prdownloads.sourceforge.net/wine/wine-1.3.5.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. +</p></body></news>

1 0

André Hentschel : Wine 1.3.5 freigegeben
by Jeremy Newman 15 Oct '10

15 Oct '10

Module: website Branch: master Commit: 55a2ad434921f280be0f6769ff246f47d830491d URL: http://source.winehq.org/git/website.git/?a=commit;h=55a2ad434921f280be0f67… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Oct 15 20:48:47 2010 +0200 Wine 1.3.5 freigegeben --- news/de/2010101501.xml | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/news/de/2010101501.xml b/news/de/2010101501.xml new file mode 100644 index 0000000..85d7664 --- /dev/null +++ b/news/de/2010101501.xml @@ -0,0 +1,19 @@ +<news> +<date>15. Oktober 2010</date> +<title>Wine 1.3.5 freigegeben</title> +<body> +<p> Die Entwicklungsversion 1.3.5 von Wine ist jetzt verfügbar.</p> +<p> <a href="{$root}/announce/1.3.5">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Unterstützung für animierte Mauszeiger.</li> + <li>Direktes drucken mit CUPS anstatt lpr.</li> + <li>Behebungen für die Installation von Office 2010.</li> + <li>Viele MSXML3 Verbesserungen.</li> + <li>Verbesserte Unterstützung von Shader Model 4.</li> + <li>Anständige Schaltflächen für den eigenen Internet Explorer.</li> + <li>Updates in den Übersetzungen.</li> + <li>Verschiedenste Fehlerbehebungen.</li> +</ul></p> +<p><p>Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.5.tar.bz2">verfügbar</a>. +Binär-Downloads werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Download-Seiten</a> zur Verfügung. +</p></body></news>

1 0

Alexandre Julliard : Wine release 1.3.5
by Alexandre Julliard 15 Oct '10

15 Oct '10

Module: website Branch: master Commit: 90c5298c91b3dbd08cc322b4a3009f524cc15473 URL: http://source.winehq.org/git/website.git/?a=commit;h=90c5298c91b3dbd08cc322… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 15 19:45:10 2010 +0200 Wine release 1.3.5 --- news/en/2010101501.xml | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/news/en/2010101501.xml b/news/en/2010101501.xml new file mode 100644 index 0000000..b005862 --- /dev/null +++ b/news/en/2010101501.xml @@ -0,0 +1,19 @@ +<news> +<date>October 15, 2010</date> +<title>Wine 1.3.5 Released</title> +<body> +<p> The Wine development release 1.3.5 is now available.</p> +<p> <a href="{$root}/announce/1.3.5">What's new</a> in this release: +<ul> + <li>Support for animated cursors.</li> + <li>Printing directly through CUPS instead of lpr.</li> + <li>Installer fixes for Office 2010.</li> + <li>Many MSXML3 improvements.</li> + <li>Improved Shader Model 4 support.</li> + <li>Proper icons in built-in Internet Explorer.</li> + <li>Translation updates.</li> + <li>Various bug fixes.</li> +</ul></p> +<p><p>The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.5.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</p></body></news>

1 0

Tag wine-1.3.5 : Alexandre Julliard : Release 1.3.5
by Alexandre Julliard 15 Oct '10

15 Oct '10

Module: wine Branch: refs/tags/wine-1.3.5 Tag: fd99e639c48a342ef662e4375442a014c29e5a9b URL: http://source.winehq.org/git/wine.git/?a=tag;h=fd99e639c48a342ef662e4375442… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 15 19:37:09 2010 +0200 Release 1.3.5

1 0

Alexandre Julliard : Release 1.3.5.
by Alexandre Julliard 15 Oct '10

15 Oct '10

Module: wine Branch: master Commit: b29e111260423fa7e044acaf93112ffc211c423e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b29e111260423fa7e044acaf9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 15 19:37:09 2010 +0200 Release 1.3.5. --- ANNOUNCE | 1233 +++++++++++++++++++++++++++++-------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 604 insertions(+), 649 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b29e111260423fa7e044a…

1 0

Henri Verbeet : d3dcompiler: Remove some stray tabs.
by Alexandre Julliard 15 Oct '10

15 Oct '10

Module: wine Branch: master Commit: ac8f8c02a6ab7118f0ad3e6c752a7601ab22773d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac8f8c02a6ab7118f0ad3e6c7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 15 14:35:15 2010 +0200 d3dcompiler: Remove some stray tabs. --- dlls/d3dcompiler_43/asmparser.c | 13 +++++++------ dlls/d3dcompiler_43/asmshader.y | 2 +- dlls/d3dcompiler_43/d3dcompiler_private.h | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/d3dcompiler_43/asmparser.c b/dlls/d3dcompiler_43/asmparser.c index 8d65d04..789bdb5 100644 --- a/dlls/d3dcompiler_43/asmparser.c +++ b/dlls/d3dcompiler_43/asmparser.c @@ -161,8 +161,9 @@ static void asmparser_dcl_input_ps_2(struct asm_parser *This, DWORD usage, DWORD } } -static void asmparser_dcl_input_unsupported(struct asm_parser *This, DWORD usage, DWORD num, - DWORD mod, const struct shader_reg *reg) { +static void asmparser_dcl_input_unsupported(struct asm_parser *This, + DWORD usage, DWORD num, DWORD mod, const struct shader_reg *reg) +{ asmparser_message(This, "Line %u: Input declaration unsupported in this shader version\n", This->line_no); set_parse_status(This, PARSE_ERR); } @@ -185,9 +186,9 @@ static void asmparser_dcl_sampler(struct asm_parser *This, DWORD samptype, } } -static void asmparser_dcl_sampler_unsupported(struct asm_parser *This, DWORD samptype, - DWORD mod, DWORD regnum, - unsigned int line_no) { +static void asmparser_dcl_sampler_unsupported(struct asm_parser *This, + DWORD samptype, DWORD mod, DWORD regnum, unsigned int line_no) +{ asmparser_message(This, "Line %u: Sampler declaration unsupported in this shader version\n", This->line_no); set_parse_status(This, PARSE_ERR); } @@ -538,7 +539,7 @@ ns */ return; } /* Use the default handling */ - break; + break; case BWRITERSIO_TEXCOORD: /* texcoord/texcrd are two instructions present only in PS <= 1.3 and PS 1.4 respectively */ if(This->shader->version == BWRITERPS_VERSION(1, 4)) diff --git a/dlls/d3dcompiler_43/asmshader.y b/dlls/d3dcompiler_43/asmshader.y index 5dc0914..4360d9f 100644 --- a/dlls/d3dcompiler_43/asmshader.y +++ b/dlls/d3dcompiler_43/asmshader.y @@ -1053,7 +1053,7 @@ dreg_name: REG_TEMP } | REG_CONSTINT { - asmparser_message(&asm_ctx, "Line %u: Register i%u is not a valid destination register\n", + asmparser_message(&asm_ctx, "Line %u: Register i%u is not a valid destination register\n", asm_ctx.line_no, $1); set_parse_status(&asm_ctx, PARSE_WARN); } diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index a5121fb..9584bd9 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -290,7 +290,7 @@ typedef void (*instr_writer)(struct bc_writer *This, struct bytecode_backend { void (*header)(struct bc_writer *This, const struct bwriter_shader *shader, - struct bytecode_buffer *buffer); + struct bytecode_buffer *buffer); void (*end)(struct bc_writer *This, const struct bwriter_shader *shader, struct bytecode_buffer *buffer); void (*srcreg)(struct bc_writer *This, const struct shader_reg *reg,

1 0

Henri Verbeet : d3d10core: Implement ID3D10Buffer::Map().
by Alexandre Julliard 15 Oct '10

15 Oct '10

Module: wine Branch: master Commit: 8ebc1800557e2316a24c6e4c75b8e6373a203479 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ebc1800557e2316a24c6e4c7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 15 14:35:14 2010 +0200 d3d10core: Implement ID3D10Buffer::Map(). --- dlls/d3d10core/buffer.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/buffer.c b/dlls/d3d10core/buffer.c index 9230e9d..8d8e0e0 100644 --- a/dlls/d3d10core/buffer.c +++ b/dlls/d3d10core/buffer.c @@ -131,9 +131,16 @@ static UINT STDMETHODCALLTYPE d3d10_buffer_GetEvictionPriority(ID3D10Buffer *ifa static HRESULT STDMETHODCALLTYPE d3d10_buffer_Map(ID3D10Buffer *iface, D3D10_MAP map_type, UINT map_flags, void **data) { - FIXME("iface %p, map_type %u, map_flags %#x, data %p stub!\n", iface, map_type, map_flags, data); + struct d3d10_buffer *buffer = (struct d3d10_buffer *)iface; - return E_NOTIMPL; + TRACE("iface %p, map_type %u, map_flags %#x, data %p.\n", iface, map_type, map_flags, data); + + if (map_type != D3D10_MAP_READ_WRITE) + FIXME("Ignoring map_type %#x.\n", map_type); + if (map_flags) + FIXME("Ignoring map_flags %#x.\n", map_flags); + + return IWineD3DBuffer_Map(buffer->wined3d_buffer, 0, 0, (BYTE **)data, 0); } static void STDMETHODCALLTYPE d3d10_buffer_Unmap(ID3D10Buffer *iface)

1 0

Henri Verbeet : d3d10core: Implement ID3D10Buffer::Unmap().
by Alexandre Julliard 15 Oct '10

15 Oct '10

Module: wine Branch: master Commit: 0749d139b425a7c1477cff2d42c0650bc6c9a52d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0749d139b425a7c1477cff2d4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 15 14:35:13 2010 +0200 d3d10core: Implement ID3D10Buffer::Unmap(). --- dlls/d3d10core/buffer.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/buffer.c b/dlls/d3d10core/buffer.c index 4a68299..9230e9d 100644 --- a/dlls/d3d10core/buffer.c +++ b/dlls/d3d10core/buffer.c @@ -138,7 +138,9 @@ static HRESULT STDMETHODCALLTYPE d3d10_buffer_Map(ID3D10Buffer *iface, D3D10_MAP static void STDMETHODCALLTYPE d3d10_buffer_Unmap(ID3D10Buffer *iface) { - FIXME("iface %p stub!\n", iface); + TRACE("iface %p.\n", iface); + + IWineD3DBuffer_Unmap(((struct d3d10_buffer *)iface)->wined3d_buffer); } static void STDMETHODCALLTYPE d3d10_buffer_GetDesc(ID3D10Buffer *iface, D3D10_BUFFER_DESC *desc)

1 0

Henri Verbeet : wined3d: IWineD3DBuffer_Unmap() can't fail.
by Alexandre Julliard 15 Oct '10

15 Oct '10

Module: wine Branch: master Commit: 70f4e66f84b0a3e027b8d71c254ea32df810546b URL: http://source.winehq.org/git/wine.git/?a=commit;h=70f4e66f84b0a3e027b8d71c2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 15 14:35:12 2010 +0200 wined3d: IWineD3DBuffer_Unmap() can't fail. --- dlls/d3d8/buffer.c | 12 ++++-------- dlls/d3d9/buffer.c | 12 ++++-------- dlls/ddraw/device.c | 8 +------- dlls/ddraw/vertexbuffer.c | 5 ++--- dlls/wined3d/buffer.c | 19 +++++-------------- include/wine/wined3d.idl | 2 +- 6 files changed, 17 insertions(+), 41 deletions(-) diff --git a/dlls/d3d8/buffer.c b/dlls/d3d8/buffer.c index f7dc12d..e2a026b 100644 --- a/dlls/d3d8/buffer.c +++ b/dlls/d3d8/buffer.c @@ -197,15 +197,13 @@ static HRESULT WINAPI d3d8_vertexbuffer_Lock(IDirect3DVertexBuffer8 *iface, static HRESULT WINAPI d3d8_vertexbuffer_Unlock(IDirect3DVertexBuffer8 *iface) { - HRESULT hr; - TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - hr = IWineD3DBuffer_Unmap(((IDirect3DVertexBuffer8Impl *)iface)->wineD3DVertexBuffer); + IWineD3DBuffer_Unmap(((IDirect3DVertexBuffer8Impl *)iface)->wineD3DVertexBuffer); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d8_vertexbuffer_GetDesc(IDirect3DVertexBuffer8 *iface, D3DVERTEXBUFFER_DESC *desc) @@ -461,15 +459,13 @@ static HRESULT WINAPI d3d8_indexbuffer_Lock(IDirect3DIndexBuffer8 *iface, static HRESULT WINAPI d3d8_indexbuffer_Unlock(IDirect3DIndexBuffer8 *iface) { - HRESULT hr; - TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - hr = IWineD3DBuffer_Unmap(((IDirect3DIndexBuffer8Impl *)iface)->wineD3DIndexBuffer); + IWineD3DBuffer_Unmap(((IDirect3DIndexBuffer8Impl *)iface)->wineD3DIndexBuffer); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d8_indexbuffer_GetDesc(IDirect3DIndexBuffer8 *iface, D3DINDEXBUFFER_DESC *desc) diff --git a/dlls/d3d9/buffer.c b/dlls/d3d9/buffer.c index ac8c244..231e0c8 100644 --- a/dlls/d3d9/buffer.c +++ b/dlls/d3d9/buffer.c @@ -199,15 +199,13 @@ static HRESULT WINAPI d3d9_vertexbuffer_Lock(IDirect3DVertexBuffer9 *iface, static HRESULT WINAPI d3d9_vertexbuffer_Unlock(IDirect3DVertexBuffer9 *iface) { - HRESULT hr; - TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - hr = IWineD3DBuffer_Unmap(((IDirect3DVertexBuffer9Impl *)iface)->wineD3DVertexBuffer); + IWineD3DBuffer_Unmap(((IDirect3DVertexBuffer9Impl *)iface)->wineD3DVertexBuffer); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d9_vertexbuffer_GetDesc(IDirect3DVertexBuffer9 *iface, D3DVERTEXBUFFER_DESC *desc) @@ -463,15 +461,13 @@ static HRESULT WINAPI d3d9_indexbuffer_Lock(IDirect3DIndexBuffer9 *iface, static HRESULT WINAPI d3d9_indexbuffer_Unlock(IDirect3DIndexBuffer9 *iface) { - HRESULT hr; - TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - hr = IWineD3DBuffer_Unmap(((IDirect3DIndexBuffer9Impl *)iface)->wineD3DIndexBuffer); + IWineD3DBuffer_Unmap(((IDirect3DIndexBuffer9Impl *)iface)->wineD3DIndexBuffer); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d9_indexbuffer_GetDesc(IDirect3DIndexBuffer9 *iface, D3DINDEXBUFFER_DESC *desc) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 720aaa0..7976ecb 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4364,13 +4364,7 @@ IDirect3DDeviceImpl_7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, return hr; } memcpy(LockedIndices, Indices, IndexCount * sizeof(WORD)); - hr = IWineD3DBuffer_Unmap(This->indexbuffer); - if(hr != D3D_OK) - { - ERR("(%p) IWineD3DBuffer::Unmap failed with hr = %08x\n", This, hr); - LeaveCriticalSection(&ddraw_cs); - return hr; - } + IWineD3DBuffer_Unmap(This->indexbuffer); /* Set the index stream */ IWineD3DDevice_SetBaseVertexIndex(This->wineD3DDevice, StartVertex); diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index 36087f2..a001b03 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -266,15 +266,14 @@ static HRESULT WINAPI IDirect3DVertexBufferImpl_Unlock(IDirect3DVertexBuffer7 *iface) { IDirect3DVertexBufferImpl *This = (IDirect3DVertexBufferImpl *)iface; - HRESULT hr; TRACE("iface %p.\n", iface); EnterCriticalSection(&ddraw_cs); - hr = IWineD3DBuffer_Unmap(This->wineD3DVertexBuffer); + IWineD3DBuffer_Unmap(This->wineD3DVertexBuffer); LeaveCriticalSection(&ddraw_cs); - return hr; + return D3D_OK; } static HRESULT WINAPI diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 23b4a4a..2306d1f 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1338,7 +1338,7 @@ static HRESULT STDMETHODCALLTYPE buffer_Map(IWineD3DBuffer *iface, UINT offset, return WINED3D_OK; } -static HRESULT STDMETHODCALLTYPE buffer_Unmap(IWineD3DBuffer *iface) +static void STDMETHODCALLTYPE buffer_Unmap(IWineD3DBuffer *iface) { struct wined3d_buffer *This = (struct wined3d_buffer *)iface; ULONG i; @@ -1351,15 +1351,15 @@ static HRESULT STDMETHODCALLTYPE buffer_Unmap(IWineD3DBuffer *iface) * the next call (this will happen if the lock_count is < 0). */ if (!This->lock_count) { - TRACE("Unmap called without a previous Map call!\n"); - return WINED3D_OK; + WARN("Unmap called without a previous Map call.\n"); + return; } if (InterlockedDecrement(&This->lock_count)) { /* Delay loading the buffer until everything is unlocked */ TRACE("Ignoring unlock\n"); - return WINED3D_OK; + return; } if(!(This->flags & WINED3D_BUFFER_DOUBLEBUFFER) && This->buffer_object) @@ -1410,8 +1410,6 @@ static HRESULT STDMETHODCALLTYPE buffer_Unmap(IWineD3DBuffer *iface) { buffer_PreLoad(iface); } - - return WINED3D_OK; } static void STDMETHODCALLTYPE buffer_GetDesc(IWineD3DBuffer *iface, WINED3DBUFFER_DESC *desc) @@ -1520,14 +1518,7 @@ HRESULT buffer_init(struct wined3d_buffer *buffer, IWineD3DDeviceImpl *device, memcpy(ptr, data, size); - hr = IWineD3DBuffer_Unmap((IWineD3DBuffer *)buffer); - if (FAILED(hr)) - { - ERR("Failed to unmap buffer, hr %#x\n", hr); - buffer_UnLoad((IWineD3DBuffer *)buffer); - resource_cleanup((IWineD3DResource *)buffer); - return hr; - } + IWineD3DBuffer_Unmap((IWineD3DBuffer *)buffer); } buffer->maps = HeapAlloc(GetProcessHeap(), 0, sizeof(*buffer->maps)); diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index e024940..fda722a 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2731,7 +2731,7 @@ interface IWineD3DBuffer : IWineD3DResource [out] BYTE **data, [in] DWORD flags ); - HRESULT Unmap( + void Unmap( ); void GetDesc( [out] WINED3DBUFFER_DESC *desc

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2010