March 2011 - Wine-commits - list.winehq.org

Hans Leidekker : msi: Let the InstallFiles action determine which private assembly files to install .
by Alexandre Julliard 16 Mar '11

16 Mar '11

Module: wine Branch: master Commit: bb40bebd2b62a8a6e8dd8fdf34aa8a3908a91a24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb40bebd2b62a8a6e8dd8fdf3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 16 09:22:59 2011 +0100 msi: Let the InstallFiles action determine which private assembly files to install. --- dlls/msi/assembly.c | 7 +++++-- dlls/msi/files.c | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/msi/assembly.c b/dlls/msi/assembly.c index fcca6b8..ad5e3a5 100644 --- a/dlls/msi/assembly.c +++ b/dlls/msi/assembly.c @@ -282,8 +282,11 @@ MSIASSEMBLY *load_assembly( MSIPACKAGE *package, MSICOMPONENT *comp ) if (a->application) { - FIXME("we should probably check the manifest file here\n"); - a->installed = (msi_get_property_int( package->db, szInstalled, 0 ) != 0); + /* We can't check the manifest here because the target path may still change. + So we assume that the assembly is not installed and lean on the InstallFiles + action to determine which files need to be installed. + */ + a->installed = FALSE; } else { diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 7f71d1a..1f61873 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -74,7 +74,7 @@ static msi_file_state calculate_install_state( MSIFILE *file ) TRACE("file %s is not scheduled for install\n", debugstr_w(file->File)); return msifs_skipped; } - if ((comp->assembly && !comp->assembly->installed) || + if ((comp->assembly && !comp->assembly->application && !comp->assembly->installed) || GetFileAttributesW( file->TargetPath ) == INVALID_FILE_ATTRIBUTES) { TRACE("file %s is missing\n", debugstr_w(file->File));

1 0

Austin Lund : user32/tests: Output error information in cursoricon tests.
by Alexandre Julliard 16 Mar '11

16 Mar '11

Module: wine Branch: master Commit: 5d0783bc0d9149015fcbfd1375f64104d039ff0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d0783bc0d9149015fcbfd137… Author: Austin Lund <austin.lund(a)gmail.com> Date: Wed Mar 16 19:59:26 2011 +1000 user32/tests: Output error information in cursoricon tests. --- dlls/user32/tests/cursoricon.c | 29 +++++++++++++++++++---------- 1 files changed, 19 insertions(+), 10 deletions(-) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 1127f13..d6a437d 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -1452,7 +1452,7 @@ static void test_GetCursorFrameInfo(void) /* Creating a static cursor. */ SetLastError(0xdeadbeef); h1 = CreateIconFromResource((PBYTE) hotspot, CRSR_RES_SIZE, FALSE, 0x00030000); - ok(h1 != NULL, "Create cursor failed.\n"); + ok(h1 != NULL, "Create cursor failed (error = %d).\n", GetLastError()); /* Check GetCursorFrameInfo behavior on a static cursor */ unk1 = unk2 = unk3 = unk4 = 0xdead; @@ -1464,15 +1464,17 @@ static void test_GetCursorFrameInfo(void) ok(unk4 == 1, "GetCursorFrameInfo() unexpected param 5 value (%d != 1).\n", unk4); /* Clean up static cursor. */ + SetLastError(0xdeadbeef); ret = DestroyCursor(h1); - ok(ret, "DestroyCursor() failed.\n"); + ok(ret, "DestroyCursor() failed (error = %d).\n", GetLastError()); /* Creating a single-frame animated cursor. */ empty_anicursor.frames[0].data.icon_info.idType = 2; /* type: cursor */ empty_anicursor.frames[0].data.icon_info.idEntries[0].xHotspot = 3; empty_anicursor.frames[0].data.icon_info.idEntries[0].yHotspot = 3; + SetLastError(0xdeadbeef); h1 = CreateIconFromResource((PBYTE) &empty_anicursor, sizeof(empty_anicursor), FALSE, 0x00030000); - ok(h1 != NULL, "Create cursor failed.\n"); + ok(h1 != NULL, "Create cursor failed (error = %d).\n", GetLastError()); /* Check GetCursorFrameInfo behavior on a single-frame animated cursor */ unk1 = unk2 = unk3 = unk4 = 0xdead; @@ -1485,8 +1487,9 @@ static void test_GetCursorFrameInfo(void) "GetCursorFrameInfo() unexpected param 5 value (%d != 1).\n", unk4); /* Clean up single-frame animated cursor. */ + SetLastError(0xdeadbeef); ret = DestroyCursor(h1); - ok(ret, "DestroyCursor() failed.\n"); + ok(ret, "DestroyCursor() failed (error = %d).\n", GetLastError()); /* Creating a multi-frame animated cursor. */ for (i=0; i<empty_anicursor3.header.header.num_frames; i++) @@ -1495,8 +1498,9 @@ static void test_GetCursorFrameInfo(void) empty_anicursor3.frames[i].data.icon_info.idEntries[0].xHotspot = 3; empty_anicursor3.frames[i].data.icon_info.idEntries[0].yHotspot = 3; } + SetLastError(0xdeadbeef); h1 = CreateIconFromResource((PBYTE) &empty_anicursor3, sizeof(empty_anicursor3), FALSE, 0x00030000); - ok(h1 != NULL, "Create cursor failed.\n"); + ok(h1 != NULL, "Create cursor failed (error = %d).\n", GetLastError()); /* Check number of steps in multi-frame animated cursor */ i=0; @@ -1536,13 +1540,15 @@ static void test_GetCursorFrameInfo(void) "GetCursorFrameInfo() unexpected param 5 value (0x%x != 0xdead).\n", unk4); /* Clean up multi-frame animated cursor. */ + SetLastError(0xdeadbeef); ret = DestroyCursor(h1); - ok(ret, "DestroyCursor() failed.\n"); + ok(ret, "DestroyCursor() failed (error = %d).\n", GetLastError()); /* Create a multi-frame animated cursor with num_steps == 1 */ empty_anicursor3.header.header.num_steps = 1; + SetLastError(0xdeadbeef); h1 = CreateIconFromResource((PBYTE) &empty_anicursor3, sizeof(empty_anicursor3), FALSE, 0x00030000); - ok(h1 != NULL, "Create cursor failed.\n"); + ok(h1 != NULL, "Create cursor failed (error = %d).\n", GetLastError()); /* Check number of steps in multi-frame animated cursor (mismatch between steps and frames) */ i=0; @@ -1578,8 +1584,9 @@ static void test_GetCursorFrameInfo(void) "GetCursorFrameInfo() unexpected param 5 value (%d != 0xdead).\n", unk4); /* Clean up multi-frame animated cursor. */ + SetLastError(0xdeadbeef); ret = DestroyCursor(h1); - ok(ret, "DestroyCursor() failed.\n"); + ok(ret, "DestroyCursor() failed (error = %d).\n", GetLastError()); /* Creating a multi-frame animated cursor with rate data. */ for (i=0; i<empty_anicursor3_rate.header.header.num_frames; i++) @@ -1588,8 +1595,9 @@ static void test_GetCursorFrameInfo(void) empty_anicursor3_rate.frames[i].data.icon_info.idEntries[0].xHotspot = 3; empty_anicursor3_rate.frames[i].data.icon_info.idEntries[0].yHotspot = 3; } + SetLastError(0xdeadbeef); h1 = CreateIconFromResource((PBYTE) &empty_anicursor3_rate, sizeof(empty_anicursor3_rate), FALSE, 0x00030000); - ok(h1 != NULL, "Create cursor failed.\n"); + ok(h1 != NULL, "Create cursor failed (error = %x).\n", GetLastError()); /* Check number of steps in multi-frame animated cursor with rate data */ i=0; @@ -1616,8 +1624,9 @@ static void test_GetCursorFrameInfo(void) } /* Clean up multi-frame animated cursor with rate data. */ + SetLastError(0xdeadbeef); ret = DestroyCursor(h1); - ok(ret, "DestroyCursor() failed.\n"); + ok(ret, "DestroyCursor() failed (error = %d).\n", GetLastError()); cleanup: if(bmpOld) SelectObject(hdc, bmpOld);

