wine-commits June 2010

wine-commits@winehq.org

3 participants
663 discussions

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

11 Jun '10

Module: wine Branch: master Commit: 6517462ac0fb8a637f2401e00e076276b191f499 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6517462ac0fb8a637f2401e00… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 11 19:40:31 2010 +0200 Release 1.2-rc3. --- ANNOUNCE | 825 ++++++++++++++++++++++++++++++++++++++----------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 529 insertions(+), 316 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6517462ac0fb8a637f240…

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

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

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

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: Disable an optimization in the execution of WHERE clauses.
by Alexandre Julliard 11 Jun '10

11 Jun '10

Module: wine Branch: master Commit: 73774b3ef8b4f5af226b1c7dd929aeec85688894 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73774b3ef8b4f5af226b1c7dd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jun 11 15:19:46 2010 +0200 msi: Disable an optimization in the execution of WHERE clauses. There's no guarantee that the condition strings are in the string table. --- dlls/msi/tests/db.c | 2 +- dlls/msi/where.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 56fa0f0..5e8505a 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -1933,7 +1933,7 @@ static void test_where(void) rec = 0; query = "SELECT * FROM `Media` WHERE `DiskPrompt` <> 'Cabinet'"; r = do_query(hdb, query, &rec); - todo_wine ok( r == ERROR_SUCCESS, "query failed: %d\n", r ); + ok( r == ERROR_SUCCESS, "query failed: %d\n", r ); MsiCloseHandle( rec ); rec = 0; diff --git a/dlls/msi/where.c b/dlls/msi/where.c index 545d6a8..4c4db49 100644 --- a/dlls/msi/where.c +++ b/dlls/msi/where.c @@ -397,6 +397,9 @@ static UINT WHERE_execute( struct tagMSIVIEW *view, MSIRECORD *record ) return ERROR_OUTOFMEMORY; wv->row_count = 0; + +if (0) /* disable optimization, there's no guarantee that strings are in the string table */ +{ if (wv->cond->type == EXPR_STRCMP) { MSIITERHANDLE handle = NULL; @@ -441,6 +444,7 @@ static UINT WHERE_execute( struct tagMSIVIEW *view, MSIRECORD *record ) } /* else fallback to slow case */ } +} for( i=0; i<count; i++ ) {

1 0

Hans Leidekker : msi: Compare file versions as numbers instead of strings.
by Alexandre Julliard 11 Jun '10

11 Jun '10

Module: wine Branch: master Commit: 15f5b9dca3cbb1d97d65fa7ef02887846ca71915 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15f5b9dca3cbb1d97d65fa7ef… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jun 11 15:19:15 2010 +0200 msi: Compare file versions as numbers instead of strings. --- dlls/msi/action.c | 55 +++++++++++++++++++++++++++---------------------- dlls/msi/appsearch.c | 6 ++-- dlls/msi/files.c | 35 ++++++++++-------------------- dlls/msi/msipriv.h | 5 ++++ 4 files changed, 50 insertions(+), 51 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 48948fb..7ae8286 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1964,16 +1964,12 @@ static UINT ITERATE_CostFinalizeConditions(MSIRECORD *row, LPVOID param) return ERROR_SUCCESS; } -static LPWSTR get_disk_file_version( LPCWSTR filename ) +VS_FIXEDFILEINFO *msi_get_disk_file_version( LPCWSTR filename ) { - static const WCHAR name_fmt[] = - {'%','u','.','%','u','.','%','u','.','%','u',0}; static const WCHAR name[] = {'\\',0}; - VS_FIXEDFILEINFO *lpVer; - WCHAR filever[0x100]; + VS_FIXEDFILEINFO *ret; LPVOID version; - DWORD versize; - DWORD handle; + DWORD versize, handle; UINT sz; TRACE("%s\n", debugstr_w(filename)); @@ -1983,23 +1979,32 @@ static LPWSTR get_disk_file_version( LPCWSTR filename ) return NULL; version = msi_alloc( versize ); + if (!version) + return NULL; + GetFileVersionInfoW( filename, 0, versize, version ); - if (!VerQueryValueW( version, name, (LPVOID*)&lpVer, &sz )) + if (!VerQueryValueW( version, name, (LPVOID *)&ret, &sz )) { msi_free( version ); return NULL; } - sprintfW( filever, name_fmt, - HIWORD(lpVer->dwFileVersionMS), - LOWORD(lpVer->dwFileVersionMS), - HIWORD(lpVer->dwFileVersionLS), - LOWORD(lpVer->dwFileVersionLS)); - msi_free( version ); + return ret; +} - return strdupW( filever ); +int msi_compare_file_versions( VS_FIXEDFILEINFO *fi, const WCHAR *version ) +{ + DWORD ms, ls; + + msi_parse_version_string( version, &ms, &ls ); + + if (fi->dwFileVersionMS > ms) return 1; + else if (fi->dwFileVersionMS < ms) return -1; + else if (fi->dwFileVersionLS > ls) return 1; + else if (fi->dwFileVersionLS < ls) return -1; + return 0; } static DWORD get_disk_file_size( LPCWSTR filename ) @@ -2033,7 +2038,7 @@ static BOOL hash_matches( MSIFILE *file ) static UINT set_file_install_states( MSIPACKAGE *package ) { - LPWSTR file_version; + VS_FIXEDFILEINFO *file_version; MSIFILE *file; LIST_FOR_EACH_ENTRY( file, &package->files, MSIFILE, entry ) @@ -2050,18 +2055,14 @@ static UINT set_file_install_states( MSIPACKAGE *package ) /* calculate target */ p = resolve_folder(package, comp->Directory, FALSE, FALSE, TRUE, NULL); - msi_free(file->TargetPath); - TRACE("file %s is named %s\n", - debugstr_w(file->File), debugstr_w(file->FileName)); + TRACE("file %s is named %s\n", debugstr_w(file->File), debugstr_w(file->FileName)); file->TargetPath = build_directory_name(2, p, file->FileName); - msi_free(p); - TRACE("file %s resolves to %s\n", - debugstr_w(file->File), debugstr_w(file->TargetPath)); + TRACE("file %s resolves to %s\n", debugstr_w(file->File), debugstr_w(file->TargetPath)); if (GetFileAttributesW(file->TargetPath) == INVALID_FILE_ATTRIBUTES) { @@ -2069,11 +2070,15 @@ static UINT set_file_install_states( MSIPACKAGE *package ) comp->Cost += file->FileSize; continue; } - if (file->Version && (file_version = get_disk_file_version( file->TargetPath ))) + if (file->Version && (file_version = msi_get_disk_file_version( file->TargetPath ))) { - TRACE("new %s old %s\n", debugstr_w(file->Version), debugstr_w(file_version)); + TRACE("new %s old %u.%u.%u.%u\n", debugstr_w(file->Version), + HIWORD(file_version->dwFileVersionMS), + LOWORD(file_version->dwFileVersionMS), + HIWORD(file_version->dwFileVersionLS), + LOWORD(file_version->dwFileVersionLS)); - if (strcmpiW(file_version, file->Version) < 0) + if (msi_compare_file_versions( file_version, file->Version ) < 0) { file->state = msifs_overwrite; comp->Cost += file->FileSize; diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index 336bfca..34130b6 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -50,7 +50,7 @@ typedef struct tagMSISIGNATURE LPWSTR Languages; }MSISIGNATURE; -static void ACTION_VerStrToInteger(LPCWSTR verStr, PDWORD ms, PDWORD ls) +void msi_parse_version_string(LPCWSTR verStr, PDWORD ms, PDWORD ls) { const WCHAR *ptr; int x1 = 0, x2 = 0, x3 = 0, x4 = 0; @@ -109,13 +109,13 @@ static UINT ACTION_AppSearchGetSignature(MSIPACKAGE *package, MSISIGNATURE *sig, minVersion = msi_dup_record_field(row,3); if (minVersion) { - ACTION_VerStrToInteger(minVersion, &sig->MinVersionMS, &sig->MinVersionLS); + msi_parse_version_string( minVersion, &sig->MinVersionMS, &sig->MinVersionLS ); msi_free( minVersion ); } maxVersion = msi_dup_record_field(row,4); if (maxVersion) { - ACTION_VerStrToInteger(maxVersion, &sig->MaxVersionMS, &sig->MaxVersionLS); + msi_parse_version_string( maxVersion, &sig->MaxVersionMS, &sig->MaxVersionLS ); msi_free( maxVersion ); } sig->MinSize = MSI_RecordGetInteger(row,5); diff --git a/dlls/msi/files.c b/dlls/msi/files.c index f21cd28..79d7814 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -60,24 +60,6 @@ static void msi_file_update_ui( MSIPACKAGE *package, MSIFILE *f, const WCHAR *ac ui_progress( package, 2, f->FileSize, 0, 0 ); } -/* compares the version of a file read from the filesystem and - * the version specified in the File table - */ -static int msi_compare_file_version(MSIFILE *file) -{ - WCHAR version[MAX_PATH]; - DWORD size; - UINT r; - - size = MAX_PATH; - version[0] = '\0'; - r = MsiGetFileVersionW(file->TargetPath, version, &size, NULL, NULL); - if (r != ERROR_SUCCESS) - return 0; - - return lstrcmpW(version, file->Version); -} - static void schedule_install_files(MSIPACKAGE *package) { MSIFILE *file; @@ -981,6 +963,7 @@ UINT ACTION_RemoveFiles( MSIPACKAGE *package ) { MSIRECORD *uirow; LPWSTR dir, p; + VS_FIXEDFILEINFO *ver; if ( file->state == msifs_installed ) ERR("removing installed file %s\n", debugstr_w(file->TargetPath)); @@ -989,11 +972,17 @@ UINT ACTION_RemoveFiles( MSIPACKAGE *package ) file->Component->Installed == INSTALLSTATE_SOURCE ) continue; - /* don't remove a file if the old file - * is strictly newer than the version to be installed - */ - if ( msi_compare_file_version( file ) < 0 ) - continue; + if (file->Version) + { + ver = msi_get_disk_file_version( file->TargetPath ); + if (ver && msi_compare_file_versions( ver, file->Version ) > 0) + { + TRACE("newer version detected, not removing file\n"); + msi_free( ver ); + continue; + } + msi_free( ver ); + } TRACE("removing %s\n", debugstr_w(file->File) ); if (!DeleteFileW( file->TargetPath )) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 819d8bc..9f029f3 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -32,6 +32,7 @@ #include "objbase.h" #include "objidl.h" #include "winnls.h" +#include "winver.h" #include "wine/list.h" #include "wine/debug.h" @@ -811,6 +812,10 @@ extern LPWSTR msi_reg_get_val_str( HKEY hkey, LPCWSTR name ); extern BOOL msi_reg_get_val_dword( HKEY hkey, LPCWSTR name, DWORD *val); extern DWORD msi_version_str_to_dword(LPCWSTR p); +extern void msi_parse_version_string(LPCWSTR, PDWORD, PDWORD); +extern VS_FIXEDFILEINFO *msi_get_disk_file_version(LPCWSTR); +extern int msi_compare_file_versions(VS_FIXEDFILEINFO *, const WCHAR *); + extern LONG msi_reg_set_val_str( HKEY hkey, LPCWSTR name, LPCWSTR value ); extern LONG msi_reg_set_val_multi_str( HKEY hkey, LPCWSTR name, LPCWSTR value );

1 0

David Hedberg : include: Add extended treeview style (TVS_EX_) definitions.
by Alexandre Julliard 11 Jun '10

11 Jun '10

Module: wine Branch: master Commit: 341daad86152a36dcfa473c6979f99f947d11ad3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=341daad86152a36dcfa473c69… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Fri Jun 11 13:19:50 2010 +0200 include: Add extended treeview style (TVS_EX_) definitions. --- include/commctrl.h | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/include/commctrl.h b/include/commctrl.h index 27bd745..56f0029 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -2463,6 +2463,16 @@ static const WCHAR WC_TREEVIEWW[] = { 'S','y','s', #define TVS_SHAREDIMAGELISTS 0x0000 #define TVS_PRIVATEIMAGELISTS 0x0400 +#define TVS_EX_MULTISELECT 0x0002 +#define TVS_EX_DOUBLEBUFFER 0x0004 +#define TVS_EX_NOINDENTSTATE 0x0008 +#define TVS_EX_RICHTOOLTIP 0x0010 +#define TVS_EX_AUTOHSCROLL 0x0020 +#define TVS_EX_FADEINOUTEXPANDOS 0x0040 +#define TVS_EX_PARTIALCHECKBOXES 0x0080 +#define TVS_EX_EXCLUSIONCHECKBOXES 0x0100 +#define TVS_EX_DIMMEDCHECKBOXES 0x0200 +#define TVS_EX_DRAWIMAGEASYNC 0x0400 #define TVE_COLLAPSE 0x0001 #define TVE_EXPAND 0x0002

1 0

David Hedberg : include: Add PIDLIST_ABSOLUTE typedef.
by Alexandre Julliard 11 Jun '10

11 Jun '10

Module: wine Branch: master Commit: 4a47033a864436bd07189ec9daa9789589fb2185 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a47033a864436bd07189ec9d… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Fri Jun 11 13:19:49 2010 +0200 include: Add PIDLIST_ABSOLUTE typedef. --- include/shtypes.idl | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/shtypes.idl b/include/shtypes.idl index 5ed8daf..41aa236 100644 --- a/include/shtypes.idl +++ b/include/shtypes.idl @@ -39,6 +39,7 @@ typedef const PITEMID_CHILD PCITEMID_CHILD; typedef LPCITEMIDLIST PCUITEMID_CHILD; typedef LPCITEMIDLIST *PCUITEMID_CHILD_ARRAY; typedef LPCITEMIDLIST PCUIDLIST_RELATIVE; +typedef LPITEMIDLIST PIDLIST_ABSOLUTE; typedef LPCITEMIDLIST PCIDLIST_ABSOLUTE; cpp_quote("#include <poppack.h>")

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

← Newer
1
...
40
41
42
43
44
45
46
...
67
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 June 2010