wine-commits December 2009

wine-commits@winehq.org

3 participants
1233 discussions

Henri Verbeet : wined3d: Only disable blending for offscreen targets.
by Alexandre Julliard 09 Dec '09

09 Dec '09

Module: wine Branch: master Commit: bfe6695d30bb0d2cb6a97d83cea66cf417bb144e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfe6695d30bb0d2cb6a97d83c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 9 11:51:19 2009 +0100 wined3d: Only disable blending for offscreen targets. --- dlls/wined3d/state.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 6df6e54..716ec48 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -252,7 +252,8 @@ static void state_blend(DWORD state, IWineD3DStateBlockImpl *stateblock, struct /* Disable blending in all cases even without pixelshaders. With blending on we could face a big performance penalty. * The d3d9 visual test confirms the behavior. */ - if (!(target->resource.format_desc->Flags & WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING)) + if (context->render_offscreen + && !(target->resource.format_desc->Flags & WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING)) { glDisable(GL_BLEND); checkGLcall("glDisable GL_BLEND");

1 0

Henri Verbeet : wined3d: Remove unused GetDevice() implementations.
by Alexandre Julliard 09 Dec '09

09 Dec '09

Module: wine Branch: master Commit: b6ef17f23d6d24691e439f5bb8b1b1342b3bbcc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6ef17f23d6d24691e439f5bb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 9 11:51:18 2009 +0100 wined3d: Remove unused GetDevice() implementations. --- dlls/wined3d/buffer.c | 6 ------ dlls/wined3d/cubetexture.c | 5 ----- dlls/wined3d/pixelshader.c | 10 ---------- dlls/wined3d/query.c | 12 ------------ dlls/wined3d/resource.c | 9 --------- dlls/wined3d/stateblock.c | 11 ----------- dlls/wined3d/surface.c | 1 - dlls/wined3d/surface_base.c | 4 ---- dlls/wined3d/surface_gdi.c | 1 - dlls/wined3d/texture.c | 5 ----- dlls/wined3d/vertexdeclaration.c | 11 ----------- dlls/wined3d/vertexshader.c | 9 --------- dlls/wined3d/volume.c | 5 ----- dlls/wined3d/volumetexture.c | 5 ----- dlls/wined3d/wined3d_private.h | 2 -- include/wine/wined3d.idl | 15 --------------- 16 files changed, 0 insertions(+), 111 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b6ef17f23d6d24691e439…

1 0

Henri Verbeet : d3d9: Forward the volume's GetDevice() to the texture instead of the wined3d volume.
by Alexandre Julliard 09 Dec '09

09 Dec '09

Module: wine Branch: master Commit: c2cf1935635d348ea1ffdcfebbbe08b71b65d157 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2cf1935635d348ea1ffdcfeb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 9 11:51:17 2009 +0100 d3d9: Forward the volume's GetDevice() to the texture instead of the wined3d volume. --- dlls/d3d9/volume.c | 23 +++++++++++++---------- 1 files changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/d3d9/volume.c b/dlls/d3d9/volume.c index 0d83ce1..baa286b 100644 --- a/dlls/d3d9/volume.c +++ b/dlls/d3d9/volume.c @@ -94,21 +94,24 @@ static ULONG WINAPI IDirect3DVolume9Impl_Release(LPDIRECT3DVOLUME9 iface) { } /* IDirect3DVolume9 Interface follow: */ -static HRESULT WINAPI IDirect3DVolume9Impl_GetDevice(LPDIRECT3DVOLUME9 iface, IDirect3DDevice9** ppDevice) { +static HRESULT WINAPI IDirect3DVolume9Impl_GetDevice(IDirect3DVolume9 *iface, IDirect3DDevice9 **device) +{ IDirect3DVolume9Impl *This = (IDirect3DVolume9Impl *)iface; - IWineD3DDevice *myDevice = NULL; + IDirect3DResource9 *resource; + HRESULT hr; - TRACE("iface %p, device %p.\n", iface, ppDevice); + TRACE("iface %p, device %p.\n", iface, device); - wined3d_mutex_lock(); - - IWineD3DVolume_GetDevice(This->wineD3DVolume, &myDevice); - IWineD3DDevice_GetParent(myDevice, (IUnknown **)ppDevice); - IWineD3DDevice_Release(myDevice); + hr = IUnknown_QueryInterface(This->forwardReference, &IID_IDirect3DResource9, (void **)&resource); + if (SUCCEEDED(hr)) + { + hr = IDirect3DResource9_GetDevice(resource, device); + IDirect3DResource9_Release(resource); - wined3d_mutex_unlock(); + TRACE("Returning device %p.\n", *device); + } - return D3D_OK; + return hr; } static HRESULT WINAPI IDirect3DVolume9Impl_SetPrivateData(LPDIRECT3DVOLUME9 iface, REFGUID refguid, CONST void* pData, DWORD SizeOfData, DWORD Flags) {

1 0

Henri Verbeet : d3d8: Forward the volume's GetDevice() to the texture instead of the wined3d volume.
by Alexandre Julliard 09 Dec '09

09 Dec '09

Module: wine Branch: master Commit: 789fed5095f067350a451fa9b1783b0fd13ba9ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=789fed5095f067350a451fa9b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 9 11:51:16 2009 +0100 d3d8: Forward the volume's GetDevice() to the texture instead of the wined3d volume. --- dlls/d3d8/volume.c | 23 ++++++++++++++--------- 1 files changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/d3d8/volume.c b/dlls/d3d8/volume.c index 8948997..8e8dc60 100644 --- a/dlls/d3d8/volume.c +++ b/dlls/d3d8/volume.c @@ -94,19 +94,24 @@ static ULONG WINAPI IDirect3DVolume8Impl_Release(LPDIRECT3DVOLUME8 iface) { } /* IDirect3DVolume8 Interface follow: */ -static HRESULT WINAPI IDirect3DVolume8Impl_GetDevice(LPDIRECT3DVOLUME8 iface, IDirect3DDevice8 **ppDevice) { +static HRESULT WINAPI IDirect3DVolume8Impl_GetDevice(IDirect3DVolume8 *iface, IDirect3DDevice8 **device) +{ IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)iface; - IWineD3DDevice *myDevice = NULL; + IDirect3DResource8 *resource; + HRESULT hr; - TRACE("iface %p, device %p.\n", iface, ppDevice); + TRACE("iface %p, device %p.\n", iface, device); - wined3d_mutex_lock(); - IWineD3DVolume_GetDevice(This->wineD3DVolume, &myDevice); - IWineD3DDevice_GetParent(myDevice, (IUnknown **)ppDevice); - IWineD3DDevice_Release(myDevice); - wined3d_mutex_unlock(); + hr = IUnknown_QueryInterface(This->forwardReference, &IID_IDirect3DResource8, (void **)&resource); + if (SUCCEEDED(hr)) + { + hr = IDirect3DResource8_GetDevice(resource, device); + IDirect3DResource8_Release(resource); - return D3D_OK; + TRACE("Returning device %p.\n", *device); + } + + return hr; } static HRESULT WINAPI IDirect3DVolume8Impl_SetPrivateData(LPDIRECT3DVOLUME8 iface, REFGUID refguid, CONST void *pData, DWORD SizeOfData, DWORD Flags) {

1 0

Henri Verbeet : wined3d: Remove a few redundant assignments.
by Alexandre Julliard 09 Dec '09

09 Dec '09

Module: wine Branch: master Commit: d2ad2df6377125beebf841bf9696f39aa2275455 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2ad2df6377125beebf841bf9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 9 11:51:15 2009 +0100 wined3d: Remove a few redundant assignments. --- dlls/wined3d/arb_program_shader.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 6401407..42ed898 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5275,7 +5275,6 @@ static void state_texfactor_arbfp(DWORD state, IWineD3DStateBlockImpl *statebloc if(device->shader_backend == &arb_program_shader_backend) { if (use_ps(stateblock)) return; - device = stateblock->wineD3DDevice; context->pshader_const_dirty[ARB_FFP_CONST_TFACTOR] = 1; device->highest_dirty_ps_const = max(device->highest_dirty_ps_const, ARB_FFP_CONST_TFACTOR + 1); } @@ -5297,7 +5296,6 @@ static void state_arb_specularenable(DWORD state, IWineD3DStateBlockImpl *stateb if(device->shader_backend == &arb_program_shader_backend) { if (use_ps(stateblock)) return; - device = stateblock->wineD3DDevice; context->pshader_const_dirty[ARB_FFP_CONST_SPECULAR_ENABLE] = 1; device->highest_dirty_ps_const = max(device->highest_dirty_ps_const, ARB_FFP_CONST_SPECULAR_ENABLE + 1); }

1 0

Hans Leidekker : ntdll/tests: Free Unicode string before reuse.
by Alexandre Julliard 09 Dec '09

09 Dec '09

Module: wine Branch: master Commit: 84bfbf2aa8634cdff07523dee9a4e4328abb628f URL: http://source.winehq.org/git/wine.git/?a=commit;h=84bfbf2aa8634cdff07523dee… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Dec 9 11:45:49 2009 +0100 ntdll/tests: Free Unicode string before reuse. --- dlls/ntdll/tests/file.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index d98488b..6b4de70 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -254,6 +254,7 @@ static void open_file_test(void) status = pNtOpenFile( &dir, GENERIC_READ, &attr, &io, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_DIRECTORY_FILE ); ok( !status, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); + pRtlFreeUnicodeString( &nameW ); /* test opening system dir with RootDirectory set to windows dir */ GetSystemDirectoryW( path, MAX_PATH ); @@ -337,7 +338,6 @@ static void open_file_test(void) } CloseHandle( dir ); - pRtlFreeUnicodeString( &nameW ); } static void delete_file_test(void)

1 0

Nikolay Sivov : gdiplus/tests: Fix a matrix leak in test.
by Alexandre Julliard 09 Dec '09

09 Dec '09

Module: wine Branch: master Commit: 29357ec02440da7ed27ef790cad1e47a50bae974 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29357ec02440da7ed27ef790c… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Dec 9 00:20:34 2009 +0300 gdiplus/tests: Fix a matrix leak in test. --- dlls/gdiplus/tests/graphicspath.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index cbcf390..5f4a92e 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -410,6 +410,7 @@ static void test_worldbounds(void) status = GdipGetPathWorldBounds(path, &bounds, matrix, NULL); expect(Ok, status); GdipDeletePath(path); + GdipDeleteMatrix(matrix); expectf(-209.6, bounds.X); expectf(-1274.8, bounds.Y);

1 0

Piotr Caban : urlmon: Added InternetSecurityManager marshalling test.
by Alexandre Julliard 09 Dec '09

09 Dec '09

Module: wine Branch: master Commit: 6894d841cda7727755c09582bd78c4d5f7ffcac2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6894d841cda7727755c09582b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 8 16:02:52 2009 +0100 urlmon: Added InternetSecurityManager marshalling test. --- dlls/urlmon/tests/sec_mgr.c | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c index 62471cf..06df952 100644 --- a/dlls/urlmon/tests/sec_mgr.c +++ b/dlls/urlmon/tests/sec_mgr.c @@ -605,6 +605,31 @@ static void test_GetZoneAttributes(void) ok(hr == S_OK, "got 0x%x (expected S_OK)\n", hr); } +static void test_InternetSecurityMarshalling(void) +{ + IInternetSecurityManager *secmgr = NULL; + IUnknown *unk; + IStream *stream; + HRESULT hres; + + hres = CoInternetCreateSecurityManager(NULL, &secmgr, 0); + if(FAILED(hres)) + return; + + hres = IInternetSecurityManager_QueryInterface(secmgr, &IID_IUnknown, (void**)&unk); + ok(hres == S_OK, "QueryInterface returned: %08x\n", hres); + + hres = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hres == S_OK, "CreateStreamOnHGlobal returned: %08x\n", hres); + + hres = CoMarshalInterface(stream, &IID_IInternetSecurityManager, unk, MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL); + ok(hres == S_OK, "CoMarshalInterface returned: %08x\n", hres); + + IStream_Release(stream); + IUnknown_Release(unk); + IInternetSecurityManager_Release(secmgr); +} + START_TEST(sec_mgr) { @@ -617,6 +642,7 @@ START_TEST(sec_mgr) test_GetZoneActionPolicy(); test_GetZoneAt(); test_GetZoneAttributes(); + test_InternetSecurityMarshalling(); OleUninitialize(); }

1 0

Piotr Caban : urlmon: Added ProxyStub implementation.
by Alexandre Julliard 09 Dec '09

09 Dec '09

Module: wine Branch: master Commit: dc78e8d31532da68d9e4dc13a8dc0f92f378c6b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc78e8d31532da68d9e4dc13a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 8 16:02:19 2009 +0100 urlmon: Added ProxyStub implementation. --- .gitignore | 2 + dlls/urlmon/Makefile.in | 11 ++- dlls/urlmon/regsvr.c | 30 +++++--- dlls/urlmon/urlmon_main.c | 5 + dlls/urlmon/urlmon_main.h | 6 ++ dlls/urlmon/urlmon_urlmon.idl | 19 +++++ dlls/urlmon/usrmarshal.c | 162 +++++++++++++++++++++++++++++++++++++++++ 7 files changed, 223 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dc78e8d31532da68d9e4d…

1 0

Jacek Caban : wininet: Correctly handle dwContentRead for gzip encoded requests.
by Alexandre Julliard 09 Dec '09

09 Dec '09

Module: wine Branch: master Commit: 2d1c4e69282e23feb96c75d0defbfd001bea4988 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d1c4e69282e23feb96c75d0d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 8 23:51:46 2009 +0100 wininet: Correctly handle dwContentRead for gzip encoded requests. --- dlls/wininet/http.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index b75986f..19f854d 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1967,6 +1967,7 @@ static DWORD read_gzip_data(http_request_t *req, BYTE *buf, int size, BOOL sync, zstream->avail_out = size-read; zres = inflate(zstream, Z_FULL_FLUSH); read = size - zstream->avail_out; + req->dwContentRead += req->read_size-zstream->avail_in; remove_data(req, req->read_size-zstream->avail_in); if(zres == Z_STREAM_END) { TRACE("end of data\n"); @@ -2086,9 +2087,9 @@ static DWORD HTTPREQ_Read(http_request_t *req, void *buffer, DWORD size, DWORD * } finished_reading = !bytes_read && req->dwContentRead == req->dwContentLength; + req->dwContentRead += bytes_read; } done: - req->dwContentRead += bytes_read; *read = bytes_read; TRACE( "retrieved %u bytes (%u/%u)\n", bytes_read, req->dwContentRead, req->dwContentLength );

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 December 2009