wine-commits September 2010

wine-commits@winehq.org

2 participants
852 discussions

Hans Leidekker : include/shlobj.h: Add known folder flags.
by Alexandre Julliard 14 Sep '10

14 Sep '10

Module: wine Branch: master Commit: 4deb1844c736ebe79e50a04a429170af46f5f118 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4deb1844c736ebe79e50a04a4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 14 17:00:44 2010 +0200 include/shlobj.h: Add known folder flags. --- include/shlobj.h | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/include/shlobj.h b/include/shlobj.h index e0170ea..ad41f94 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -85,6 +85,15 @@ BOOL WINAPI IsUserAnAdmin(void); UINT WINAPI Shell_MergeMenus(HMENU,HMENU,UINT,UINT,UINT,ULONG); BOOL WINAPI Shell_GetImageLists(HIMAGELIST*,HIMAGELIST*); +#define KF_FLAG_SIMPLE_IDLIST 0x00000100 +#define KF_FLAG_NOT_PARENT_RELATIVE 0x00000200 +#define KF_FLAG_DEFAULT_PATH 0x00000400 +#define KF_FLAG_INIT 0x00000800 +#define KF_FLAG_NO_ALIAS 0x00001000 +#define KF_FLAG_DONT_UNEXPAND 0x00002000 +#define KF_FLAG_DONT_VERIFY 0x00004000 +#define KF_FLAG_CREATE 0x00008000 + #define SHFMT_ERROR 0xFFFFFFFFL /* Error on last format, drive may be formattable */ #define SHFMT_CANCEL 0xFFFFFFFEL /* Last format was cancelled */ #define SHFMT_NOFORMAT 0xFFFFFFFDL /* Drive is not formattable */

1 0

Hans Leidekker : include: Add knownfolders.h.
by Alexandre Julliard 14 Sep '10

14 Sep '10

Module: wine Branch: master Commit: 6416430f687db227c9150134aa1a5bb567f095ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=6416430f687db227c9150134a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 14 17:00:14 2010 +0200 include: Add knownfolders.h. --- include/Makefile.in | 1 + include/knownfolders.h | 142 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 143 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6416430f687db227c9150…

1 0

Henri Verbeet : wined3d: Introduce a structure for stream state.
by Alexandre Julliard 14 Sep '10

14 Sep '10

Module: wine Branch: master Commit: 6ce848bee49968e53626e472f7af0dd0b4b7f3a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ce848bee49968e53626e472f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 14 13:38:41 2010 +0200 wined3d: Introduce a structure for stream state. --- dlls/wined3d/buffer.c | 2 +- dlls/wined3d/device.c | 142 ++++++++++++++++++++++------------------ dlls/wined3d/drawprim.c | 36 +++++----- dlls/wined3d/state.c | 90 +++++++++++++++---------- dlls/wined3d/stateblock.c | 47 ++++++++----- dlls/wined3d/wined3d_private.h | 15 +++-- 6 files changed, 186 insertions(+), 146 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6ce848bee49968e53626e…

1 0

Henri Verbeet : wined3d: Get rid of redundant comparisons against FALSE.
by Alexandre Julliard 14 Sep '10

14 Sep '10

