July 2011 - Wine-Commits - list.winehq.org

Hans Leidekker : msi: Check the return value of MSI_IterateRecords (clang).
by Alexandre Julliard July 7, 2011

July 7, 2011

Module: wine Branch: master Commit: e601ef55a9ce9c0d3e52da48846cfa3ff000a287 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e601ef55a9ce9c0d3e52da488… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jul 7 09:23:27 2011 +0200 msi: Check the return value of MSI_IterateRecords (clang). --- dlls/msi/dialog.c | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 6159c7b..0ea689d 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -383,7 +383,6 @@ static UINT msi_dialog_build_font_list( msi_dialog *dialog ) r = MSI_IterateRecords( view, NULL, msi_dialog_add_font, dialog ); msiobj_release( &view->hdr ); - return r; } @@ -1495,13 +1494,16 @@ static UINT msi_combobox_add_items( struct msi_combobox_info *info, LPCWSTR prop /* just get the number of records */ count = 0; r = MSI_IterateRecords( view, &count, NULL, NULL ); - + if (r != ERROR_SUCCESS) + { + msiobj_release( &view->hdr ); + return r; + } info->num_items = count; info->items = msi_alloc( sizeof(*info->items) * count ); r = MSI_IterateRecords( view, NULL, msi_combobox_add_item, info ); msiobj_release( &view->hdr ); - return r; } @@ -2328,7 +2330,6 @@ static UINT msi_dialog_radiogroup_control( msi_dialog *dialog, MSIRECORD *rec ) r = MSI_IterateRecords( view, 0, msi_dialog_create_radiobutton, &group ); msiobj_release( &view->hdr ); msi_free( group.propval ); - return r; } @@ -2781,13 +2782,16 @@ static UINT msi_listbox_add_items( struct msi_listbox_info *info, LPCWSTR proper /* just get the number of records */ count = 0; r = MSI_IterateRecords( view, &count, NULL, NULL ); - + if (r != ERROR_SUCCESS) + { + msiobj_release( &view->hdr ); + return r; + } info->num_items = count; info->items = msi_alloc( sizeof(*info->items) * count ); r = MSI_IterateRecords( view, NULL, msi_listbox_add_item, info ); msiobj_release( &view->hdr ); - return r; } @@ -3378,7 +3382,6 @@ static UINT msi_dialog_fill_controls( msi_dialog *dialog ) r = MSI_IterateRecords( view, 0, msi_dialog_create_controls, dialog ); msiobj_release( &view->hdr ); - return r; }

1 0

Hans Leidekker : msi: Check the transform language against the package language instead of the system language .
by Alexandre Julliard July 7, 2011

July 7, 2011

Module: wine Branch: master Commit: 6083fd5e530c34e17b125f00d7777177984d8b1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6083fd5e530c34e17b125f00d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jul 7 09:22:48 2011 +0200 msi: Check the transform language against the package language instead of the system language. --- dlls/msi/patch.c | 26 +++++++++++++++----------- 1 files changed, 15 insertions(+), 11 deletions(-) diff --git a/dlls/msi/patch.c b/dlls/msi/patch.c index a31802e..b7ee8e7 100644 --- a/dlls/msi/patch.c +++ b/dlls/msi/patch.c @@ -32,11 +32,21 @@ WINE_DEFAULT_DEBUG_CHANNEL(msi); +static BOOL match_language( MSIPACKAGE *package, LANGID langid ) +{ + UINT i; + + if (!package->num_langids || !langid) return TRUE; + for (i = 0; i < package->num_langids; i++) + { + if (package->langids[i] == langid) return TRUE; + } + return FALSE; +} + static UINT check_transform_applicable( MSIPACKAGE *package, IStorage *patch ) { - static const WCHAR szSystemLanguageID[] = { - 'S','y','s','t','e','m','L','a','n','g','u','a','g','e','I','D',0}; - LPWSTR prod_code, patch_product, langid = NULL, template = NULL; + LPWSTR prod_code, patch_product, template = NULL; UINT ret = ERROR_FUNCTION_FAILED; prod_code = msi_dup_property( package->db, szProductCode ); @@ -68,14 +78,9 @@ static UINT check_transform_applicable( MSIPACKAGE *package, IStorage *patch ) msiobj_release( &si->hdr ); goto end; } - langid = msi_dup_property( package->db, szSystemLanguageID ); - if (!langid) - { - msiobj_release( &si->hdr ); - goto end; - } + TRACE("template: %s\n", debugstr_w(template)); p = strchrW( template, ';' ); - if (p && (!strcmpW( p + 1, langid ) || !strcmpW( p + 1, szZero ))) + if (p && match_language( package, atoiW( p + 1 ) )) { TRACE("applicable transform\n"); ret = ERROR_SUCCESS; @@ -88,7 +93,6 @@ end: msi_free( patch_product ); msi_free( prod_code ); msi_free( template ); - msi_free( langid ); return ret; }

