wine-commits October 2012

wine-commits@winehq.org

2 participants
960 discussions

Józef Kucia : d3dx9/tests: Add a simple test for filling compressed textures.
by Alexandre Julliard 23 Oct '12

23 Oct '12

Module: wine Branch: master Commit: 0146b5568a1ae171ef2c499c09fd717a2fa76922 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0146b5568a1ae171ef2c499c0… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Mon Oct 22 17:20:30 2012 +0200 d3dx9/tests: Add a simple test for filling compressed textures. --- dlls/d3dx9_36/tests/texture.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/… [View More]

1 0

Józef Kucia : d3dx9/tests: Add tests for filling floating-point textures.
by Alexandre Julliard 23 Oct '12

23 Oct '12

Module: wine Branch: master Commit: 15d642803bfb4dcb4cf64f840a7029257f29b362 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15d642803bfb4dcb4cf64f840… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Mon Oct 22 17:20:29 2012 +0200 d3dx9/tests: Add tests for filling floating-point textures. --- dlls/d3dx9_36/tests/texture.c | 124 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 124 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/… [View More]dlls/d3dx9_36/tests/texture.c index 997b0c3..ba3b2c7 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -85,6 +85,43 @@ static const unsigned char dds_volume_map[] = { 0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x84,0xef,0x7b,0xaa,0xab,0xab,0xab }; +#define ADMITTED_ERROR 0.0001f + +static inline float relative_error(float expected, float got) +{ + return expected == 0.0f ? fabs(expected - got) : fabs(1.0f - got / expected); +} + +#define expect_vec4(expected, got) expect_vec4_(__LINE__, expected, got) +static inline void expect_vec4_(unsigned int line, const D3DXVECTOR4 *expected, const D3DXVECTOR4 *got) +{ + ok_(__FILE__, line)(relative_error(expected->x, got->x) < ADMITTED_ERROR + && relative_error(expected->y, got->y) < ADMITTED_ERROR + && relative_error(expected->z, got->z) < ADMITTED_ERROR + && relative_error(expected->w, got->w) < ADMITTED_ERROR, + "Expected (%f, %f, %f, %f), got (%f, %f, %f, %f)\n", + expected->x, expected->y, expected->z, expected->w, + got->x, got->y, got->z, got->w); +} + +static inline float float_16_to_32(unsigned short in) +{ + unsigned short s = (in & 0x8000); + unsigned short e = (in & 0x7C00) >> 10; + unsigned short m = in & 0x3FF; + float sgn = (s ? -1.0f : 1.0f); + + if (e == 0) + { + if (m == 0) return sgn * 0.0f; /* +0.0 or -0.0 */ + else return sgn * powf(2, -14.0f) * (m / 1024.0f); + } + else + { + return sgn * powf(2, e - 15.0f) * (1.0f + (m / 1024.0f)); + } +} + static BOOL is_autogenmipmap_supported(IDirect3DDevice9 *device, D3DRESOURCETYPE resource_type) { HRESULT hr; @@ -1011,6 +1048,93 @@ static void test_D3DXFillTexture(IDirect3DDevice9 *device) } else skip("Failed to create texture\n"); + + /* test floating-point textures */ + hr = IDirect3DDevice9_CreateTexture(device, 4, 4, 1, 0, D3DFMT_A16B16G16R16F, + D3DPOOL_MANAGED, &tex, NULL); + + if (SUCCEEDED(hr)) + { + hr = D3DXFillTexture(tex, fillfunc, NULL); + todo_wine ok(hr == D3D_OK, "D3DXFillTexture returned %#x, expected %#x\n", hr, D3D_OK); + + hr = IDirect3DTexture9_LockRect(tex, 0, &lock_rect, NULL, D3DLOCK_READONLY); + if (SUCCEEDED(hr)) + { + pitch = lock_rect.Pitch / sizeof(WORD); + for (y = 0; y < 4; y++) + { + WORD *ptr = (WORD *)lock_rect.pBits + y * pitch; + for (x = 0; x < 4; x++) + { + D3DXVECTOR4 got, expected; + + got.x = float_16_to_32(*ptr++); + got.y = float_16_to_32(*ptr++); + got.z = float_16_to_32(*ptr++); + got.w = float_16_to_32(*ptr++); + + expected.x = (x + 0.5f) / 4.0f; + expected.y = (y + 0.5f) / 4.0f; + expected.z = 1.0f / 4.0f; + expected.w = 1.0f; + + todo_wine expect_vec4(&expected, &got); + } + } + + IDirect3DTexture9_UnlockRect(tex, 0); + } + else + skip("Failed to lock texture\n"); + + IDirect3DTexture9_Release(tex); + } + else + skip("Failed to create D3DFMT_A16B16G16R16F texture\n"); + + hr = IDirect3DDevice9_CreateTexture(device, 4, 4, 1, 0, D3DFMT_A32B32G32R32F, + D3DPOOL_MANAGED, &tex, NULL); + + if (SUCCEEDED(hr)) + { + hr = D3DXFillTexture(tex, fillfunc, NULL); + todo_wine ok(hr == D3D_OK, "D3DXFillTexture returned %#x, expected %#x\n", hr, D3D_OK); + + hr = IDirect3DTexture9_LockRect(tex, 0, &lock_rect, NULL, D3DLOCK_READONLY); + if (SUCCEEDED(hr)) + { + pitch = lock_rect.Pitch / sizeof(float); + for (y = 0; y < 4; y++) + { + float *ptr = (float *)lock_rect.pBits + y * pitch; + for (x = 0; x < 4; x++) + { + D3DXVECTOR4 got, expected; + + got.x = *ptr++; + got.y = *ptr++; + got.z = *ptr++; + got.w = *ptr++; + + expected.x = (x + 0.5f) / 4.0f; + expected.y = (y + 0.5f) / 4.0f; + expected.z = 1.0f / 4.0f; + expected.w = 1.0f; + + todo_wine expect_vec4(&expected, &got); + } + } + + IDirect3DTexture9_UnlockRect(tex, 0); + } + else + skip("Failed to lock texture\n"); + + IDirect3DTexture9_Release(tex); + } + else + skip("Failed to create D3DFMT_A32B32G32R32F texture\n"); } static void WINAPI fillfunc_cube(D3DXVECTOR4 *value, const D3DXVECTOR3 *texcoord, [View Less]