1 0

Łukasz Wojniłowicz : po: Update Polish translation.
by Alexandre Julliard 16 Mar '11

16 Mar '11

Module: wine Branch: master Commit: 0a4c91d73c3a7fc852f0277771e19f44c2cf414a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a4c91d73c3a7fc852f027777… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Tue Mar 15 12:49:41 2011 +0100 po: Update Polish translation. --- po/pl.po | 657 ++++++++++++++++++------------------------------------------- 1 files changed, 194 insertions(+), 463 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0a4c91d73c3a7fc852f02…

1 0

Alexandre Julliard : gdi32: Add null driver entry points for the bitmap functions.
by Alexandre Julliard 16 Mar '11

16 Mar '11

Module: wine Branch: master Commit: 122b5bf7841c6717894f22c951c5285feda7779b URL: http://source.winehq.org/git/wine.git/?a=commit;h=122b5bf7841c6717894f22c95… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 15 19:51:06 2011 +0100 gdi32: Add null driver entry points for the bitmap functions. --- dlls/gdi32/bitmap.c | 127 ++++++++++++++++++++++++++++------------------ dlls/gdi32/brush.c | 2 +- dlls/gdi32/dib.c | 40 +++------------ dlls/gdi32/driver.c | 22 ++++++-- dlls/gdi32/gdi_private.h | 6 ++- 5 files changed, 107 insertions(+), 90 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=122b5bf7841c6717894f2…

