June 2010 - Wine-commits - list.winehq.org

Tag wine-1.2-rc3 : Alexandre Julliard : Release 1.2-rc3
by Alexandre Julliard 11 Jun '10

11 Jun '10

Module: wine Branch: refs/tags/wine-1.2-rc3 Tag: 40c8e1688651ab221b5f8c4dfd65d1c6956e2ab3 URL: http://source.winehq.org/git/wine.git/?a=tag;h=40c8e1688651ab221b5f8c4dfd65… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 11 19:40:32 2010 +0200 Release 1.2-rc3

1 0

Hans Leidekker : msi: Update an existing record even if the low bit in the transform mask is set .
by Alexandre Julliard 11 Jun '10

11 Jun '10

Module: wine Branch: master Commit: 6b1a1579f6ea53d3c18faaedb2f1d94222c9fccf URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b1a1579f6ea53d3c18faaedb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jun 11 15:20:12 2010 +0200 msi: Update an existing record even if the low bit in the transform mask is set. --- dlls/msi/table.c | 95 ++++++++++++++++++++++++++---------------------- dlls/msi/tests/patch.c | 2 +- 2 files changed, 53 insertions(+), 44 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 3b117ae..72d1f21 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -2742,63 +2742,72 @@ static UINT msi_table_load_transform( MSIDATABASE *db, IStorage *stg, rec = msi_get_transform_record( tv, st, stg, &rawdata[n], bytes_per_strref ); if (rec) { - if ( mask & 1 ) - { - WCHAR table[32]; - DWORD sz = 32; - UINT number = MSI_NULL_INTEGER; - - TRACE("inserting record\n"); + WCHAR table[32]; + DWORD sz = 32; + UINT number = MSI_NULL_INTEGER; + UINT row = 0; - if (!lstrcmpW(name, szColumns)) + if (!lstrcmpW( name, szColumns )) + { + MSI_RecordGetStringW( rec, 1, table, &sz ); + number = MSI_RecordGetInteger( rec, 2 ); + + /* + * Native msi seems writes nul into the Number (2nd) column of + * the _Columns table, only when the columns are from a new table + */ + if ( number == MSI_NULL_INTEGER ) { - MSI_RecordGetStringW( rec, 1, table, &sz ); - number = MSI_RecordGetInteger( rec, 2 ); - - /* - * Native msi seems writes nul into the Number (2nd) column of - * the _Columns table, only when the columns are from a new table - */ - if ( number == MSI_NULL_INTEGER ) + /* reset the column number on a new table */ + if (lstrcmpW( coltable, table )) { - /* reset the column number on a new table */ - if ( lstrcmpW(coltable, table) ) - { - colcol = 0; - lstrcpyW( coltable, table ); - } - - /* fix nul column numbers */ - MSI_RecordSetInteger( rec, 2, ++colcol ); + colcol = 0; + lstrcpyW( coltable, table ); } + + /* fix nul column numbers */ + MSI_RecordSetInteger( rec, 2, ++colcol ); } + } - r = TABLE_insert_row( &tv->view, rec, -1, FALSE ); - if (r != ERROR_SUCCESS) - WARN("insert row failed\n"); + if (TRACE_ON(msidb)) dump_record( rec ); - if ( number != MSI_NULL_INTEGER && !lstrcmpW(name, szColumns) ) - msi_update_table_columns( db, table ); - } - else + r = msi_table_find_row( tv, rec, &row ); + if (r == ERROR_SUCCESS) { - UINT row = 0; - - r = msi_table_find_row( tv, rec, &row ); - if (r != ERROR_SUCCESS) - WARN("no matching row to transform\n"); - else if ( mask ) + if (!mask) { - TRACE("modifying row [%d]:\n", row); - TABLE_set_row( &tv->view, row, rec, mask ); + TRACE("deleting row [%d]:\n", row); + r = TABLE_delete_row( &tv->view, row ); + if (r != ERROR_SUCCESS) + WARN("failed to delete row %u\n", r); + } + else if (mask & 1) + { + TRACE("modifying full row [%d]:\n", row); + r = TABLE_set_row( &tv->view, row, rec, (1 << tv->num_cols) - 1 ); + if (r != ERROR_SUCCESS) + WARN("failed to modify row %u\n", r); } else { - TRACE("deleting row [%d]:\n", row); - TABLE_delete_row( &tv->view, row ); + TRACE("modifying masked row [%d]:\n", row); + r = TABLE_set_row( &tv->view, row, rec, mask ); + if (r != ERROR_SUCCESS) + WARN("failed to modify row %u\n", r); } } - if( TRACE_ON(msidb) ) dump_record( rec ); + else + { + TRACE("inserting row\n"); + r = TABLE_insert_row( &tv->view, rec, -1, FALSE ); + if (r != ERROR_SUCCESS) + WARN("failed to insert row %u\n", r); + } + + if (number != MSI_NULL_INTEGER && !lstrcmpW( name, szColumns )) + msi_update_table_columns( db, table ); + msiobj_release( &rec->hdr ); } diff --git a/dlls/msi/tests/patch.c b/dlls/msi/tests/patch.c index 4de2fd0..3a35e35 100644 --- a/dlls/msi/tests/patch.c +++ b/dlls/msi/tests/patch.c @@ -794,7 +794,7 @@ static void test_simple_patch( void ) ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); r = MsiViewFetch( hview, &hrec ); - todo_wine ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); + ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); MsiCloseHandle( hrec ); MsiViewClose( hview );