1 0

Alexandre Julliard : gdi32: Export the gdi_physdev structure for the external drivers.
by Alexandre Julliard July 7, 2011

July 7, 2011

Module: wine Branch: master Commit: 4e2a28bd03eb6bfe91f0a77ba1b02d8a7a2d2947 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e2a28bd03eb6bfe91f0a77ba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 7 12:43:51 2011 +0200 gdi32: Export the gdi_physdev structure for the external drivers. --- dlls/gdi32/gdi_private.h | 10 ++-------- dlls/wineps.drv/psdrv.h | 3 ++- dlls/winex11.drv/x11drv.h | 6 +----- include/wine/gdi_driver.h | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 38 insertions(+), 14 deletions(-) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index cc3592f..456d92c 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -26,6 +26,7 @@ #include "windef.h" #include "winbase.h" #include "wingdi.h" +#include "wine/gdi_driver.h" /* Metafile defines */ #define META_EOF 0x0000 @@ -72,13 +73,6 @@ typedef struct tagGDIOBJHDR /* Device functions for the Wine driver interface */ -typedef struct gdi_physdev -{ - const struct tagDC_FUNCS *funcs; - struct gdi_physdev *next; - HDC hdc; -} *PHYSDEV; - typedef struct { int bit_count, width, height; @@ -154,7 +148,7 @@ typedef struct dibdrv_physdev #define DEFER_PEN 2 #define DEFER_BRUSH 4 -typedef struct tagDC_FUNCS +typedef struct gdi_dc_funcs { INT (CDECL *pAbortDoc)(PHYSDEV); BOOL (CDECL *pAbortPath)(PHYSDEV); diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index 1195662..20e6e52 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -28,6 +28,7 @@ #include "wingdi.h" #include "winspool.h" +#include "wine/gdi_driver.h" #include "wine/list.h" typedef struct { @@ -353,7 +354,7 @@ typedef struct { typedef struct { - void *reserved[3]; /* reserved for gdi */ + struct gdi_physdev dev; HDC hdc; PSFONT font; /* Current PS font */ DOWNLOAD *downloaded_fonts; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index c4125ec..21411f5 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -59,6 +59,7 @@ typedef int Status; #include "wingdi.h" #include "winuser.h" #include "ddrawi.h" +#include "wine/gdi_driver.h" #include "wine/list.h" #define MAX_PIXELFORMATS 8 @@ -141,11 +142,6 @@ typedef UINT X_PHYSFONT; struct xrender_info; -typedef struct gdi_physdev -{ - void *reserved[3]; -} *PHYSDEV; - /* X physical device */ typedef struct { diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h new file mode 100644 index 0000000..882d5c5 --- /dev/null +++ b/include/wine/gdi_driver.h @@ -0,0 +1,33 @@ +/* + * Definitions for Wine GDI drivers + * + * Copyright 2011 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_WINE_GDI_DRIVER_H +#define __WINE_WINE_GDI_DRIVER_H + +struct gdi_dc_funcs; + +typedef struct gdi_physdev +{ + const struct gdi_dc_funcs *funcs; + struct gdi_physdev *next; + HDC hdc; +} *PHYSDEV; + +#endif /* __WINE_WINE_GDI_DRIVER_H */