1 0

Alexandre Julliard : gdi32: Add null driver entry points for the DC state functions.
by Alexandre Julliard 16 Mar '11

16 Mar '11

Module: wine Branch: master Commit: e6d153bbf6e767d2ecea0289827188a19929acbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6d153bbf6e767d2ecea02898… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 15 20:17:58 2011 +0100 gdi32: Add null driver entry points for the DC state functions. --- dlls/gdi32/dc.c | 116 +++++++++++++++++----------------------------- dlls/gdi32/driver.c | 11 +++- dlls/gdi32/enhmfdrv/dc.c | 9 ++-- dlls/gdi32/gdi_private.h | 4 +- 4 files changed, 58 insertions(+), 82 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e6d153bbf6e767d2ecea0…

1 0

Alexandre Julliard : gdi32: Don't allocate a GDI handle for saved DCs.
by Alexandre Julliard 16 Mar '11

16 Mar '11

Module: wine Branch: master Commit: 7b970a165778833f8d7cd4ffd877b9b14d2c4938 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b970a165778833f8d7cd4ffd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 16 11:41:49 2011 +0100 gdi32: Don't allocate a GDI handle for saved DCs. --- dlls/gdi32/dc.c | 76 ++++++++++++++++----------------------------- dlls/gdi32/gdi_private.h | 4 +- 2 files changed, 29 insertions(+), 51 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index b0a7151..d70d2c2 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -160,18 +160,27 @@ DC *alloc_dc_ptr( const DC_FUNCTIONS *funcs, WORD magic ) /*********************************************************************** - * free_dc_ptr + * free_dc_state */ -BOOL free_dc_ptr( DC *dc ) +static void free_dc_state( DC *dc ) { - assert( dc->refcount == 1 ); - if (free_gdi_handle( dc->hSelf ) != dc) return FALSE; /* shouldn't happen */ if (dc->hClipRgn) DeleteObject( dc->hClipRgn ); if (dc->hMetaRgn) DeleteObject( dc->hMetaRgn ); if (dc->hMetaClipRgn) DeleteObject( dc->hMetaClipRgn ); if (dc->hVisRgn) DeleteObject( dc->hVisRgn ); PATH_DestroyGdiPath( &dc->path ); - return HeapFree( GetProcessHeap(), 0, dc ); + HeapFree( GetProcessHeap(), 0, dc ); +} + + +/*********************************************************************** + * free_dc_ptr + */ +void free_dc_ptr( DC *dc ) +{ + assert( dc->refcount == 1 ); + free_gdi_handle( dc->hSelf ); + free_dc_state( dc ); } @@ -373,7 +382,6 @@ void DC_UpdateXforms( DC *dc ) INT CDECL nulldrv_SaveDC( PHYSDEV dev ) { DC *newdc, *dc = get_nulldrv_dc( dev ); - INT ret; if (!(newdc = HeapAlloc( GetProcessHeap(), 0, sizeof(*newdc )))) return 0; newdc->flags = dc->flags | DC_SAVED; @@ -422,22 +430,8 @@ INT CDECL nulldrv_SaveDC( PHYSDEV dev ) newdc->BoundsRect = dc->BoundsRect; newdc->gdiFont = dc->gdiFont; - newdc->thread = GetCurrentThreadId(); - newdc->refcount = 1; - newdc->saveLevel = 0; - newdc->saved_dc = 0; - PATH_InitGdiPath( &newdc->path ); - newdc->pAbortProc = NULL; - newdc->hookProc = NULL; - - if (!(newdc->hSelf = alloc_gdi_handle( &newdc->header, dc->header.type, &dc_funcs ))) - { - HeapFree( GetProcessHeap(), 0, newdc ); - return 0; - } - /* Get/SetDCState() don't change hVisRgn field ("Undoc. Windows" p.559). */ newdc->hVisRgn = 0; @@ -454,20 +448,19 @@ INT CDECL nulldrv_SaveDC( PHYSDEV dev ) newdc->hMetaRgn = CreateRectRgn( 0, 0, 0, 0 ); CombineRgn( newdc->hMetaRgn, dc->hMetaRgn, 0, RGN_COPY ); } + /* don't bother recomputing hMetaClipRgn, we'll do that in SetDCState */ if (!PATH_AssignGdiPath( &newdc->path, &dc->path )) { release_dc_ptr( dc ); - free_dc_ptr( newdc ); + free_dc_state( newdc ); return 0; } newdc->saved_dc = dc->saved_dc; - dc->saved_dc = newdc->hSelf; - ret = ++dc->saveLevel; - release_dc_ptr( newdc ); - return ret; + dc->saved_dc = newdc; + return ++dc->saveLevel; } @@ -476,8 +469,7 @@ INT CDECL nulldrv_SaveDC( PHYSDEV dev ) */ BOOL CDECL nulldrv_RestoreDC( PHYSDEV dev, INT level ) { - DC *dcs, *dc = get_nulldrv_dc( dev ); - HDC hdcs, first_dcs; + DC *dcs, *first_dcs, *dc = get_nulldrv_dc( dev ); INT save_level; /* find the state level to restore */ @@ -485,21 +477,12 @@ BOOL CDECL nulldrv_RestoreDC( PHYSDEV dev, INT level ) if (abs(level) > dc->saveLevel || level == 0) return FALSE; if (level < 0) level = dc->saveLevel + level + 1; first_dcs = dc->saved_dc; - for (hdcs = first_dcs, save_level = dc->saveLevel; save_level > level; save_level--) - { - if (!(dcs = get_dc_ptr( hdcs ))) return FALSE; - hdcs = dcs->saved_dc; - release_dc_ptr( dcs ); - } + for (dcs = first_dcs, save_level = dc->saveLevel; save_level > level; save_level--) + dcs = dcs->saved_dc; /* restore the state */ - if (!(dcs = get_dc_ptr( hdcs ))) return FALSE; - if (!PATH_AssignGdiPath( &dc->path, &dcs->path )) - { - release_dc_ptr( dcs ); - return FALSE; - } + if (!PATH_AssignGdiPath( &dc->path, &dcs->path )) return FALSE; dc->flags = dcs->flags & ~DC_SAVED; dc->layout = dcs->layout; @@ -577,16 +560,13 @@ BOOL CDECL nulldrv_RestoreDC( PHYSDEV dev, INT level ) dcs->saved_dc = 0; dc->saveLevel = save_level - 1; - release_dc_ptr( dcs ); - /* now destroy all the saved DCs */ while (first_dcs) { - if (!(dcs = get_dc_ptr( first_dcs ))) break; - hdcs = dcs->saved_dc; - free_dc_ptr( dcs ); - first_dcs = hdcs; + DC *next = first_dcs->saved_dc; + free_dc_state( first_dcs ); + first_dcs = next; } return TRUE; } @@ -841,12 +821,10 @@ BOOL WINAPI DeleteDC( HDC hdc ) while (dc->saveLevel) { - DC * dcs; - HDC hdcs = dc->saved_dc; - if (!(dcs = get_dc_ptr( hdcs ))) break; + DC *dcs = dc->saved_dc; dc->saved_dc = dcs->saved_dc; dc->saveLevel--; - free_dc_ptr( dcs ); + free_dc_state( dcs ); } if (!(dc->flags & DC_SAVED)) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 996a435..c9f653e 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -253,7 +253,7 @@ typedef struct tagDC LONG refcount; /* thread refcount */ LONG dirty; /* dirty flag */ INT saveLevel; - HDC saved_dc; + struct tagDC *saved_dc; DWORD_PTR dwHookData; DCHOOKPROC hookProc; /* DC hook */ @@ -376,7 +376,7 @@ extern void CLIPPING_UpdateGCRegion( DC * dc ) DECLSPEC_HIDDEN; /* dc.c */ extern DC *alloc_dc_ptr( const DC_FUNCTIONS *funcs, WORD magic ) DECLSPEC_HIDDEN; -extern BOOL free_dc_ptr( DC *dc ) DECLSPEC_HIDDEN; +extern void free_dc_ptr( DC *dc ) DECLSPEC_HIDDEN; extern DC *get_dc_ptr( HDC hdc ) DECLSPEC_HIDDEN; extern void release_dc_ptr( DC *dc ) DECLSPEC_HIDDEN; extern void update_dc( DC *dc ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : gdi32: Add null driver entry points for the text functions.
by Alexandre Julliard 16 Mar '11

16 Mar '11

Module: wine Branch: master Commit: 1fc5603cc958a9b112b6bca23f0c1fe472b4fd2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fc5603cc958a9b112b6bca23… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 15 20:42:49 2011 +0100 gdi32: Add null driver entry points for the text functions. --- dlls/gdi32/driver.c | 38 ++++++++++++++++-- dlls/gdi32/font.c | 95 +++++++++++++++++++++++----------------------- dlls/gdi32/gdi_private.h | 2 +- 3 files changed, 81 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1fc5603cc958a9b112b6b…

1 0

Henri Verbeet : d3d8: Fix IDirect3DCubeTexture8Impl_GetLOD().
by Alexandre Julliard 16 Mar '11

16 Mar '11

Module: wine Branch: master Commit: 235dbbb5d7c23b1709244a03194096fe2d5f8056 URL: http://source.winehq.org/git/wine.git/?a=commit;h=235dbbb5d7c23b1709244a031… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 15 18:19:31 2011 +0100 d3d8: Fix IDirect3DCubeTexture8Impl_GetLOD(). --- dlls/d3d8/cubetexture.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/cubetexture.c b/dlls/d3d8/cubetexture.c index 7b5305c..0c7295a 100644 --- a/dlls/d3d8/cubetexture.c +++ b/dlls/d3d8/cubetexture.c @@ -229,7 +229,7 @@ static DWORD WINAPI IDirect3DCubeTexture8Impl_GetLOD(IDirect3DCubeTexture8 *ifac TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - lod = IWineD3DCubeTexture_GetLOD((LPDIRECT3DBASETEXTURE8) This); + lod = IWineD3DCubeTexture_GetLOD(This->wineD3DCubeTexture); wined3d_mutex_unlock(); return lod;

1 0

Henri Verbeet : wined3d: Use the correct resource_ops in cubetexture_unload ().
by Alexandre Julliard 16 Mar '11

16 Mar '11

Module: wine Branch: master Commit: 6110fe3a823ac4f0e67746cd1113485d12604777 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6110fe3a823ac4f0e67746cd1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 15 18:19:32 2011 +0100 wined3d: Use the correct resource_ops in cubetexture_unload(). --- dlls/wined3d/cubetexture.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index 4171d55..9a27f5b 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -151,7 +151,7 @@ static void cubetexture_unload(struct wined3d_resource *resource) struct wined3d_resource *sub_resource = texture->baseTexture.sub_resources[i]; IWineD3DSurfaceImpl *surface = surface_from_resource(sub_resource); - resource->resource_ops->resource_unload(sub_resource); + sub_resource->resource_ops->resource_unload(sub_resource); surface_set_texture_name(surface, 0, TRUE); surface_set_texture_name(surface, 0, FALSE); }

1 0

Henri Verbeet : wined3d: Get rid of IWineD3DVolumeTexture.
by Alexandre Julliard 16 Mar '11

16 Mar '11

Module: wine Branch: master Commit: ed0037854a20beeef2ad4deb47d4a5537f4715b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed0037854a20beeef2ad4deb4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 15 18:19:33 2011 +0100 wined3d: Get rid of IWineD3DVolumeTexture. --- dlls/d3d10core/d3d10core_private.h | 2 +- dlls/d3d10core/texture.c | 11 +++--- dlls/d3d8/d3d8_private.h | 9 +---- dlls/d3d8/volumetexture.c | 36 +++++++++--------- dlls/d3d9/d3d9_private.h | 9 +---- dlls/d3d9/volumetexture.c | 68 +++++++++++------------------------- dlls/wined3d/device.c | 4 +- dlls/wined3d/volumetexture.c | 56 ++++++++++++++--------------- dlls/wined3d/wined3d_private.h | 5 +-- include/wine/wined3d.idl | 11 +----- 10 files changed, 80 insertions(+), 131 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ed0037854a20beeef2ad4…

1 0