1 0

Józef Kucia : d3dx9: Do not try to fill textures other than ARGB in fill texture functions.
by Alexandre Julliard 23 Oct '12

23 Oct '12

Module: wine Branch: master Commit: 2c19f22c8a83cf0e1dfc8932b3e30047c4382898 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c19f22c8a83cf0e1dfc8932b… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Mon Oct 22 17:20:28 2012 +0200 d3dx9: Do not try to fill textures other than ARGB in fill texture functions. --- dlls/d3dx9_36/texture.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index … [View More]

1 0

Józef Kucia : d3dx9: Introduce a separate pixel format type for compressed pixel formats.
by Alexandre Julliard 23 Oct '12

23 Oct '12

Module: wine Branch: master Commit: 84935d4312d094b21247e1d2dd4fcba2cbb1a082 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84935d4312d094b21247e1d2d… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Mon Oct 22 17:20:27 2012 +0200 d3dx9: Introduce a separate pixel format type for compressed pixel formats. --- dlls/d3dx9_36/d3dx9_36_private.h | 1 + dlls/d3dx9_36/surface.c | 29 ++++++++++------------------- dlls/d3dx9_36/util.c | 10 +++++--… [View More]--- dlls/d3dx9_36/volume.c | 4 +--- 4 files changed, 17 insertions(+), 27 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36_private.h b/dlls/d3dx9_36/d3dx9_36_private.h index bd208f8..a7efbee 100644 --- a/dlls/d3dx9_36/d3dx9_36_private.h +++ b/dlls/d3dx9_36/d3dx9_36_private.h @@ -47,6 +47,7 @@ struct volume /* for internal use */ enum format_type { FORMAT_ARGB, /* unsigned */ + FORMAT_DXT, FORMAT_UNKNOWN }; diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index daa6cfe..d49730d 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -307,7 +307,7 @@ static HRESULT calculate_dds_surface_size(D3DFORMAT format, UINT width, UINT hei UINT *pitch, UINT *size) { const struct pixel_format_desc *format_desc = get_format_info(format); - if (format_desc->format == D3DFMT_UNKNOWN) + if (format_desc->type == FORMAT_UNKNOWN) return E_NOTIMPL; if (format_desc->block_width != 1 || format_desc->block_height != 1) @@ -460,7 +460,11 @@ static HRESULT save_dds_surface_to_memory(ID3DXBuffer **dst_buffer, IDirect3DSur if (FAILED(hr)) return hr; pixel_format = get_format_info(src_desc.Format); - if (pixel_format->type == FORMAT_UNKNOWN) return E_NOTIMPL; + if (pixel_format->type != FORMAT_ARGB) + { + FIXME("Unsupported pixel format %#x\n", src_desc.Format); + return E_NOTIMPL; + } file_size = calculate_dds_file_size(src_desc.Format, src_desc.Width, src_desc.Height, 1, 1, 1); @@ -1028,7 +1032,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromFileInMemory(IDirect3DSurface9 *pDestSurface, formatdesc = get_format_info(imginfo.Format); - if (formatdesc->format == D3DFMT_UNKNOWN) + if (formatdesc->type == FORMAT_UNKNOWN) { FIXME("Unsupported pixel format\n"); hr = D3DXERR_INVALIDDATA; @@ -1676,15 +1680,13 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, } else /* Stretching or format conversion. */ { - if (srcformatdesc->bytes_per_pixel > 4 || destformatdesc->bytes_per_pixel > 4 - || srcformatdesc->block_height != 1 || srcformatdesc->block_width != 1 - || destformatdesc->block_height != 1 || destformatdesc->block_width != 1) + if (srcformatdesc->type != FORMAT_ARGB || destformatdesc->type != FORMAT_ARGB) { FIXME("Format conversion missing %#x -> %#x\n", src_format, surfdesc.Format); return E_NOTIMPL; } - if (FAILED(hr = IDirect3DSurface9_LockRect(dst_surface, &lockrect, dst_rect, 0))) + if (FAILED(IDirect3DSurface9_LockRect(dst_surface, &lockrect, dst_rect, 0))) return D3DXERR_INVALIDDATA; if ((filter & 0xf) == D3DX_FILTER_NONE) @@ -1952,7 +1954,7 @@ HRESULT WINAPI D3DXSaveSurfaceToFileInMemory(ID3DXBuffer **dst_buffer, D3DXIMAGE src_format_desc = get_format_info(src_surface_desc.Format); dst_format_desc = get_format_info(d3d_pixel_format); - if (src_format_desc->format == D3DFMT_UNKNOWN || dst_format_desc->format == D3DFMT_UNKNOWN) + if (src_format_desc->type != FORMAT_ARGB || dst_format_desc->type != FORMAT_ARGB) { FIXME("Unsupported pixel format conversion %#x -> %#x\n", src_surface_desc.Format, d3d_pixel_format); @@ -1960,17 +1962,6 @@ HRESULT WINAPI D3DXSaveSurfaceToFileInMemory(ID3DXBuffer **dst_buffer, D3DXIMAGE goto cleanup; } - if (src_format_desc->bytes_per_pixel > 4 - || dst_format_desc->bytes_per_pixel > 4 - || src_format_desc->block_height != 1 || src_format_desc->block_width != 1 - || dst_format_desc->block_height != 1 || dst_format_desc->block_width != 1) - { - FIXME("Format conversion missing %#x -> %#x\n", - src_surface_desc.Format, d3d_pixel_format); - hr = E_NOTIMPL; - goto cleanup; - } - size.width = width; size.height = height; size.depth = 1; diff --git a/dlls/d3dx9_36/util.c b/dlls/d3dx9_36/util.c index 72008a2..40972d8 100644 --- a/dlls/d3dx9_36/util.c +++ b/dlls/d3dx9_36/util.c @@ -65,11 +65,11 @@ static const struct pixel_format_desc formats[] = {D3DFMT_A4L4, {4, 4, 0, 0}, { 4, 0, 0, 0}, 1, 1, 1, 1, FORMAT_ARGB, la_from_rgba, la_to_rgba}, {D3DFMT_L8, {0, 8, 0, 0}, { 0, 0, 0, 0}, 1, 1, 1, 1, FORMAT_ARGB, la_from_rgba, la_to_rgba}, {D3DFMT_L16, {0, 16, 0, 0}, { 0, 0, 0, 0}, 2, 1, 1, 2, FORMAT_ARGB, la_from_rgba, la_to_rgba}, - {D3DFMT_DXT1, {0, 0, 0, 0}, { 0, 0, 0, 0}, 1, 4, 4, 8, FORMAT_ARGB, NULL, NULL }, - {D3DFMT_DXT2, {0, 0, 0, 0}, { 0, 0, 0, 0}, 1, 4, 4, 16, FORMAT_ARGB, NULL, NULL }, - {D3DFMT_DXT3, {0, 0, 0, 0}, { 0, 0, 0, 0}, 1, 4, 4, 16, FORMAT_ARGB, NULL, NULL }, - {D3DFMT_DXT4, {0, 0, 0, 0}, { 0, 0, 0, 0}, 1, 4, 4, 16, FORMAT_ARGB, NULL, NULL }, - {D3DFMT_DXT5, {0, 0, 0, 0}, { 0, 0, 0, 0}, 1, 4, 4, 16, FORMAT_ARGB, NULL, NULL }, + {D3DFMT_DXT1, {0, 0, 0, 0}, { 0, 0, 0, 0}, 1, 4, 4, 8, FORMAT_DXT, NULL, NULL }, + {D3DFMT_DXT2, {0, 0, 0, 0}, { 0, 0, 0, 0}, 1, 4, 4, 16, FORMAT_DXT, NULL, NULL }, + {D3DFMT_DXT3, {0, 0, 0, 0}, { 0, 0, 0, 0}, 1, 4, 4, 16, FORMAT_DXT, NULL, NULL }, + {D3DFMT_DXT4, {0, 0, 0, 0}, { 0, 0, 0, 0}, 1, 4, 4, 16, FORMAT_DXT, NULL, NULL }, + {D3DFMT_DXT5, {0, 0, 0, 0}, { 0, 0, 0, 0}, 1, 4, 4, 16, FORMAT_DXT, NULL, NULL }, /* marks last element */ {D3DFMT_UNKNOWN, {0, 0, 0, 0}, { 0, 0, 0, 0}, 0, 1, 1, 0, FORMAT_UNKNOWN, NULL, NULL }, }; diff --git a/dlls/d3dx9_36/volume.c b/dlls/d3dx9_36/volume.c index 2becba5..f773c7f 100644 --- a/dlls/d3dx9_36/volume.c +++ b/dlls/d3dx9_36/volume.c @@ -195,9 +195,7 @@ HRESULT WINAPI D3DXLoadVolumeFromMemory(IDirect3DVolume9 *dst_volume, { const BYTE *src_addr; - if (src_format_desc->bytes_per_pixel > 4 || dst_format_desc->bytes_per_pixel > 4 - || src_format_desc->block_height != 1 || src_format_desc->block_width != 1 - || dst_format_desc->block_height != 1 || dst_format_desc->block_width != 1) + if (src_format_desc->type != FORMAT_ARGB || dst_format_desc->type != FORMAT_ARGB) { FIXME("Pixel format conversion not implemented %#x -> %#x\n", src_format_desc->format, dst_format_desc->format); [View Less]

1 0

Józef Kucia : d3dx9/tests: Only release a texture when it was created.
by Alexandre Julliard 23 Oct '12

23 Oct '12

Module: wine Branch: master Commit: cdc9f283fb77738af1e4c3efa47dcd5f3f974edd URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdc9f283fb77738af1e4c3efa… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Mon Oct 22 17:20:26 2012 +0200 d3dx9/tests: Only release a texture when it was created. --- dlls/d3dx9_36/tests/texture.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/… [View More]texture.c index 3c2cd95..997b0c3 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -964,12 +964,12 @@ static void test_D3DXFillTexture(IDirect3DDevice9 *device) } size >>= 1; } + + IDirect3DTexture9_Release(tex); } else skip("Failed to create texture\n"); - IDirect3DTexture9_Release(tex); - hr = IDirect3DDevice9_CreateTexture(device, 4, 4, 1, 0, D3DFMT_A1R5G5B5, D3DPOOL_MANAGED, &tex, NULL); @@ -1006,11 +1006,11 @@ static void test_D3DXFillTexture(IDirect3DDevice9 *device) } IDirect3DTexture9_UnlockRect(tex, 0); } + + IDirect3DTexture9_Release(tex); } else skip("Failed to create texture\n"); - - IDirect3DTexture9_Release(tex); } static void WINAPI fillfunc_cube(D3DXVECTOR4 *value, const D3DXVECTOR3 *texcoord, @@ -1117,12 +1117,12 @@ static void test_D3DXFillCubeTexture(IDirect3DDevice9 *device) } size >>= 1; } + + IDirect3DCubeTexture9_Release(tex); } else skip("Failed to create texture\n"); - IDirect3DCubeTexture9_Release(tex); - hr = IDirect3DDevice9_CreateCubeTexture(device, 4, 1, 0, D3DFMT_A1R5G5B5, D3DPOOL_MANAGED, &tex, NULL); @@ -1162,11 +1162,11 @@ static void test_D3DXFillCubeTexture(IDirect3DDevice9 *device) IDirect3DCubeTexture9_UnlockRect(tex, f, 0); } } + + IDirect3DCubeTexture9_Release(tex); } else skip("Failed to create texture\n"); - - IDirect3DCubeTexture9_Release(tex); } static void WINAPI fillfunc_volume(D3DXVECTOR4 *value, const D3DXVECTOR3 *texcoord, @@ -1232,12 +1232,12 @@ static void test_D3DXFillVolumeTexture(IDirect3DDevice9 *device) } size >>= 1; } + + IDirect3DVolumeTexture9_Release(tex); } else skip("Failed to create texture\n"); - IDirect3DVolumeTexture9_Release(tex); - hr = IDirect3DDevice9_CreateVolumeTexture(device, 4, 4, 4, 1, 0, D3DFMT_A1R5G5B5, D3DPOOL_MANAGED, &tex, NULL); @@ -1277,11 +1277,11 @@ static void test_D3DXFillVolumeTexture(IDirect3DDevice9 *device) } IDirect3DVolumeTexture9_UnlockBox(tex, 0); } + + IDirect3DVolumeTexture9_Release(tex); } else skip("Failed to create texture\n"); - - IDirect3DVolumeTexture9_Release(tex); } static void test_D3DXCreateTextureFromFileInMemory(IDirect3DDevice9 *device) [View Less]