1 0

Hans Leidekker : msi: Avoid using an uninitialized value (clang).
by Alexandre Julliard July 7, 2011

July 7, 2011

Module: wine Branch: master Commit: 7f199e81e1f50852829fdccd2ef070a908bda710 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f199e81e1f50852829fdccd2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jul 7 09:22:07 2011 +0200 msi: Avoid using an uninitialized value (clang). --- dlls/msi/package.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 5d6523d..c5094b5 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1514,7 +1514,7 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIPACKAGE **pPackage) si = MSI_GetSummaryInformationW( db->storage, 0 ); if (!si) { - WARN("failed to load summary info %u\n", r); + WARN("failed to load summary info\n"); msiobj_release( &package->hdr ); return ERROR_INSTALL_PACKAGE_INVALID; }

1 0

Hans Leidekker : msi: Remove some dead assignments (clang).
by Alexandre Julliard July 7, 2011

July 7, 2011

Module: wine Branch: master Commit: 9299319b8813239fbf54575ac494aa2f9c2d3a27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9299319b8813239fbf54575ac… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jul 7 09:22:20 2011 +0200 msi: Remove some dead assignments (clang). --- dlls/msi/database.c | 11 +++++------ dlls/msi/font.c | 1 - dlls/msi/record.c | 2 +- dlls/msi/table.c | 1 - 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index ff9ac81..333746e 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -1518,11 +1518,9 @@ static LPWSTR get_key_value(MSIQUERY *view, LPCWSTR key, MSIRECORD *rec) static LPWSTR create_diff_row_query(MSIDATABASE *merge, MSIQUERY *view, LPWSTR table, MSIRECORD *rec) { - LPWSTR query = NULL, clause = NULL; - LPWSTR val; - LPCWSTR setptr; - DWORD size = 1, oldsize; - LPCWSTR key; + LPWSTR query = NULL, clause = NULL, val; + LPCWSTR setptr, key; + DWORD size, oldsize; MSIRECORD *keys; UINT r, i, count; @@ -1538,10 +1536,11 @@ static LPWSTR create_diff_row_query(MSIDATABASE *merge, MSIQUERY *view, if (r != ERROR_SUCCESS) return NULL; - clause = msi_alloc_zero(size * sizeof(WCHAR)); + clause = msi_alloc_zero(sizeof(WCHAR)); if (!clause) goto done; + size = 1; count = MSI_RecordGetFieldCount(keys); for (i = 1; i <= count; i++) { diff --git a/dlls/msi/font.c b/dlls/msi/font.c index afc7ee6..1ffe946 100644 --- a/dlls/msi/font.c +++ b/dlls/msi/font.c @@ -136,7 +136,6 @@ static WCHAR *load_ttf_name_id( const WCHAR *filename, DWORD id ) ttNTHeader.uNRCount = SWAPWORD(ttNTHeader.uNRCount); ttNTHeader.uStorageOffset = SWAPWORD(ttNTHeader.uStorageOffset); - bFound = FALSE; for(i=0; i<ttNTHeader.uNRCount; i++) { if (!ReadFile(handle,&ttRecord, sizeof(TT_NAME_RECORD),&dwRead,NULL)) diff --git a/dlls/msi/record.c b/dlls/msi/record.c index e58bd82..0e4fb8a 100644 --- a/dlls/msi/record.c +++ b/dlls/msi/record.c @@ -833,7 +833,7 @@ UINT MSI_RecordReadStream(MSIRECORD *rec, UINT iField, char *buf, LPDWORD sz) ofs.QuadPart = cur.QuadPart = 0; end.QuadPart = 0; - r = IStream_Seek( stm, ofs, STREAM_SEEK_SET, &cur ); + IStream_Seek( stm, ofs, STREAM_SEEK_SET, &cur ); IStream_Seek( stm, ofs, STREAM_SEEK_END, &end ); ofs.QuadPart = cur.QuadPart; IStream_Seek( stm, ofs, STREAM_SEEK_SET, &cur ); diff --git a/dlls/msi/table.c b/dlls/msi/table.c index ecca7c9..3d062fd 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -2746,7 +2746,6 @@ static UINT msi_table_load_transform( MSIDATABASE *db, IStorage *stg, debugstr_w(name), tv->num_cols, tv->row_size, rawsize ); /* interpret the data */ - r = ERROR_SUCCESS; for( n=0; n < rawsize; ) { mask = rawdata[n] | (rawdata[n+1] << 8);

1 0

Hans Leidekker : msi: Get rid of the msistring typedef.
by Alexandre Julliard July 7, 2011

July 7, 2011

Module: wine Branch: master Commit: 4686efd2817b0cc3ff58b8ef96997c0c5607b24b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4686efd2817b0cc3ff58b8ef9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jul 7 09:23:14 2011 +0200 msi: Get rid of the msistring typedef. --- dlls/msi/string.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/msi/string.c b/dlls/msi/string.c index 142658f..4185c15 100644 --- a/dlls/msi/string.c +++ b/dlls/msi/string.c @@ -41,12 +41,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(msidb); -typedef struct _msistring +struct msistring { USHORT persistent_refcount; USHORT nonpersistent_refcount; LPWSTR str; -} msistring; +}; struct string_table { @@ -54,8 +54,8 @@ struct string_table UINT freeslot; UINT codepage; UINT sortcount; - msistring *strings; /* an array of strings */ - UINT *sorted; /* index */ + struct msistring *strings; /* an array of strings */ + UINT *sorted; /* index */ }; static BOOL validate_codepage( UINT codepage ) @@ -81,7 +81,7 @@ static string_table *init_stringtable( int entries, UINT codepage ) if( entries < 1 ) entries = 1; - st->strings = msi_alloc_zero( sizeof (msistring) * entries ); + st->strings = msi_alloc_zero( sizeof(struct msistring) * entries ); if( !st->strings ) { msi_free( st ); @@ -122,7 +122,7 @@ VOID msi_destroy_stringtable( string_table *st ) static int st_find_free_entry( string_table *st ) { UINT i, sz, *s; - msistring *p; + struct msistring *p; TRACE("%p\n", st); @@ -140,7 +140,7 @@ static int st_find_free_entry( string_table *st ) /* dynamically resize */ sz = st->maxcount + 1 + st->maxcount/2; - p = msi_realloc_zero( st->strings, sz*sizeof(msistring) ); + p = msi_realloc_zero( st->strings, sz * sizeof(struct msistring) ); if( !p ) return -1;

1 0

Hans Leidekker : msi: Add a stub implementation of MsiDeterminePatchSequence.
by Alexandre Julliard July 7, 2011

July 7, 2011

Module: wine Branch: master Commit: 537a5932b0a0a25c78d39c67ec85b2f431ee7964 URL: http://source.winehq.org/git/wine.git/?a=commit;h=537a5932b0a0a25c78d39c67e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jul 7 09:22:34 2011 +0200 msi: Add a stub implementation of MsiDeterminePatchSequence. --- dlls/msi/msi.c | 214 +++++++++++++++++++++++++++++++++++--------------------- include/msi.h | 4 + 2 files changed, 137 insertions(+), 81 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=537a5932b0a0a25c78d39…

1 0

Hans Leidekker : msi: Avoid dereferencing a NULL pointer (clang).
by Alexandre Julliard July 7, 2011

July 7, 2011

Module: wine Branch: master Commit: 540d18906027db67e192526fff584527abc69e86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=540d18906027db67e192526ff… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jul 7 09:22:59 2011 +0200 msi: Avoid dereferencing a NULL pointer (clang). --- dlls/msi/assembly.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/msi/assembly.c b/dlls/msi/assembly.c index 806f89e..fd1f952 100644 --- a/dlls/msi/assembly.c +++ b/dlls/msi/assembly.c @@ -247,8 +247,11 @@ static WCHAR *get_assembly_display_name( MSIDATABASE *db, const WCHAR *comp, MSI done: msiobj_release( &view->hdr ); - for (i = 0; i < name.count; i++) msi_free( name.attrs[i] ); - msi_free( name.attrs ); + if (name.attrs) + { + for (i = 0; i < name.count; i++) msi_free( name.attrs[i] ); + msi_free( name.attrs ); + } return display_name; }

1 0

Francois Gouget : msi: Make msi_parse_patch_summary() and msi_apply_patch_db() static.
by Alexandre Julliard July 7, 2011

July 7, 2011

Module: wine Branch: master Commit: 26772e168b725b8da49a749c76f38835ab3730af URL: http://source.winehq.org/git/wine.git/?a=commit;h=26772e168b725b8da49a749c7… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jul 7 09:14:55 2011 +0200 msi: Make msi_parse_patch_summary() and msi_apply_patch_db() static. --- dlls/msi/msipriv.h | 2 -- dlls/msi/patch.c | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 5a264df..4f1ce53 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -768,8 +768,6 @@ extern UINT msi_apply_transforms( MSIPACKAGE *package ) DECLSPEC_HIDDEN; /* patch functions */ extern UINT msi_check_patch_applicable( MSIPACKAGE *package, MSISUMMARYINFO *si ) DECLSPEC_HIDDEN; -extern UINT msi_parse_patch_summary( MSISUMMARYINFO *si, MSIPATCHINFO **patch ) DECLSPEC_HIDDEN; -extern UINT msi_apply_patch_db( MSIPACKAGE *package, MSIDATABASE *patch_db, MSIPATCHINFO *patch ) DECLSPEC_HIDDEN; extern UINT msi_apply_patches( MSIPACKAGE *package ) DECLSPEC_HIDDEN; extern UINT msi_apply_registered_patch( MSIPACKAGE *package, LPCWSTR patch_code ) DECLSPEC_HIDDEN; diff --git a/dlls/msi/patch.c b/dlls/msi/patch.c index b7ee8e7..feceabf 100644 --- a/dlls/msi/patch.c +++ b/dlls/msi/patch.c @@ -150,7 +150,7 @@ UINT msi_check_patch_applicable( MSIPACKAGE *package, MSISUMMARYINFO *si ) return ret; } -UINT msi_parse_patch_summary( MSISUMMARYINFO *si, MSIPATCHINFO **patch ) +static UINT msi_parse_patch_summary( MSISUMMARYINFO *si, MSIPATCHINFO **patch ) { MSIPATCHINFO *pi; UINT r = ERROR_SUCCESS; @@ -570,7 +570,7 @@ done: return r; } -UINT msi_apply_patch_db( MSIPACKAGE *package, MSIDATABASE *patch_db, MSIPATCHINFO *patch ) +static UINT msi_apply_patch_db( MSIPACKAGE *package, MSIDATABASE *patch_db, MSIPATCHINFO *patch ) { UINT i, r = ERROR_SUCCESS; WCHAR **substorage;

1 0

Hans Leidekker : msi: Use the return value of MSI_IterateRecords (clang).
by Alexandre Julliard July 7, 2011

July 7, 2011

Module: wine Branch: master Commit: 4202b1419c9e0a4931fce7fa7fc70301547de9c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4202b1419c9e0a4931fce7fa7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jul 7 09:21:52 2011 +0200 msi: Use the return value of MSI_IterateRecords (clang). --- dlls/msi/action.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 9070b76..0ac6dba 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -6977,6 +6977,7 @@ static UINT ACTION_RemoveExistingProducts( MSIPACKAGE *package ) { r = MSI_IterateRecords( view, NULL, ITERATE_RemoveExistingProducts, package ); msiobj_release( &view->hdr ); + return r; } return ERROR_SUCCESS; }

1 0