1 0

Hans Leidekker : msi: Implement MsiGetFeatureCostA/W.
by Alexandre Julliard 11 Jun '10

11 Jun '10

Module: wine Branch: master Commit: 67f15e7149e9c25c8098831e45a29c983d3e15bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=67f15e7149e9c25c8098831e4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jun 11 15:20:46 2010 +0200 msi: Implement MsiGetFeatureCostA/W. --- dlls/msi/install.c | 63 +++++++++++++++++++++++++++++++++++++++++++++++----- dlls/msi/msipriv.h | 1 - 2 files changed, 57 insertions(+), 7 deletions(-) diff --git a/dlls/msi/install.c b/dlls/msi/install.c index fda49b9..fa3e4f9 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -993,13 +993,64 @@ UINT WINAPI MsiGetFeatureCostA(MSIHANDLE hInstall, LPCSTR szFeature, return rc; } -UINT MSI_GetFeatureCost(MSIPACKAGE *package, MSIFEATURE *feature, - MSICOSTTREE iCostTree, INSTALLSTATE iState, - LPINT piCost) +static INT feature_cost( MSIFEATURE *feature ) { - FIXME("(%s %i %i %p): not implemented yet\n", - debugstr_w(feature->Feature), iCostTree, iState, piCost); - if (piCost) *piCost = 0; + INT cost = 0; + MSICOMPONENT *comp; + + LIST_FOR_EACH_ENTRY( comp, &feature->Components, MSICOMPONENT, entry ) + { + cost += comp->Cost; + } + return cost; +} + +UINT MSI_GetFeatureCost( MSIPACKAGE *package, MSIFEATURE *feature, MSICOSTTREE tree, + INSTALLSTATE state, LPINT cost ) +{ + TRACE("%s, %u, %d, %p\n", debugstr_w(feature->Feature), tree, state, cost); + + *cost = 0; + switch (tree) + { + case MSICOSTTREE_CHILDREN: + { + MSIFEATURE *child; + + LIST_FOR_EACH_ENTRY( child, &feature->Children, MSIFEATURE, entry ) + { + if (child->ActionRequest == state) + *cost += feature_cost( child ); + } + break; + } + case MSICOSTTREE_PARENTS: + { + const WCHAR *feature_parent = feature->Feature_Parent; + for (;;) + { + MSIFEATURE *parent = get_loaded_feature( package, feature_parent ); + if (!parent) + break; + + if (parent->ActionRequest == state) + *cost += feature_cost( parent ); + + feature_parent = parent->Feature_Parent; + } + break; + } + case MSICOSTTREE_SELFONLY: + if (feature->ActionRequest == state) + *cost = feature_cost( feature ); + break; + + default: + WARN("unhandled cost tree %u\n", tree); + break; + } + + *cost /= 512; return ERROR_SUCCESS; } diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 9f029f3..d1e8113 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -381,7 +381,6 @@ typedef struct tagMSIFEATURE INSTALLSTATE Action; struct list Children; struct list Components; - INT Cost; } MSIFEATURE; typedef struct tagMSICOMPONENT

1 0