1 0

André Hentschel : winedbg: Buffer size includes the quotes (coverity).
by Alexandre Julliard 22 Oct '12

22 Oct '12

Module: wine Branch: master Commit: 8392a850844b30496ece3f06623099ee1171cf08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8392a850844b30496ece3f066… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Oct 22 19:42:49 2012 +0200 winedbg: Buffer size includes the quotes (coverity). --- programs/winedbg/tgt_active.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index 6c60831..… [View More]

1 0

André Hentschel : view: Buffer size of GetFileTitleW is in characters, not bytes (coverity).
by Alexandre Julliard 22 Oct '12

22 Oct '12

Module: wine Branch: master Commit: 0ca586120b7197a784a09836ae450018142320cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ca586120b7197a784a09836a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Oct 22 19:31:36 2012 +0200 view: Buffer size of GetFileTitleW is in characters, not bytes (coverity). --- programs/view/view.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/view/view.c b/programs/view/view.c index d32a10b..9e60824 … [View More]

1 0

Piotr Caban : msvcp60: Copy correct number of characters in basic_string:: _Grow.
by Alexandre Julliard 22 Oct '12

22 Oct '12

Module: wine Branch: master Commit: 9d6c003cd7bb059777b5c931c4843be68560218b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d6c003cd7bb059777b5c931c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 22 17:15:49 2012 +0200 msvcp60: Copy correct number of characters in basic_string::_Grow. --- dlls/msvcp60/string.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp60/string.c b/dlls/msvcp60/string.c index 591ffdf..… [View More]

