wine-commits September 2012

wine-commits@winehq.org

2 participants
828 discussions

Henri Verbeet : wined3d: wined3d_device_set_index_buffer() never fails.
by Alexandre Julliard 06 Sep '12

06 Sep '12

Module: wine Branch: master Commit: a3e28f6ce5ffaa6c7cbe4ba49a5a90274016f1e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3e28f6ce5ffaa6c7cbe4ba49… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 6 11:25:02 2012 +0200 wined3d: wined3d_device_set_index_buffer() never fails. --- dlls/d3d8/device.c | 5 ++--- dlls/d3d9/device.c | 5 ++--- dlls/ddraw/device.c | 2 +- dlls/wined3d/device.c | 6 ++---- include/wine/wined3d.h | 2 +- 5 files changed, 8 insertions(+), 12 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index d90161f..49436da 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2344,7 +2344,6 @@ static HRESULT WINAPI d3d8_device_SetIndices(IDirect3DDevice8 *iface, { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); struct d3d8_indexbuffer *ib = unsafe_impl_from_IDirect3DIndexBuffer8(buffer); - HRESULT hr; TRACE("iface %p, buffer %p, base_vertex_idx %u.\n", iface, buffer, base_vertex_idx); @@ -2356,12 +2355,12 @@ static HRESULT WINAPI d3d8_device_SetIndices(IDirect3DDevice8 *iface, */ wined3d_mutex_lock(); wined3d_device_set_base_vertex_index(device->wined3d_device, base_vertex_idx); - hr = wined3d_device_set_index_buffer(device->wined3d_device, + wined3d_device_set_index_buffer(device->wined3d_device, ib ? ib->wined3d_buffer : NULL, ib ? ib->format : WINED3DFMT_UNKNOWN); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d8_device_GetIndices(IDirect3DDevice8 *iface, diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 8f8f177..523c9ac 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2524,17 +2524,16 @@ static HRESULT WINAPI d3d9_device_SetIndices(IDirect3DDevice9Ex *iface, IDirect3 { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); struct d3d9_indexbuffer *ib = unsafe_impl_from_IDirect3DIndexBuffer9(buffer); - HRESULT hr; TRACE("iface %p, buffer %p.\n", iface, buffer); wined3d_mutex_lock(); - hr = wined3d_device_set_index_buffer(device->wined3d_device, + wined3d_device_set_index_buffer(device->wined3d_device, ib ? ib->wined3d_buffer : NULL, ib ? ib->format : WINED3DFMT_UNKNOWN); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d9_device_GetIndices(IDirect3DDevice9Ex *iface, IDirect3DIndexBuffer9 **buffer) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index a0526d1..24bd993 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4158,7 +4158,7 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, /* Set the index stream */ wined3d_device_set_base_vertex_index(This->wined3d_device, StartVertex); - hr = wined3d_device_set_index_buffer(This->wined3d_device, This->indexbuffer, WINED3DFMT_R16_UINT); + wined3d_device_set_index_buffer(This->wined3d_device, This->indexbuffer, WINED3DFMT_R16_UINT); /* Set the vertex stream source */ hr = wined3d_device_set_stream_source(This->wined3d_device, 0, vb->wineD3DVertexBuffer, 0, stride); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 386fd25..2d6563f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2215,7 +2215,7 @@ HRESULT CDECL wined3d_device_get_material(const struct wined3d_device *device, s return WINED3D_OK; } -HRESULT CDECL wined3d_device_set_index_buffer(struct wined3d_device *device, +void CDECL wined3d_device_set_index_buffer(struct wined3d_device *device, struct wined3d_buffer *buffer, enum wined3d_format_id format_id) { struct wined3d_buffer *prev_buffer; @@ -2237,7 +2237,7 @@ HRESULT CDECL wined3d_device_set_index_buffer(struct wined3d_device *device, wined3d_buffer_incref(buffer); if (prev_buffer) wined3d_buffer_decref(prev_buffer); - return WINED3D_OK; + return; } if (prev_buffer != buffer) @@ -2254,8 +2254,6 @@ HRESULT CDECL wined3d_device_set_index_buffer(struct wined3d_device *device, wined3d_buffer_decref(prev_buffer); } } - - return WINED3D_OK; } HRESULT CDECL wined3d_device_get_index_buffer(const struct wined3d_device *device, struct wined3d_buffer **buffer) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 82a1c80..28a6719 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2204,7 +2204,7 @@ HRESULT __cdecl wined3d_device_set_depth_stencil(struct wined3d_device *device, HRESULT __cdecl wined3d_device_set_dialog_box_mode(struct wined3d_device *device, BOOL enable_dialogs); void __cdecl wined3d_device_set_gamma_ramp(const struct wined3d_device *device, UINT swapchain_idx, DWORD flags, const struct wined3d_gamma_ramp *ramp); -HRESULT __cdecl wined3d_device_set_index_buffer(struct wined3d_device *device, +void __cdecl wined3d_device_set_index_buffer(struct wined3d_device *device, struct wined3d_buffer *index_buffer, enum wined3d_format_id format_id); HRESULT __cdecl wined3d_device_set_light(struct wined3d_device *device, UINT light_idx, const struct wined3d_light *light);

1 0

Henri Verbeet : d3d10core: Update the MipLevels field after texture creation.
by Alexandre Julliard 06 Sep '12

06 Sep '12

Module: wine Branch: master Commit: 129ad9cbf56e6dfcbbb1b01d31cd6350999f3c26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=129ad9cbf56e6dfcbbb1b01d3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 6 11:25:01 2012 +0200 d3d10core: Update the MipLevels field after texture creation. --- dlls/d3d10core/tests/device.c | 24 ++++++++++++++++++++++++ dlls/d3d10core/texture.c | 2 ++ 2 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 57a61c4..e9ade68 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -127,6 +127,19 @@ static void test_create_texture2d(ID3D10Device *device) hr = ID3D10Device_CreateTexture2D(device, &desc, NULL, &texture); ok(SUCCEEDED(hr), "Failed to create a 2d texture, hr %#x\n", hr); + ID3D10Texture2D_GetDesc(texture, &desc); + ok(desc.Width == 512, "Got unexpected Width %u.\n", desc.Width); + ok(desc.Height == 512, "Got unexpected Height %u.\n", desc.Height); + ok(desc.MipLevels == 10, "Got unexpected MipLevels %u.\n", desc.MipLevels); + ok(desc.ArraySize == 1, "Got unexpected ArraySize %u.\n", desc.ArraySize); + ok(desc.Format == DXGI_FORMAT_R8G8B8A8_UNORM, "Got unexpected Format %#x.\n", desc.Format); + ok(desc.SampleDesc.Count == 1, "Got unexpected SampleDesc.Count %u.\n", desc.SampleDesc.Count); + ok(desc.SampleDesc.Quality == 0, "Got unexpected SampleDesc.Quality %u.\n", desc.SampleDesc.Quality); + ok(desc.Usage == D3D10_USAGE_DEFAULT, "Got unexpected MipLevels %u.\n", desc.Usage); + ok(desc.BindFlags == D3D10_BIND_RENDER_TARGET, "Got unexpected BindFlags %u.\n", desc.BindFlags); + ok(desc.CPUAccessFlags == 0, "Got unexpected CPUAccessFlags %u.\n", desc.CPUAccessFlags); + ok(desc.MiscFlags == 0, "Got unexpected MiscFlags %u.\n", desc.MiscFlags); + hr = ID3D10Texture2D_QueryInterface(texture, &IID_IDXGISurface, (void **)&surface); ok(FAILED(hr), "Texture should not implement IDXGISurface\n"); if (SUCCEEDED(hr)) IDXGISurface_Release(surface); @@ -172,6 +185,17 @@ static void test_create_texture3d(ID3D10Device *device) hr = ID3D10Device_CreateTexture3D(device, &desc, NULL, &texture); ok(SUCCEEDED(hr), "Failed to create a 3d texture, hr %#x.\n", hr); + ID3D10Texture3D_GetDesc(texture, &desc); + ok(desc.Width == 64, "Got unexpected Width %u.\n", desc.Width); + ok(desc.Height == 64, "Got unexpected Height %u.\n", desc.Height); + ok(desc.Depth == 64, "Got unexpected Depth %u.\n", desc.Depth); + ok(desc.MipLevels == 7, "Got unexpected MipLevels %u.\n", desc.MipLevels); + ok(desc.Format == DXGI_FORMAT_R8G8B8A8_UNORM, "Got unexpected Format %#x.\n", desc.Format); + ok(desc.Usage == D3D10_USAGE_DEFAULT, "Got unexpected MipLevels %u.\n", desc.Usage); + ok(desc.BindFlags == D3D10_BIND_RENDER_TARGET, "Got unexpected BindFlags %u.\n", desc.BindFlags); + ok(desc.CPUAccessFlags == 0, "Got unexpected CPUAccessFlags %u.\n", desc.CPUAccessFlags); + ok(desc.MiscFlags == 0, "Got unexpected MiscFlags %u.\n", desc.MiscFlags); + hr = ID3D10Texture3D_QueryInterface(texture, &IID_IDXGISurface, (void **)&surface); ok(FAILED(hr), "Texture should not implement IDXGISurface.\n"); if (SUCCEEDED(hr)) IDXGISurface_Release(surface); diff --git a/dlls/d3d10core/texture.c b/dlls/d3d10core/texture.c index 41bd80f..a065991 100644 --- a/dlls/d3d10core/texture.c +++ b/dlls/d3d10core/texture.c @@ -273,6 +273,7 @@ HRESULT d3d10_texture2d_init(struct d3d10_texture2d *texture, struct d3d10_devic IUnknown_Release(texture->dxgi_surface); return hr; } + texture->desc.MipLevels = wined3d_texture_get_level_count(texture->wined3d_texture); return S_OK; } @@ -480,6 +481,7 @@ HRESULT d3d10_texture3d_init(struct d3d10_texture3d *texture, struct d3d10_devic WARN("Failed to create wined3d texture, hr %#x.\n", hr); return hr; } + texture->desc.MipLevels = wined3d_texture_get_level_count(texture->wined3d_texture); return S_OK; }

1 0

Michael Stefaniuc : dsound: Inline some of the IDirectSound helpers.
by Alexandre Julliard 06 Sep '12

06 Sep '12

Module: wine Branch: master Commit: 1440b25267b97a8e774d294b4036aff3b4c94b0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1440b25267b97a8e774d294b4… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Sep 5 23:19:12 2012 +0200 dsound: Inline some of the IDirectSound helpers. --- dlls/dsound/dsound.c | 274 +++++++++++++++++------------------------- dlls/dsound/dsound_private.h | 14 -- 2 files changed, 113 insertions(+), 175 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1440b25267b97a8e774d2…

1 0

Rico Schüller : d3dx9: Move bool cropping into helper function.
by Alexandre Julliard 06 Sep '12

06 Sep '12

Module: wine Branch: master Commit: 823d1fbc3887ab4b52b88555a8ef954f617b6194 URL: http://source.winehq.org/git/wine.git/?a=commit;h=823d1fbc3887ab4b52b88555a… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Sep 5 22:51:42 2012 +0200 d3dx9: Move bool cropping into helper function. --- dlls/d3dx9_36/effect.c | 5 ++--- dlls/d3dx9_36/util.c | 20 +++++++++++++------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index f3a5549..a6dcd98 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1649,8 +1649,6 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_SetBool(ID3DXBaseEffect *iface, D3DXHA if (param && !param->element_count && param->rows == 1 && param->columns == 1) { - /* crop input */ - b = b != 0; set_number(param->data, param->type, &b, D3DXPT_BOOL); return D3D_OK; } @@ -1699,7 +1697,8 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_SetBoolArray(ID3DXBaseEffect *iface, D case D3DXPC_MATRIX_ROWS: for (i = 0; i < size; ++i) { - set_number((DWORD *)param->data + i, param->type, &b[i], D3DXPT_BOOL); + /* don't crop the input, use D3DXPT_INT instead of D3DXPT_BOOL */ + set_number((DWORD *)param->data + i, param->type, &b[i], D3DXPT_INT); } return D3D_OK; diff --git a/dlls/d3dx9_36/util.c b/dlls/d3dx9_36/util.c index 6daddd7..c5160fa 100644 --- a/dlls/d3dx9_36/util.c +++ b/dlls/d3dx9_36/util.c @@ -271,6 +271,11 @@ const char *debug_d3dxparameter_registerset(D3DXREGISTER_SET r) #undef WINE_D3DX_TO_STR /* parameter type conversion helpers */ +BOOL get_bool(LPCVOID data) +{ + return (*(DWORD *)data) != 0; +} + INT get_int(D3DXPARAMETER_TYPE type, LPCVOID data) { INT i; @@ -286,7 +291,7 @@ INT get_int(D3DXPARAMETER_TYPE type, LPCVOID data) break; case D3DXPT_BOOL: - i = *(BOOL *)data; + i = get_bool(data); break; default: @@ -313,7 +318,7 @@ FLOAT get_float(D3DXPARAMETER_TYPE type, LPCVOID data) break; case D3DXPT_BOOL: - f = *(BOOL *)data; + f = get_bool(data); break; default: @@ -325,15 +330,16 @@ FLOAT get_float(D3DXPARAMETER_TYPE type, LPCVOID data) return f; } -BOOL get_bool(LPCVOID data) -{ - return (*(DWORD *)data) != 0; -} - void set_number(LPVOID outdata, D3DXPARAMETER_TYPE outtype, LPCVOID indata, D3DXPARAMETER_TYPE intype) { TRACE("Changing from type %s to type %s\n", debug_d3dxparameter_type(intype), debug_d3dxparameter_type(outtype)); + if (outtype == intype) + { + *(DWORD *)outdata = *(DWORD *)indata; + return; + } + switch (outtype) { case D3DXPT_FLOAT:

1 0

Rico Schüller : d3dx9: Move D3DXPARAMETER_TYPE conversion helpers to util.
by Alexandre Julliard 06 Sep '12

06 Sep '12

Module: wine Branch: master Commit: 65c651e37661f8498011f57b6b36ff9606610b34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65c651e37661f8498011f57b6… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Sep 5 22:51:22 2012 +0200 d3dx9: Move D3DXPARAMETER_TYPE conversion helpers to util. --- dlls/d3dx9_36/d3dx9_36_private.h | 6 +++ dlls/d3dx9_36/effect.c | 84 ------------------------------------- dlls/d3dx9_36/util.c | 85 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 91 insertions(+), 84 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36_private.h b/dlls/d3dx9_36/d3dx9_36_private.h index f6f797e..c4cc69c 100644 --- a/dlls/d3dx9_36/d3dx9_36_private.h +++ b/dlls/d3dx9_36/d3dx9_36_private.h @@ -93,4 +93,10 @@ const char *debug_d3dxparameter_class(D3DXPARAMETER_CLASS c) DECLSPEC_HIDDEN; const char *debug_d3dxparameter_type(D3DXPARAMETER_TYPE t) DECLSPEC_HIDDEN; const char *debug_d3dxparameter_registerset(D3DXREGISTER_SET r) DECLSPEC_HIDDEN; +/* parameter type conversion helpers */ +INT get_int(D3DXPARAMETER_TYPE type, LPCVOID data) DECLSPEC_HIDDEN; +FLOAT get_float(D3DXPARAMETER_TYPE type, LPCVOID data) DECLSPEC_HIDDEN; +BOOL get_bool(LPCVOID data) DECLSPEC_HIDDEN; +void set_number(LPVOID outdata, D3DXPARAMETER_TYPE outtype, LPCVOID indata, D3DXPARAMETER_TYPE intype) DECLSPEC_HIDDEN; + #endif /* __WINE_D3DX9_36_PRIVATE_H */ diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 162cbf8..f3a5549 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -847,90 +847,6 @@ static void free_effect_compiler(struct ID3DXEffectCompilerImpl *compiler) } } -static INT get_int(D3DXPARAMETER_TYPE type, LPCVOID data) -{ - INT i; - - switch (type) - { - case D3DXPT_FLOAT: - i = *(FLOAT *)data; - break; - - case D3DXPT_INT: - i = *(INT *)data; - break; - - case D3DXPT_BOOL: - i = *(BOOL *)data; - break; - - default: - i = 0; - FIXME("Unhandled type %s. This should not happen!\n", debug_d3dxparameter_type(type)); - break; - } - - return i; -} - -inline static FLOAT get_float(D3DXPARAMETER_TYPE type, LPCVOID data) -{ - FLOAT f; - - switch (type) - { - case D3DXPT_FLOAT: - f = *(FLOAT *)data; - break; - - case D3DXPT_INT: - f = *(INT *)data; - break; - - case D3DXPT_BOOL: - f = *(BOOL *)data; - break; - - default: - f = 0.0f; - FIXME("Unhandled type %s. This should not happen!\n", debug_d3dxparameter_type(type)); - break; - } - - return f; -} - -static inline BOOL get_bool(LPCVOID data) -{ - return (*(DWORD *)data) != 0; -} - -static void set_number(LPVOID outdata, D3DXPARAMETER_TYPE outtype, LPCVOID indata, D3DXPARAMETER_TYPE intype) -{ - TRACE("Changing from type %s to type %s\n", debug_d3dxparameter_type(intype), debug_d3dxparameter_type(outtype)); - - switch (outtype) - { - case D3DXPT_FLOAT: - *(FLOAT *)outdata = get_float(intype, indata); - break; - - case D3DXPT_BOOL: - *(BOOL *)outdata = get_bool(indata); - break; - - case D3DXPT_INT: - *(INT *)outdata = get_int(intype, indata); - break; - - default: - FIXME("Unhandled type %s. This should not happen!\n", debug_d3dxparameter_type(outtype)); - *(INT *)outdata = 0; - break; - } -} - static void get_vector(struct d3dx_parameter *param, D3DXVECTOR4 *vector) { UINT i; diff --git a/dlls/d3dx9_36/util.c b/dlls/d3dx9_36/util.c index 7615846..6daddd7 100644 --- a/dlls/d3dx9_36/util.c +++ b/dlls/d3dx9_36/util.c @@ -269,3 +269,88 @@ const char *debug_d3dxparameter_registerset(D3DXREGISTER_SET r) } #undef WINE_D3DX_TO_STR + +/* parameter type conversion helpers */ +INT get_int(D3DXPARAMETER_TYPE type, LPCVOID data) +{ + INT i; + + switch (type) + { + case D3DXPT_FLOAT: + i = *(FLOAT *)data; + break; + + case D3DXPT_INT: + i = *(INT *)data; + break; + + case D3DXPT_BOOL: + i = *(BOOL *)data; + break; + + default: + i = 0; + FIXME("Unhandled type %s. This should not happen!\n", debug_d3dxparameter_type(type)); + break; + } + + return i; +} + +FLOAT get_float(D3DXPARAMETER_TYPE type, LPCVOID data) +{ + FLOAT f; + + switch (type) + { + case D3DXPT_FLOAT: + f = *(FLOAT *)data; + break; + + case D3DXPT_INT: + f = *(INT *)data; + break; + + case D3DXPT_BOOL: + f = *(BOOL *)data; + break; + + default: + f = 0.0f; + FIXME("Unhandled type %s. This should not happen!\n", debug_d3dxparameter_type(type)); + break; + } + + return f; +} + +BOOL get_bool(LPCVOID data) +{ + return (*(DWORD *)data) != 0; +} + +void set_number(LPVOID outdata, D3DXPARAMETER_TYPE outtype, LPCVOID indata, D3DXPARAMETER_TYPE intype) +{ + TRACE("Changing from type %s to type %s\n", debug_d3dxparameter_type(intype), debug_d3dxparameter_type(outtype)); + + switch (outtype) + { + case D3DXPT_FLOAT: + *(FLOAT *)outdata = get_float(intype, indata); + break; + + case D3DXPT_BOOL: + *(BOOL *)outdata = get_bool(indata); + break; + + case D3DXPT_INT: + *(INT *)outdata = get_int(intype, indata); + break; + + default: + FIXME("Unhandled type %s. This should not happen!\n", debug_d3dxparameter_type(outtype)); + *(INT *)outdata = 0; + break; + } +}

1 0

Vincent Povirk : mscoree: Preserve %ecx when calling ReallyFixupVTable.
by Alexandre Julliard 06 Sep '12

06 Sep '12

Module: wine Branch: master Commit: b5c663ee1e4fd092e51735de219007bdb47d46d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5c663ee1e4fd092e51735de2… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Sep 5 15:25:59 2012 -0500 mscoree: Preserve %ecx when calling ReallyFixupVTable. --- dlls/mscoree/corruntimehost.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index ecefe75..da46d61 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -827,6 +827,8 @@ static void get_utf8_args(int *argc, char ***argv) struct vtable_fixup_thunk { + /* push %ecx */ + BYTE i7; /* sub $0x4,%esp */ BYTE i1[3]; /* mov fixup,(%esp) */ @@ -839,12 +841,15 @@ struct vtable_fixup_thunk BYTE i4[2]; /* pop %eax */ BYTE i5; + /* pop %ecx */ + BYTE i8; /* jmp *vtable_entry */ BYTE i6[2]; void *vtable_entry; }; static const struct vtable_fixup_thunk thunk_template = { + 0x51, {0x83,0xec,0x04}, {0xc7,0x04,0x24}, NULL, @@ -852,6 +857,7 @@ static const struct vtable_fixup_thunk thunk_template = { NULL, {0xff,0xd0}, 0x58, + 0x59, {0xff,0x25}, NULL };

1 0

Alexandre Julliard : winex11: Check for changes in min/ maximize state even when the window rectangle didn't change.
by Alexandre Julliard 06 Sep '12

06 Sep '12

Module: wine Branch: master Commit: 6f1d43b16ecd8018f61f8fc947e78b9f5255cd63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f1d43b16ecd8018f61f8fc94… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 6 14:09:06 2012 +0200 winex11: Check for changes in min/maximize state even when the window rectangle didn't change. --- dlls/winex11.drv/event.c | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index dc7d1e3..ba80439 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -1019,14 +1019,7 @@ void X11DRV_ConfigureNotify( HWND hwnd, XEvent *xev ) if ((data->window_rect.right - data->window_rect.left == cx && data->window_rect.bottom - data->window_rect.top == cy) || (IsRectEmpty( &data->window_rect ) && event->width == 1 && event->height == 1)) - { - if (flags & SWP_NOMOVE) /* if nothing changed, don't do anything */ - { - TRACE( "Nothing has changed, ignoring event\n" ); - return; - } flags |= SWP_NOSIZE; - } else TRACE( "%p resizing from (%dx%d) to (%dx%d)\n", hwnd, data->window_rect.right - data->window_rect.left, @@ -1051,7 +1044,8 @@ void X11DRV_ConfigureNotify( HWND hwnd, XEvent *xev ) } } - SetWindowPos( hwnd, 0, x, y, cx, cy, flags ); + if ((flags & (SWP_NOSIZE | SWP_NOMOVE)) != (SWP_NOSIZE | SWP_NOMOVE)) + SetWindowPos( hwnd, 0, x, y, cx, cy, flags ); }

1 0

Alexandre Julliard : winex11: Handle Expose events by refreshing from the window surface.
by Alexandre Julliard 06 Sep '12

06 Sep '12

Module: wine Branch: master Commit: 2eebedf38e4d5fd49075f8f89e63f869ca85cceb URL: http://source.winehq.org/git/wine.git/?a=commit;h=2eebedf38e4d5fd49075f8f89… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 30 15:09:03 2012 +0200 winex11: Handle Expose events by refreshing from the window surface. --- dlls/winex11.drv/event.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 7da0947..dc7d1e3 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -791,7 +791,7 @@ static void X11DRV_Expose( HWND hwnd, XEvent *xev ) XExposeEvent *event = &xev->xexpose; RECT rect; struct x11drv_win_data *data; - int flags = RDW_INVALIDATE | RDW_ERASE; + int flags = RDW_INVALIDATE | RDW_ERASE | RDW_FRAME; TRACE( "win %p (%lx) %d,%d %dx%d\n", hwnd, event->window, event->x, event->y, event->width, event->height ); @@ -802,15 +802,19 @@ static void X11DRV_Expose( HWND hwnd, XEvent *xev ) rect.top = event->y; rect.right = event->x + event->width; rect.bottom = event->y + event->height; - if (event->window == data->whole_window) + + if (data->surface) { - OffsetRect( &rect, data->whole_rect.left - data->client_rect.left, - data->whole_rect.top - data->client_rect.top ); - flags |= RDW_FRAME; + data->surface->funcs->lock( data->surface ); + add_bounds_rect( data->surface->funcs->get_bounds( data->surface ), &rect ); + data->surface->funcs->unlock( data->surface ); } if (event->window != root_window) { + OffsetRect( &rect, data->whole_rect.left - data->client_rect.left, + data->whole_rect.top - data->client_rect.top ); + if (GetWindowLongW( data->hwnd, GWL_EXSTYLE ) & WS_EX_LAYOUTRTL) mirror_rect( &data->client_rect, &rect ); @@ -829,7 +833,7 @@ static void X11DRV_Expose( HWND hwnd, XEvent *xev ) } else OffsetRect( &rect, virtual_screen_rect.left, virtual_screen_rect.top ); - RedrawWindow( hwnd, &rect, 0, flags ); + if (!data->surface) RedrawWindow( hwnd, &rect, 0, flags ); }

1 0

Alexandre Julliard : winex11: Use window surfaces for rendering top-level windows.
by Alexandre Julliard 06 Sep '12

06 Sep '12

Module: wine Branch: master Commit: 33ac850c80634c891b0c157bbffa612f70954a40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33ac850c80634c891b0c157bb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 6 12:39:34 2012 +0200 winex11: Use window surfaces for rendering top-level windows. It can be disabled by setting "ClientSideGraphics"="n". --- dlls/winex11.drv/bitblt.c | 192 ++++++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/window.c | 49 ++++++++++ dlls/winex11.drv/x11drv.h | 3 + dlls/winex11.drv/x11drv_main.c | 4 + 4 files changed, 248 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=33ac850c80634c891b0c1…

1 0

Alexandre Julliard : user32: Maintain a list of active window surfaces and flush them periodically.
by Alexandre Julliard 06 Sep '12

06 Sep '12

Module: wine Branch: master Commit: 7304445a7efa9f30e4541b075a2022319f291e4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7304445a7efa9f30e4541b075… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 6 12:38:13 2012 +0200 user32: Maintain a list of active window surfaces and flush them periodically. --- dlls/user32/painting.c | 16 ++---------- dlls/user32/win.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/user32/win.h | 2 + dlls/user32/winpos.c | 1 + dlls/user32/winproc.c | 5 +++- 5 files changed, 70 insertions(+), 16 deletions(-) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index 3869b48..4def070 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -801,23 +801,11 @@ void move_window_bits( HWND hwnd, struct window_surface *old_surface, * update_now * * Implementation of RDW_UPDATENOW behavior. - * - * FIXME: Windows uses WM_SYNCPAINT to cut down the number of intertask - * SendMessage() calls. This is a comment inside DefWindowProc() source - * from 16-bit SDK: - * - * This message avoids lots of inter-app message traffic - * by switching to the other task and continuing the - * recursion there. - * - * wParam = flags - * LOWORD(lParam) = hrgnClip - * HIWORD(lParam) = hwndSkip (not used; always NULL) - * */ static void update_now( HWND hwnd, UINT rdw_flags ) { HWND child = 0; + int count = 0; /* desktop window never gets WM_PAINT, only WM_ERASEBKGND */ if (hwnd == GetDesktopWindow()) erase_now( hwnd, rdw_flags | RDW_NOCHILDREN ); @@ -834,8 +822,10 @@ static void update_now( HWND hwnd, UINT rdw_flags ) if (!flags) break; /* nothing more to do */ SendMessageW( child, WM_PAINT, 0, 0 ); + count++; if (rdw_flags & RDW_NOCHILDREN) break; } + if (count) flush_window_surfaces( FALSE ); } diff --git a/dlls/user32/win.c b/dlls/user32/win.c index c03ff42..2a0848e 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -44,6 +44,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(win); static DWORD process_layout = ~0u; +static struct list window_surfaces = LIST_INIT( window_surfaces ); + +static CRITICAL_SECTION surfaces_section; +static CRITICAL_SECTION_DEBUG critsect_debug = +{ + 0, 0, &surfaces_section, + { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": surfaces_section") } +}; +static CRITICAL_SECTION surfaces_section = { &critsect_debug, -1, 0, 0, 0, 0 }; + /**********************************************************************/ /* helper for Get/SetWindowLong */ @@ -475,6 +486,45 @@ BOOL is_desktop_window( HWND hwnd ) } +/******************************************************************* + * register_window_surface + * + * Register a window surface in the global list, possibly replacing another one. + */ +void register_window_surface( struct window_surface *old, struct window_surface *new ) +{ + if (old == new) return; + EnterCriticalSection( &surfaces_section ); + if (old) list_remove( &old->entry ); + if (new) list_add_tail( &window_surfaces, &new->entry ); + LeaveCriticalSection( &surfaces_section ); +} + + +/******************************************************************* + * flush_window_surfaces + * + * Flush pending output from all window surfaces. + */ +void flush_window_surfaces( BOOL idle ) +{ + static DWORD last_idle; + DWORD now; + struct window_surface *surface; + + EnterCriticalSection( &surfaces_section ); + now = GetTickCount(); + if (idle) last_idle = now; + /* if not idle, we only flush if there's evidence that the app never goes idle */ + else if ((int)(now - last_idle) < 1000) goto done; + + LIST_FOR_EACH_ENTRY( surface, &window_surfaces, struct window_surface, entry ) + surface->funcs->flush( surface ); +done: + LeaveCriticalSection( &surfaces_section ); +} + + /*********************************************************************** * WIN_GetPtr * @@ -863,7 +913,11 @@ LRESULT WIN_DestroyWindow( HWND hwnd ) if (icon_title) DestroyWindow( icon_title ); if (menu) DestroyMenu( menu ); if (sys_menu) DestroyMenu( sys_menu ); - if (surface) window_surface_release( surface ); + if (surface) + { + register_window_surface( surface, NULL ); + window_surface_release( surface ); + } USER_Driver->pDestroyWindow( hwnd ); @@ -917,7 +971,11 @@ static void destroy_thread_window( HWND hwnd ) HeapFree( GetProcessHeap(), 0, wndPtr ); if (menu) DestroyMenu( menu ); if (sys_menu) DestroyMenu( sys_menu ); - if (surface) window_surface_release( surface ); + if (surface) + { + register_window_surface( surface, NULL ); + window_surface_release( surface ); + } } diff --git a/dlls/user32/win.h b/dlls/user32/win.h index 81e81b2..4bbe7ae 100644 --- a/dlls/user32/win.h +++ b/dlls/user32/win.h @@ -80,6 +80,8 @@ typedef struct tagWND /* Window functions */ extern HWND get_hwnd_message_parent(void) DECLSPEC_HIDDEN; extern BOOL is_desktop_window( HWND hwnd ) DECLSPEC_HIDDEN; +extern void register_window_surface( struct window_surface *old, struct window_surface *new ) DECLSPEC_HIDDEN; +extern void flush_window_surfaces( BOOL idle ) DECLSPEC_HIDDEN; extern WND *WIN_GetPtr( HWND hwnd ) DECLSPEC_HIDDEN; extern HWND WIN_GetFullHandle( HWND hwnd ) DECLSPEC_HIDDEN; extern HWND WIN_IsCurrentProcess( HWND hwnd ) DECLSPEC_HIDDEN; diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 60a539b..fa74567 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -2020,6 +2020,7 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, if (ret) { TRACE( "win %p surface %p -> %p\n", hwnd, old_surface, new_surface ); + register_window_surface( old_surface, new_surface ); if (old_surface) { if (!IsRectEmpty( valid_rects )) diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index b06e93d..de7de6f 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -1123,7 +1123,10 @@ static LRESULT WINAPI StaticWndProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM static DWORD wait_message( DWORD count, CONST HANDLE *handles, DWORD timeout, DWORD mask, DWORD flags ) { - DWORD ret = USER_Driver->pMsgWaitForMultipleObjectsEx( count, handles, timeout, mask, flags ); + DWORD ret; + + flush_window_surfaces( TRUE ); + ret = USER_Driver->pMsgWaitForMultipleObjectsEx( count, handles, timeout, mask, flags ); if (ret == WAIT_TIMEOUT && !count && !timeout) NtYieldExecution(); return ret; }

1 0

← Newer
1
...
68
69
70
71
72
73
74
...
83
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 2012