Henri Verbeet : wined3d: Also flip the point sprite coordinate origin when rendering offscreen.
by Alexandre Julliard 11 Jun '10

11 Jun '10

Module: wine Branch: master Commit: b1abafcf8d227ad890522f30008eca6ecdef366b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1abafcf8d227ad890522f300… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 11 16:05:23 2010 +0200 wined3d: Also flip the point sprite coordinate origin when rendering offscreen. --- dlls/wined3d/context.c | 12 ++++++++++++ dlls/wined3d/directx.c | 2 ++ dlls/wined3d/drawprim.c | 7 +++++++ dlls/wined3d/wined3d_gl.h | 3 +++ 4 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 5304af2..f21c805 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1482,6 +1482,12 @@ struct wined3d_context *context_create(IWineD3DSwapChainImpl *swapchain, IWineD3 checkGLcall("glTexEnvi(GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, GL_TRUE)"); } + if (gl_info->supported[WINED3D_GL_VERSION_2_0]) + { + glPointParameteri(GL_POINT_SPRITE_COORD_ORIGIN, GL_UPPER_LEFT); + checkGLcall("glPointParameteri(GL_POINT_SPRITE_COORD_ORIGIN, GL_UPPER_LEFT)"); + } + if (gl_info->supported[ARB_PROVOKING_VERTEX]) { GL_EXTCALL(glProvokingVertex(GL_FIRST_VERTEX_CONVENTION)); @@ -1939,6 +1945,12 @@ static inline void context_set_render_offscreen(struct wined3d_context *context, { if (context->render_offscreen == offscreen) return; + if (context->gl_info->supported[WINED3D_GL_VERSION_2_0]) + { + glPointParameteri(GL_POINT_SPRITE_COORD_ORIGIN, offscreen ? GL_LOWER_LEFT : GL_UPPER_LEFT); + checkGLcall("glPointParameteri(GL_POINT_SPRITE_COORD_ORIGIN, ...)"); + } + Context_MarkStateDirty(context, STATE_TRANSFORM(WINED3DTS_PROJECTION), StateTable); Context_MarkStateDirty(context, STATE_VDECL, StateTable); Context_MarkStateDirty(context, STATE_VIEWPORT, StateTable); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 088cfe0..424271b 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2287,6 +2287,8 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_adapter *adapter) } } + if (gl_version >= MAKEDWORD_VERSION(2, 0)) gl_info->supported[WINED3D_GL_VERSION_2_0] = TRUE; + if (gl_info->supported[APPLE_FENCE]) { /* GL_NV_fence and GL_APPLE_fence provide the same functionality basically. diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 1671e7b..304ab23 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -644,6 +644,13 @@ void drawPrimitive(IWineD3DDevice *iface, UINT index_count, UINT StartIdx, UINT } } + if (!context->gl_info->supported[WINED3D_GL_VERSION_2_0] && context->render_offscreen + && This->stateBlock->renderState[WINED3DRS_POINTSPRITEENABLE] + && This->stateBlock->gl_primitive_type == GL_POINTS) + { + FIXME("Point sprite coordinate origin switching not supported.\n"); + } + /* Ok, we will be updating the screen from here onwards so grab the lock */ ENTER_GL(); { diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 4ece7e7..b2dfddf 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -1353,6 +1353,7 @@ void (WINE_GLAPI *glVertex4sv)(const GLshort *v) DECLSPEC_HIDDEN; void (WINE_GLAPI *glVertexPointer)(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer) DECLSPEC_HIDDEN; void (WINE_GLAPI *glViewport)(GLint x, GLint y, GLsizei width, GLsizei height) DECLSPEC_HIDDEN; void (WINE_GLAPI *glPointParameterfv)(GLenum pname, const GLfloat *params) DECLSPEC_HIDDEN; +void (WINE_GLAPI *glPointParameteri)(GLenum name, GLint value) DECLSPEC_HIDDEN; /* glFinish and glFlush are always loaded from opengl32.dll, thus they always have * __stdcall calling convention. @@ -1708,6 +1709,7 @@ BOOL (WINAPI *pwglShareLists)(HGLRC, HGLRC) DECLSPEC_HIDDEN; USE_GL_FUNC(glVertexPointer) \ USE_GL_FUNC(glViewport) \ USE_GL_FUNC(glPointParameterfv) \ + USE_GL_FUNC(glPointParameteri) \ #define WGL_FUNCS_GEN \ USE_WGL_FUNC(wglCreateContext) \ @@ -1835,6 +1837,7 @@ typedef enum wined3d_gl_extension WGL_WINE_PIXEL_FORMAT_PASSTHROUGH, /* Internally used */ WINE_NORMALIZED_TEXRECT, + WINED3D_GL_VERSION_2_0, WINED3D_GL_EXT_COUNT, } GL_SupportedExt;

1 0

Henri Verbeet : d3d9/tests: Add a test for offscreen point sprites.
by Alexandre Julliard 11 Jun '10

11 Jun '10

Module: wine Branch: master Commit: 95aaaf2f121657bb37b8f3d61818b03c16e4c229 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95aaaf2f121657bb37b8f3d61… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 11 16:05:24 2010 +0200 d3d9/tests: Add a test for offscreen point sprites. --- dlls/d3d9/tests/visual.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 49 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index b749494..1da7cca 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -8797,7 +8797,9 @@ static void pointsize_test(IDirect3DDevice9 *device) D3DMATRIX identity; float ptsize, ptsize_orig, ptsizemax_orig, ptsizemin_orig; DWORD color; + IDirect3DSurface9 *rt, *backbuffer; IDirect3DTexture9 *tex1, *tex2; + RECT rect = {0, 0, 128, 128}; D3DLOCKED_RECT lr; const DWORD tex1_data[4] = {0x00ff0000, 0x00ff0000, 0x00000000, 0x00000000}; @@ -9007,6 +9009,53 @@ static void pointsize_test(IDirect3DDevice9 *device) ok(color == 0x00ffff00, "pSprite: Pixel (64+4),(64-4) has color 0x%08x, expected 0x00ffff00\n", color); IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + U(matrix).m[0][0] = 1.0f / 64.0f; + U(matrix).m[1][1] = -1.0f / 64.0f; + hr = IDirect3DDevice9_SetTransform(device, D3DTS_PROJECTION, &matrix); + ok(SUCCEEDED(hr), "SetTransform failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_GetRenderTarget(device, 0, &backbuffer); + ok(SUCCEEDED(hr), "GetRenderTarget failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_CreateRenderTarget(device, 128, 128, D3DFMT_A8R8G8B8, + D3DMULTISAMPLE_NONE, 0, TRUE, &rt, NULL ); + ok(SUCCEEDED(hr), "CreateRenderTarget failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderTarget(device, 0, rt); + ok(SUCCEEDED(hr), "SetRenderTarget failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff00ffff, 0.0f, 0); + ok(SUCCEEDED(hr), "Clear failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "BeginScene failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_POINTLIST, 1, &vertices[0], sizeof(float) * 3); + ok(SUCCEEDED(hr), "DrawPrimitiveUP failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "EndScene failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_StretchRect(device, rt, &rect, backbuffer, &rect, D3DTEXF_NONE); + ok(SUCCEEDED(hr), "StretchRect failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderTarget(device, 0, backbuffer); + ok(SUCCEEDED(hr), "SetRenderTarget failed, hr %#x.\n", hr); + IDirect3DSurface9_Release(backbuffer); + IDirect3DSurface9_Release(rt); + + color = getPixelColor(device, 64-4, 64-4); + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0xff, 0x00, 0x00), 0), + "Expected color 0x00ff0000, got 0x%08x.\n", color); + color = getPixelColor(device, 64+4, 64-4); + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0xff, 0xff, 0x00), 0), + "Expected color 0x0000ff00, got 0x%08x.\n", color); + color = getPixelColor(device, 64-4, 64+4); + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0x00, 0x00, 0x00), 0), + "Expected color 0x00000000, got 0x%08x.\n", color); + color = getPixelColor(device, 64+4, 64+4); + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0x00, 0xff, 0x00), 0), + "Expected color 0x0000ff00, got 0x%08x.\n", color); + + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Present failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_DISABLE); ok(hr == D3D_OK, "IDirect3DDevice9_SetTextureStageState failed hr=%08x\n", hr); hr = IDirect3DDevice9_SetTextureStageState(device, 1, D3DTSS_COLOROP, D3DTOP_DISABLE);

1 0

Louis Lenders : xinput1_3: Quiet a noisy fixme.
by Alexandre Julliard 11 Jun '10

11 Jun '10

Module: wine Branch: master Commit: ba1659762ee1d4dfec3c9b4909699befc29e98b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba1659762ee1d4dfec3c9b490… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Fri May 28 20:44:51 2010 +0200 xinput1_3: Quiet a noisy fixme. --- dlls/xinput1_3/xinput1_3_main.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/xinput1_3/xinput1_3_main.c b/dlls/xinput1_3/xinput1_3_main.c index fc55cef..6d6399f 100644 --- a/dlls/xinput1_3/xinput1_3_main.c +++ b/dlls/xinput1_3/xinput1_3_main.c @@ -93,7 +93,10 @@ DWORD WINAPI XInputGetKeystroke(DWORD dwUserIndex, DWORD dwReserve, PXINPUT_KEYS DWORD WINAPI XInputGetCapabilities(DWORD dwUserIndex, DWORD dwFlags, XINPUT_CAPABILITIES* pCapabilities) { - FIXME("(%d %d %p)\n", dwUserIndex, dwFlags, pCapabilities); + static int warn_once; + + if (!warn_once++) + FIXME("(%d %d %p)\n", dwUserIndex, dwFlags, pCapabilities); if (dwUserIndex < XUSER_MAX_COUNT) {

1 0

Andrew Nguyen : configure: Avoid breaking compilation if AC_PACKAGE_URL is unavailable when regenerating with older autoconf .
by Alexandre Julliard 11 Jun '10

11 Jun '10

Module: wine Branch: master Commit: dd12cf71100c9ab98439834ac2c54fb0483a2376 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd12cf71100c9ab98439834ac… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Fri Jun 11 03:20:38 2010 -0500 configure: Avoid breaking compilation if AC_PACKAGE_URL is unavailable when regenerating with older autoconf. --- configure.ac | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/configure.ac b/configure.ac index 21c0203..eed1487 100644 --- a/configure.ac +++ b/configure.ac @@ -19,6 +19,10 @@ m4_ifdef([AS_VAR_IF],,[AC_DEFUN([AS_VAR_IF], [AS_IF([test "x$$1" = x""$2], [$3], [$4])], [eval as_val=\$$1 AS_IF([test "x$as_val" = x""$2], [$3], [$4])])])])dnl +dnl autoconf versions before 2.64 don't have AC_PACKAGE_URL +m4_ifdef([AC_PACKAGE_URL],, + [AC_DEFINE([PACKAGE_URL], ["http://www.winehq.org"], [Define to the home page for this package.]) + AC_SUBST([PACKAGE_URL], ["http://www.winehq.org"])])dnl dnl **** Command-line arguments ****

1 0

Andrew Nguyen : winealsa.drv: Replicate the snd_pcm_recover alsa-lib implementation to cope with older alsa-lib versions .
by Alexandre Julliard 11 Jun '10

11 Jun '10

Module: wine Branch: master Commit: 13a7708abb481f2903db6b62efcf53a0a7f7b79e URL: http://source.winehq.org/git/wine.git/?a=commit;h=13a7708abb481f2903db6b62e… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Fri Jun 11 03:54:24 2010 -0500 winealsa.drv: Replicate the snd_pcm_recover alsa-lib implementation to cope with older alsa-lib versions. --- dlls/winealsa.drv/alsa.c | 45 +++++++++++++++++++++++++++++------------ dlls/winealsa.drv/alsa.h | 2 +- dlls/winealsa.drv/dsoutput.c | 2 +- dlls/winealsa.drv/waveout.c | 4 +- 4 files changed, 36 insertions(+), 17 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index 9eb50cd..4f0f1ce 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -2,6 +2,7 @@ * Wine Driver for ALSA * * Copyright 2002 Eric Pouech + * Copyright 2006 Jaroslav Kysela * Copyright 2007 Maarten Lankhorst * * This file has a few shared generic subroutines shared among the alsa @@ -556,24 +557,42 @@ out: /************************************************************************** - * ALSA_XRUNRecovery [internal] + * wine_snd_pcm_recover [internal] * - * used to recovery from XRUN errors (buffer underflow/overflow) + * Code slightly modified from alsa-lib v1.0.23 snd_pcm_recover implementation. + * used to recover from XRUN errors (buffer underflow/overflow) */ -int ALSA_XRUNRecovery(WINE_WAVEDEV * wwo, int err) +int wine_snd_pcm_recover(snd_pcm_t *pcm, int err, int silent) { - if (err == -EPIPE) { /* under-run */ - err = snd_pcm_prepare(wwo->pcm); - if (err < 0) - ERR( "underrun recovery failed. prepare failed: %s\n", snd_strerror(err)); + if (err > 0) + err = -err; + if (err == -EINTR) /* nothing to do, continue */ return 0; - } else if (err == -ESTRPIPE) { - while ((err = snd_pcm_resume(wwo->pcm)) == -EAGAIN) - sleep(1); /* wait until the suspend flag is released */ + if (err == -EPIPE) { + const char *s; + if (snd_pcm_stream(pcm) == SND_PCM_STREAM_PLAYBACK) + s = "underrun"; + else + s = "overrun"; + if (!silent) + ERR("%s occurred", s); + err = snd_pcm_prepare(pcm); + if (err < 0) { + ERR("cannot recover from %s, prepare failed: %s", s, snd_strerror(err)); + return err; + } + return 0; + } + if (err == -ESTRPIPE) { + while ((err = snd_pcm_resume(pcm)) == -EAGAIN) + /* wait until suspend flag is released */ + poll(NULL, 0, 1000); if (err < 0) { - err = snd_pcm_prepare(wwo->pcm); - if (err < 0) - ERR("recovery from suspend failed, prepare failed: %s\n", snd_strerror(err)); + err = snd_pcm_prepare(pcm); + if (err < 0) { + ERR("cannot recover from suspend, prepare failed: %s", snd_strerror(err)); + return err; + } } return 0; } diff --git a/dlls/winealsa.drv/alsa.h b/dlls/winealsa.drv/alsa.h index 7c2f0f4..d961dce 100644 --- a/dlls/winealsa.drv/alsa.h +++ b/dlls/winealsa.drv/alsa.h @@ -187,7 +187,7 @@ const char * ALSA_getFormat(WORD wFormatTag); BOOL ALSA_NearMatch(int rate1, int rate2); DWORD ALSA_bytes_to_mmtime(LPMMTIME lpTime, DWORD position, WAVEFORMATPCMEX* format); void ALSA_TraceParameters(snd_pcm_hw_params_t * hw_params, snd_pcm_sw_params_t * sw, int full); -int ALSA_XRUNRecovery(WINE_WAVEDEV * wwo, int err); +int wine_snd_pcm_recover(snd_pcm_t *pcm, int err, int silent); void ALSA_copyFormat(LPWAVEFORMATEX wf1, LPWAVEFORMATPCMEX wf2); BOOL ALSA_supportedFormat(LPWAVEFORMATEX wf); diff --git a/dlls/winealsa.drv/dsoutput.c b/dlls/winealsa.drv/dsoutput.c index bb81621..8a277de 100644 --- a/dlls/winealsa.drv/dsoutput.c +++ b/dlls/winealsa.drv/dsoutput.c @@ -406,7 +406,7 @@ static HRESULT WINAPI IDsDriverBufferImpl_Unlock(PIDSDRIVERBUFFER iface, if (ret == -EPIPE) { WARN("Underrun occurred\n"); - snd_pcm_recover(This->pcm, -EPIPE, 1); + wine_snd_pcm_recover(This->pcm, -EPIPE, 1); ret = snd_pcm_writei(This->pcm, pvAudio1, writelen); /* Advance mmap pointer a little to make dsound notice the underrun and respond to it */ diff --git a/dlls/winealsa.drv/waveout.c b/dlls/winealsa.drv/waveout.c index 4001f26..18693c1 100644 --- a/dlls/winealsa.drv/waveout.c +++ b/dlls/winealsa.drv/waveout.c @@ -110,7 +110,7 @@ static BOOL wodUpdatePlayedTotal(WINE_WAVEDEV* wwo, snd_pcm_status_t* ps) if (state != SND_PCM_STATE_RUNNING && state != SND_PCM_STATE_PREPARED) { WARN("Unexpected state (%d) while updating Total Played, resetting\n", state); - snd_pcm_recover(wwo->pcm, -EPIPE, 0); + wine_snd_pcm_recover(wwo->pcm, -EPIPE, 0); delay=0; } @@ -244,7 +244,7 @@ static int wodPlayer_WriteMaxFrags(WINE_WAVEDEV* wwo, DWORD* frames) written = (wwo->write)(wwo->pcm, lpWaveHdr->lpData + wwo->dwPartialOffset, toWrite); if ( written < 0) { /* XRUN occurred. let's try to recover */ - ALSA_XRUNRecovery(wwo, written); + wine_snd_pcm_recover(wwo->pcm, written, 0); written = (wwo->write)(wwo->pcm, lpWaveHdr->lpData + wwo->dwPartialOffset, toWrite); } if (written <= 0) {

1 0

Octavian Voicu : ntdll: Show one-time ERR if NOFILE limit is reached.
by Alexandre Julliard 11 Jun '10

11 Jun '10

Module: wine Branch: master Commit: 0d8e7983c14cd0c8f0672dfd16b5a452ded7849e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d8e7983c14cd0c8f0672dfd1… Author: Octavian Voicu <octavian.voicu(a)gmail.com> Date: Fri Jun 11 12:13:17 2010 +0300 ntdll: Show one-time ERR if NOFILE limit is reached. --- dlls/ntdll/file.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index b5d1c14..30b93aa 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -87,6 +87,7 @@ #include "ddk/ntddser.h" WINE_DEFAULT_DEBUG_CHANNEL(ntdll); +WINE_DECLARE_DEBUG_CHANNEL(winediag); mode_t FILE_umask = 0; @@ -203,6 +204,11 @@ static NTSTATUS FILE_CreateFile( PHANDLE handle, ACCESS_MASK access, POBJECT_ATT break; } } + else if (io->u.Status == STATUS_TOO_MANY_OPENED_FILES) + { + static int once; + if (!once++) ERR_(winediag)( "Too many open files, ulimit -n probably needs to be increased\n" ); + } return io->u.Status; }

1 0

Dmitry Timoshkov : server: Make layered windows transparent for mouse messages.
by Alexandre Julliard 11 Jun '10

11 Jun '10

Module: wine Branch: master Commit: 66e981ec8d31efd13932f37ac7da0ceebb677e6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=66e981ec8d31efd13932f37ac… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri Jun 11 19:20:41 2010 +0900 server: Make layered windows transparent for mouse messages. --- server/queue.c | 2 +- server/user.h | 1 + server/window.c | 7 +++++++ 3 files changed, 9 insertions(+), 1 deletions(-) diff --git a/server/queue.c b/server/queue.c index 755d3c1..ae11901 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1252,7 +1252,7 @@ static user_handle_t find_hardware_message_window( struct thread_input *input, s { if (!input || !(win = input->capture)) { - if (!(win = msg->win) || !is_window_visible( win )) + if (!(win = msg->win) || !is_window_visible( win ) || is_window_transparent( win )) { if (input) win = window_from_point( input->desktop, data->x, data->y ); } diff --git a/server/user.h b/server/user.h index e9ad116..1f0d909 100644 --- a/server/user.h +++ b/server/user.h @@ -135,6 +135,7 @@ extern void destroy_thread_windows( struct thread *thread ); extern int is_child_window( user_handle_t parent, user_handle_t child ); extern int is_top_level_window( user_handle_t window ); extern int is_window_visible( user_handle_t window ); +extern int is_window_transparent( user_handle_t window ); extern int make_window_active( user_handle_t window ); extern struct thread *get_window_thread( user_handle_t handle ); extern user_handle_t window_from_point( struct desktop *desktop, int x, int y ); diff --git a/server/window.c b/server/window.c index 5fd6f71..3b912b0 100644 --- a/server/window.c +++ b/server/window.c @@ -602,6 +602,13 @@ int is_window_visible( user_handle_t window ) return is_visible( win ); } +int is_window_transparent( user_handle_t window ) +{ + struct window *win = get_user_object( window, USER_WINDOW ); + if (!win) return 0; + return (win->ex_style & (WS_EX_LAYERED|WS_EX_TRANSPARENT)) == (WS_EX_LAYERED|WS_EX_TRANSPARENT); +} + /* check if point is inside the window */ static inline int is_point_in_window( struct window *win, int x, int y ) {

1 0