1 0

Piotr Caban : services: Added tests for service thread termination without setting service state to stopped .
by Alexandre Julliard 22 Oct '12

22 Oct '12

Module: wine Branch: master Commit: afc4284d0520516ab565fdb70ae6abab23227d43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afc4284d0520516ab565fdb70… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 22 15:00:47 2012 +0200 services: Added tests for service thread termination without setting service state to stopped. --- programs/services/tests/service.c | 219 +++++++++++++++++++++++++++++++----- 1 files changed, 188 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=afc4284d0520516ab565f…

1 0

Piotr Caban : services: Kill service thread after timeout so it can terminate cleanly.
by Alexandre Julliard 22 Oct '12

22 Oct '12

Module: wine Branch: master Commit: 522bc15b455ffbd09bb2f594aaaa3e9b13903efe URL: http://source.winehq.org/git/wine.git/?a=commit;h=522bc15b455ffbd09bb2f594a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 22 14:26:10 2012 +0200 services: Kill service thread after timeout so it can terminate cleanly. --- programs/services/rpc.c | 118 ++++++++++++++++++++++++++++++++++++++++-- programs/services/services.c | 4 +- programs/services/services.h | 2 +- 3 … [View More]files changed, 116 insertions(+), 8 deletions(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index bf8ce80..9fe81d1 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -84,6 +84,53 @@ struct sc_lock struct scmdatabase *db; }; +static HANDLE timeout_queue_event; +static CRITICAL_SECTION timeout_queue_cs; +static CRITICAL_SECTION_DEBUG timeout_queue_cs_debug = +{ + 0, 0, &timeout_queue_cs, + { &timeout_queue_cs_debug.ProcessLocksList, &timeout_queue_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": timeout_queue_cs") } +}; +static CRITICAL_SECTION timeout_queue_cs = { &timeout_queue_cs_debug, -1, 0, 0, 0, 0 }; +static struct list timeout_queue = LIST_INIT(timeout_queue); +struct timeout_queue_elem +{ + struct list entry; + + FILETIME time; + void (*func)(struct service_entry*); + struct service_entry *service_entry; +}; + +static void run_after_timeout(void (*func)(struct service_entry*), struct service_entry *service, DWORD timeout) +{ + struct timeout_queue_elem *elem = HeapAlloc(GetProcessHeap(), 0, sizeof(struct timeout_queue_elem)); + ULARGE_INTEGER time; + + if(!elem) { + func(service); + return; + } + + service->ref_count++; + elem->func = func; + elem->service_entry = service; + + GetSystemTimeAsFileTime(&elem->time); + time.LowPart = elem->time.dwLowDateTime; + time.HighPart = elem->time.dwHighDateTime; + time.QuadPart += timeout*10000000; + elem->time.dwLowDateTime = time.LowPart; + elem->time.dwHighDateTime = time.HighPart; + + EnterCriticalSection(&timeout_queue_cs); + list_add_head(&timeout_queue, &elem->entry); + LeaveCriticalSection(&timeout_queue_cs); + + SetEvent(timeout_queue_event); +} + static void free_service_strings(struct service_entry *old, struct service_entry *new) { QUERY_SERVICE_CONFIGW *old_cfg = &old->config; @@ -700,7 +747,7 @@ DWORD __cdecl svcctl_SetServiceStatus( service_unlock(service->service_entry); if (lpServiceStatus->dwCurrentState == SERVICE_STOPPED) - service_terminate(service->service_entry); + run_after_timeout(service_terminate, service->service_entry, service_kill_timeout); else if (service->service_entry->status_changed_event) SetEvent(service->service_entry->status_changed_event); @@ -1567,10 +1614,16 @@ DWORD RPC_Init(void) return ERROR_SUCCESS; } -DWORD RPC_MainLoop(void) +DWORD events_loop(void) { + struct timeout_queue_elem *iter, *iter_safe; DWORD err; - HANDLE hExitEvent = __wine_make_process_system(); + HANDLE wait_handles[2]; + DWORD timeout = INFINITE; + + wait_handles[0] = __wine_make_process_system(); + wait_handles[1] = CreateEventW(NULL, FALSE, FALSE, NULL); + timeout_queue_event = wait_handles[1]; SetEvent(g_hStartedEvent); @@ -1578,12 +1631,67 @@ DWORD RPC_MainLoop(void) do { - err = WaitForSingleObjectEx(hExitEvent, INFINITE, TRUE); + err = WaitForMultipleObjects(2, wait_handles, FALSE, timeout); WINE_TRACE("Wait returned %d\n", err); + + if(err==WAIT_OBJECT_0+1 || err==WAIT_TIMEOUT) + { + FILETIME cur_time; + ULARGE_INTEGER time; + + GetSystemTimeAsFileTime(&cur_time); + time.LowPart = cur_time.dwLowDateTime; + time.HighPart = cur_time.dwHighDateTime; + + EnterCriticalSection(&timeout_queue_cs); + timeout = INFINITE; + LIST_FOR_EACH_ENTRY_SAFE(iter, iter_safe, &timeout_queue, struct timeout_queue_elem, entry) + { + if(CompareFileTime(&cur_time, &iter->time) >= 0) + { + LeaveCriticalSection(&timeout_queue_cs); + iter->func(iter->service_entry); + EnterCriticalSection(&timeout_queue_cs); + + release_service(iter->service_entry); + list_remove(&iter->entry); + HeapFree(GetProcessHeap(), 0, iter); + } + else + { + ULARGE_INTEGER time_diff; + + time_diff.LowPart = iter->time.dwLowDateTime; + time_diff.HighPart = iter->time.dwHighDateTime; + time_diff.QuadPart = (time_diff.QuadPart-time.QuadPart)/10000; + + if(time_diff.QuadPart < timeout) + timeout = time_diff.QuadPart; + } + } + LeaveCriticalSection(&timeout_queue_cs); + + if(timeout != INFINITE) + timeout += 1000; + } } while (err != WAIT_OBJECT_0); WINE_TRACE("Object signaled - wine shutdown\n"); - CloseHandle(hExitEvent); + EnterCriticalSection(&timeout_queue_cs); + LIST_FOR_EACH_ENTRY_SAFE(iter, iter_safe, &timeout_queue, struct timeout_queue_elem, entry) + { + LeaveCriticalSection(&timeout_queue_cs); + iter->func(iter->service_entry); + EnterCriticalSection(&timeout_queue_cs); + + release_service(iter->service_entry); + list_remove(&iter->entry); + HeapFree(GetProcessHeap(), 0, iter); + } + LeaveCriticalSection(&timeout_queue_cs); + + CloseHandle(wait_handles[0]); + CloseHandle(wait_handles[1]); return ERROR_SUCCESS; } diff --git a/programs/services/services.c b/programs/services/services.c index d28e47e..75abf06 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -40,7 +40,7 @@ HANDLE g_hStartedEvent; struct scmdatabase *active_database; DWORD service_pipe_timeout = 10000; -DWORD service_kill_timeout = 20000; +DWORD service_kill_timeout = 60000; static DWORD default_preshutdown_timeout = 180000; static void *env = NULL; @@ -914,7 +914,7 @@ int main(int argc, char *argv[]) if ((err = RPC_Init()) == ERROR_SUCCESS) { scmdatabase_autostart_services(active_database); - RPC_MainLoop(); + events_loop(); scmdatabase_wait_terminate(active_database); } scmdatabase_destroy(active_database); diff --git a/programs/services/services.h b/programs/services/services.h index b4b895e..3e36141 100644 --- a/programs/services/services.h +++ b/programs/services/services.h @@ -88,7 +88,7 @@ extern DWORD service_pipe_timeout; extern DWORD service_kill_timeout; DWORD RPC_Init(void); -DWORD RPC_MainLoop(void); +DWORD events_loop(void); /* from utils.c */ LPWSTR strdupW(LPCWSTR str); [View Less]

1 0

← Newer
1
...
26
27
28
29
30
31
32
...
96
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 October 2012