Module: wine Branch: master Commit: 0b15963b4edf7cdf53b5b5162fc48fa0c424a1a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b15963b4edf7cdf53b5b5162… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 14 13:38:40 2010 +0200 wined3d: Get rid of redundant comparisons against FALSE. --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/swapchain.c | 3 ++- dlls/wined3d/swapchain_gdi.c | 3 ++- dlls/wined3d/utils.c | 3 ++- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index c1927b0..05ff012 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5313,7 +5313,7 @@ static void shader_arb_handle_instruction(const struct wined3d_shader_instructio bool_const = get_bool_const(ins, This, ins->src[0].reg.idx); if(ins->src[0].modifiers == WINED3DSPSM_NOT) bool_const = !bool_const; - if(!priv->muted && bool_const == FALSE) + if (!priv->muted && !bool_const) { shader_addline(buffer, "#if(FALSE){\n"); priv->muted = TRUE; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index c9ec815..35558ad 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -81,7 +81,8 @@ static void WINAPI IWineD3DSwapChainImpl_Destroy(IWineD3DSwapChain *iface) * this will be the original desktop resolution. In case of d3d7 this will be a NOP because ddraw sets the resolution * before starting up Direct3D, thus orig_width and orig_height will be equal to the modes in the presentation params */ - if(This->presentParms.Windowed == FALSE && This->presentParms.AutoRestoreDisplayMode) { + if (!This->presentParms.Windowed && This->presentParms.AutoRestoreDisplayMode) + { mode.Width = This->orig_width; mode.Height = This->orig_height; mode.RefreshRate = 0; diff --git a/dlls/wined3d/swapchain_gdi.c b/dlls/wined3d/swapchain_gdi.c index 250485b..8920cae 100644 --- a/dlls/wined3d/swapchain_gdi.c +++ b/dlls/wined3d/swapchain_gdi.c @@ -65,7 +65,8 @@ static void WINAPI IWineGDISwapChainImpl_Destroy(IWineD3DSwapChain *iface) * this will be the original desktop resolution. In case of d3d7 this will be a NOP because ddraw sets the resolution * before starting up Direct3D, thus orig_width and orig_height will be equal to the modes in the presentation params */ - if(This->presentParms.Windowed == FALSE && This->presentParms.AutoRestoreDisplayMode) { + if (!This->presentParms.Windowed && This->presentParms.AutoRestoreDisplayMode) + { mode.Width = This->orig_width; mode.Height = This->orig_height; mode.RefreshRate = 0; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 6cc154e..8760ce6 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2880,7 +2880,8 @@ void gen_ffp_frag_op(IWineD3DStateBlockImpl *stateblock, struct ffp_frag_setting memset(&settings->op[i], 0xff, sizeof(settings->op[i])); } - if(stateblock->renderState[WINED3DRS_FOGENABLE] == FALSE) { + if (!stateblock->renderState[WINED3DRS_FOGENABLE]) + { settings->fog = FOG_OFF; } else if(stateblock->renderState[WINED3DRS_FOGTABLEMODE] == WINED3DFOG_NONE) { if(use_vs(stateblock) || ((IWineD3DVertexDeclarationImpl *) stateblock->vertexDecl)->position_transformed) {

1 0

Henri Verbeet : wined3d: Get rid of redundant comparisons against NULL / 0.
by Alexandre Julliard 14 Sep '10

14 Sep '10

Module: wine Branch: master Commit: b68d257710ba6bbac33f1470df98efe7c81050e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b68d257710ba6bbac33f1470d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 14 13:38:39 2010 +0200 wined3d: Get rid of redundant comparisons against NULL / 0. --- dlls/wined3d/arb_program_shader.c | 128 +++++++++++++++----------------- dlls/wined3d/ati_fragment_shader.c | 18 ++-- dlls/wined3d/basetexture.c | 6 +- dlls/wined3d/buffer.c | 8 +- dlls/wined3d/clipper.c | 11 +-- dlls/wined3d/device.c | 142 ++++++++++++++++++++---------------- dlls/wined3d/directx.c | 29 ++++--- dlls/wined3d/drawprim.c | 40 +++++----- dlls/wined3d/glsl_shader.c | 28 ++++--- dlls/wined3d/palette.c | 6 +- dlls/wined3d/query.c | 6 +- dlls/wined3d/resource.c | 15 ++-- dlls/wined3d/shader.c | 6 +- dlls/wined3d/state.c | 26 ++++--- dlls/wined3d/stateblock.c | 7 +- dlls/wined3d/surface.c | 34 ++++---- dlls/wined3d/surface_base.c | 25 ++++--- dlls/wined3d/swapchain.c | 4 +- dlls/wined3d/swapchain_base.c | 6 +- dlls/wined3d/utils.c | 2 +- dlls/wined3d/volume.c | 4 +- dlls/wined3d/wined3d_main.c | 14 ++-- dlls/wined3d/wined3d_private.h | 2 +- 23 files changed, 299 insertions(+), 268 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b68d257710ba6bbac33f1…

1 0

Henri Verbeet : wined3d: IWineD3DBuffer_GetDesc() should never fail.
by Alexandre Julliard 14 Sep '10

14 Sep '10

Module: wine Branch: master Commit: fd7c1cbf052b428e694d9b49c7a4f60f0ea08b27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd7c1cbf052b428e694d9b49c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 14 13:38:38 2010 +0200 wined3d: IWineD3DBuffer_GetDesc() should never fail. --- dlls/d3d8/buffer.c | 38 +++++++++++++++----------------------- dlls/d3d9/buffer.c | 38 +++++++++++++++----------------------- dlls/ddraw/device.c | 7 +++---- dlls/ddraw/vertexbuffer.c | 19 +++---------------- dlls/wined3d/buffer.c | 4 +--- include/wine/wined3d.idl | 2 +- 6 files changed, 38 insertions(+), 70 deletions(-) diff --git a/dlls/d3d8/buffer.c b/dlls/d3d8/buffer.c index 513c655..f7dc12d 100644 --- a/dlls/d3d8/buffer.c +++ b/dlls/d3d8/buffer.c @@ -212,25 +212,21 @@ static HRESULT WINAPI d3d8_vertexbuffer_GetDesc(IDirect3DVertexBuffer8 *iface, D { IDirect3DVertexBuffer8Impl *buffer = (IDirect3DVertexBuffer8Impl *)iface; WINED3DBUFFER_DESC wined3d_desc; - HRESULT hr; TRACE("iface %p, desc %p.\n", iface, desc); wined3d_mutex_lock(); - hr = IWineD3DBuffer_GetDesc(buffer->wineD3DVertexBuffer, &wined3d_desc); + IWineD3DBuffer_GetDesc(buffer->wineD3DVertexBuffer, &wined3d_desc); wined3d_mutex_unlock(); - if (SUCCEEDED(hr)) - { - desc->Type = D3DRTYPE_VERTEXBUFFER; - desc->Usage = wined3d_desc.Usage; - desc->Pool = wined3d_desc.Pool; - desc->Size = wined3d_desc.Size; - desc->FVF = buffer->fvf; - desc->Format = D3DFMT_VERTEXDATA; - } + desc->Type = D3DRTYPE_VERTEXBUFFER; + desc->Usage = wined3d_desc.Usage; + desc->Pool = wined3d_desc.Pool; + desc->Size = wined3d_desc.Size; + desc->FVF = buffer->fvf; + desc->Format = D3DFMT_VERTEXDATA; - return hr; + return D3D_OK; } static const IDirect3DVertexBuffer8Vtbl Direct3DVertexBuffer8_Vtbl = @@ -479,25 +475,21 @@ static HRESULT WINAPI d3d8_indexbuffer_Unlock(IDirect3DIndexBuffer8 *iface) static HRESULT WINAPI d3d8_indexbuffer_GetDesc(IDirect3DIndexBuffer8 *iface, D3DINDEXBUFFER_DESC *desc) { IDirect3DIndexBuffer8Impl *buffer = (IDirect3DIndexBuffer8Impl *)iface; - HRESULT hr; WINED3DBUFFER_DESC wined3d_desc; TRACE("iface %p, desc %p.\n", iface, desc); wined3d_mutex_lock(); - hr = IWineD3DBuffer_GetDesc(buffer->wineD3DIndexBuffer, &wined3d_desc); + IWineD3DBuffer_GetDesc(buffer->wineD3DIndexBuffer, &wined3d_desc); wined3d_mutex_unlock(); - if (SUCCEEDED(hr)) - { - desc->Format = d3dformat_from_wined3dformat(buffer->format); - desc->Type = D3DRTYPE_INDEXBUFFER; - desc->Usage = wined3d_desc.Usage; - desc->Pool = wined3d_desc.Pool; - desc->Size = wined3d_desc.Size; - } + desc->Format = d3dformat_from_wined3dformat(buffer->format); + desc->Type = D3DRTYPE_INDEXBUFFER; + desc->Usage = wined3d_desc.Usage; + desc->Pool = wined3d_desc.Pool; + desc->Size = wined3d_desc.Size; - return hr; + return D3D_OK; } static const IDirect3DIndexBuffer8Vtbl d3d8_indexbuffer_vtbl = diff --git a/dlls/d3d9/buffer.c b/dlls/d3d9/buffer.c index c70aae9..ac8c244 100644 --- a/dlls/d3d9/buffer.c +++ b/dlls/d3d9/buffer.c @@ -214,25 +214,21 @@ static HRESULT WINAPI d3d9_vertexbuffer_GetDesc(IDirect3DVertexBuffer9 *iface, D { IDirect3DVertexBuffer9Impl *buffer = (IDirect3DVertexBuffer9Impl *)iface; WINED3DBUFFER_DESC wined3d_desc; - HRESULT hr; TRACE("iface %p, desc %p.\n", iface, desc); wined3d_mutex_lock(); - hr = IWineD3DBuffer_GetDesc(buffer->wineD3DVertexBuffer, &wined3d_desc); + IWineD3DBuffer_GetDesc(buffer->wineD3DVertexBuffer, &wined3d_desc); wined3d_mutex_unlock(); - if (SUCCEEDED(hr)) - { - desc->Format = D3DFMT_VERTEXDATA; - desc->Usage = wined3d_desc.Usage; - desc->Pool = wined3d_desc.Pool; - desc->Size = wined3d_desc.Size; - desc->Type = D3DRTYPE_VERTEXBUFFER; - desc->FVF = buffer->fvf; - } + desc->Format = D3DFMT_VERTEXDATA; + desc->Usage = wined3d_desc.Usage; + desc->Pool = wined3d_desc.Pool; + desc->Size = wined3d_desc.Size; + desc->Type = D3DRTYPE_VERTEXBUFFER; + desc->FVF = buffer->fvf; - return hr; + return D3D_OK; } static const IDirect3DVertexBuffer9Vtbl d3d9_vertexbuffer_vtbl = @@ -482,24 +478,20 @@ static HRESULT WINAPI d3d9_indexbuffer_GetDesc(IDirect3DIndexBuffer9 *iface, D3D { IDirect3DIndexBuffer9Impl *buffer = (IDirect3DIndexBuffer9Impl *)iface; WINED3DBUFFER_DESC wined3d_desc; - HRESULT hr; TRACE("iface %p, desc %p.\n", iface, desc); wined3d_mutex_lock(); - hr = IWineD3DBuffer_GetDesc(buffer->wineD3DIndexBuffer, &wined3d_desc); + IWineD3DBuffer_GetDesc(buffer->wineD3DIndexBuffer, &wined3d_desc); wined3d_mutex_unlock(); - if (SUCCEEDED(hr)) - { - desc->Format = d3dformat_from_wined3dformat(buffer->format); - desc->Usage = wined3d_desc.Usage; - desc->Pool = wined3d_desc.Pool; - desc->Size = wined3d_desc.Size; - desc->Type = D3DRTYPE_INDEXBUFFER; - } + desc->Format = d3dformat_from_wined3dformat(buffer->format); + desc->Usage = wined3d_desc.Usage; + desc->Pool = wined3d_desc.Pool; + desc->Size = wined3d_desc.Size; + desc->Type = D3DRTYPE_INDEXBUFFER; - return hr; + return D3D_OK; } static const IDirect3DIndexBuffer9Vtbl d3d9_indexbuffer_vtbl = diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 95526bd..8e25543 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4345,10 +4345,9 @@ IDirect3DDeviceImpl_7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, } /* check that the buffer is large enough to hold the indices, - * reallocate if necessary. - */ - hr = IWineD3DBuffer_GetDesc(This->indexbuffer, &desc); - if(desc.Size < IndexCount * sizeof(WORD)) + * reallocate if necessary. */ + IWineD3DBuffer_GetDesc(This->indexbuffer, &desc); + if (desc.Size < IndexCount * sizeof(WORD)) { UINT size = max(desc.Size * 2, IndexCount * sizeof(WORD)); IWineD3DBuffer *buffer; diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index b40faa2..36087f2 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -232,13 +232,7 @@ IDirect3DVertexBufferImpl_Lock(IDirect3DVertexBuffer7 *iface, if(Size) { /* Get the size, for returning it, and for locking */ - hr = IWineD3DBuffer_GetDesc(This->wineD3DVertexBuffer, &Desc); - if(hr != D3D_OK) - { - ERR("(%p) IWineD3DBuffer::GetDesc failed with hr=%08x\n", This, hr); - LeaveCriticalSection(&ddraw_cs); - return hr; - } + IWineD3DBuffer_GetDesc(This->wineD3DVertexBuffer, &Desc); *Size = Desc.Size; } @@ -425,26 +419,19 @@ IDirect3DVertexBufferImpl_GetVertexBufferDesc(IDirect3DVertexBuffer7 *iface, { IDirect3DVertexBufferImpl *This = (IDirect3DVertexBufferImpl *)iface; WINED3DBUFFER_DESC WDesc; - HRESULT hr; TRACE("iface %p, desc %p.\n", iface, Desc); if(!Desc) return DDERR_INVALIDPARAMS; EnterCriticalSection(&ddraw_cs); - hr = IWineD3DBuffer_GetDesc(This->wineD3DVertexBuffer, &WDesc); - if(hr != D3D_OK) - { - ERR("(%p) IWineD3DBuffer::GetDesc failed with hr=%08x\n", This, hr); - LeaveCriticalSection(&ddraw_cs); - return hr; - } + IWineD3DBuffer_GetDesc(This->wineD3DVertexBuffer, &WDesc); + LeaveCriticalSection(&ddraw_cs); /* Now fill the Desc structure */ Desc->dwCaps = This->Caps; Desc->dwFVF = This->fvf; Desc->dwNumVertices = WDesc.Size / get_flexible_vertex_size(This->fvf); - LeaveCriticalSection(&ddraw_cs); return D3D_OK; } diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 166508a..e9b2172 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1413,7 +1413,7 @@ static HRESULT STDMETHODCALLTYPE buffer_Unmap(IWineD3DBuffer *iface) return WINED3D_OK; } -static HRESULT STDMETHODCALLTYPE buffer_GetDesc(IWineD3DBuffer *iface, WINED3DBUFFER_DESC *desc) +static void STDMETHODCALLTYPE buffer_GetDesc(IWineD3DBuffer *iface, WINED3DBUFFER_DESC *desc) { struct wined3d_buffer *This = (struct wined3d_buffer *)iface; @@ -1423,8 +1423,6 @@ static HRESULT STDMETHODCALLTYPE buffer_GetDesc(IWineD3DBuffer *iface, WINED3DBU desc->Usage = This->resource.usage; desc->Pool = This->resource.pool; desc->Size = This->resource.size; - - return WINED3D_OK; } static const struct IWineD3DBufferVtbl wined3d_buffer_vtbl = diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 80dabac..53bfeae 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2736,7 +2736,7 @@ interface IWineD3DBuffer : IWineD3DResource ); HRESULT Unmap( ); - HRESULT GetDesc( + void GetDesc( [out] WINED3DBUFFER_DESC *desc ); }

1 0

Jesse Litton : wined3d: Recognize GeForce GTX 465.
by Alexandre Julliard 14 Sep '10

14 Sep '10

Module: wine Branch: master Commit: ad917d366c24ea078aca26982e4411d54f36ce10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad917d366c24ea078aca26982… Author: Jesse Litton <wine(a)eternaldusk.com> Date: Mon Sep 13 21:42:12 2010 -0500 wined3d: Recognize GeForce GTX 465. --- dlls/wined3d/directx.c | 7 +++++++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index b6369bb..95e7322 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1079,6 +1079,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT325M, "NVIDIA GeForce GT 325M", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTS350M, "NVIDIA GeForce GTS 350M", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX460, "NVIDIA GeForce GTX 460", DRIVER_NVIDIA_GEFORCE6, 768 }, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX465, "NVIDIA GeForce GTX 465", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX470, "NVIDIA GeForce GTX 470", DRIVER_NVIDIA_GEFORCE6, 1280}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX480, "NVIDIA GeForce GTX 480", DRIVER_NVIDIA_GEFORCE6, 1536}, /* ATI cards */ @@ -1410,6 +1411,12 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl } /* Geforce 400 - midend */ + if (strstr(gl_renderer, "GTX 465")) + { + return CARD_NVIDIA_GEFORCE_GTX465; + } + + /* Geforce 400 - midend */ if (strstr(gl_renderer, "GTX 460")) { return CARD_NVIDIA_GEFORCE_GTX460; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e152dc3..23706c3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1357,6 +1357,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GT325M = 0x0a35, CARD_NVIDIA_GEFORCE_GTS350M = 0x0cb0, CARD_NVIDIA_GEFORCE_GTX460 = 0x0e22, + CARD_NVIDIA_GEFORCE_GTX465 = 0x06c4, CARD_NVIDIA_GEFORCE_GTX470 = 0x06cd, CARD_NVIDIA_GEFORCE_GTX480 = 0x06c0,

1 0

Dmitry Timoshkov : gdi32: Add a trace for GetClipBox.
by Alexandre Julliard 14 Sep '10

14 Sep '10

Module: wine Branch: master Commit: cec1686cedf99967b4657d8d3815338461bc9979 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cec1686cedf99967b4657d8d3… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Sep 14 16:41:44 2010 +0900 gdi32: Add a trace for GetClipBox. --- dlls/gdi32/clipping.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/clipping.c b/dlls/gdi32/clipping.c index 7be7650..8717da7 100644 --- a/dlls/gdi32/clipping.c +++ b/dlls/gdi32/clipping.c @@ -408,6 +408,7 @@ INT WINAPI GetClipBox( HDC hdc, LPRECT rect ) } DPtoLP( hdc, (LPPOINT)rect, 2 ); release_dc_ptr( dc ); + TRACE("%p => %d %s\n", hdc, ret, wine_dbgstr_rect( rect )); return ret; }

1 0

Dmitry Timoshkov : winex11.drv: Avoid copying invalid window bits.
by Alexandre Julliard 14 Sep '10

14 Sep '10

Module: wine Branch: master Commit: 7864ade5a8306c0078e16ae6d7e40bdece29395b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7864ade5a8306c0078e16ae6d… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Sep 14 14:24:11 2010 +0900 winex11.drv: Avoid copying invalid window bits. --- dlls/winex11.drv/window.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 3c0f303..ec9bec2 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1615,6 +1615,8 @@ static void move_window_bits( struct x11drv_win_data *data, const RECT *old_rect hdc_src = hdc_dst = GetDCEx( data->hwnd, 0, DCX_CACHE ); } + ExcludeUpdateRgn( hdc_dst, data->hwnd ); + code = X11DRV_START_EXPOSURES; ExtEscape( hdc_dst, X11DRV_ESCAPE, sizeof(code), (LPSTR)&code, 0, NULL );

1 0

Dmitry Timoshkov : winex11.drv: Avoid copying window bits if the window didn't move.
by Alexandre Julliard 14 Sep '10

14 Sep '10

Module: wine Branch: master Commit: c912af04deed53a0d1c06f03e4515ac838a896b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c912af04deed53a0d1c06f03e… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Sep 14 14:22:56 2010 +0900 winex11.drv: Avoid copying window bits if the window didn't move. --- dlls/winex11.drv/window.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 99dbf49..3c0f303 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2339,7 +2339,7 @@ void CDECL X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags !memcmp( &valid_rects[0], &data->client_rect, sizeof(RECT) )) { /* if we have an X window the bits will be moved by the X server */ - if (!data->whole_window) + if (!data->whole_window && (x_offset != 0 || y_offset != 0)) move_window_bits( data, &old_whole_rect, &data->whole_rect, &old_client_rect ); } else

1 0

← Newer
1
...
52
53
54
55
56
57
58
...
86
Older →

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 September 2010