July 2015 - Wine-commits - list.winehq.org

Piotr Caban : msvcrt: Don' t call DeleteCriticalSection on static critical section.
by Alexandre Julliard 16 Jul '15

16 Jul '15

Module: wine Branch: master Commit: 2294d3ba456921e83fa5970e0e62855614c9c30c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2294d3ba456921e83fa5970e0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 16 13:07:51 2015 +0200 msvcrt: Don't call DeleteCriticalSection on static critical section. --- dlls/msvcrt/file.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 241c337..44aa32e 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1197,8 +1197,6 @@ void msvcrt_free_io(void) for(i=0; i<sizeof(MSVCRT_fstream)/sizeof(MSVCRT_fstream[0]); i++) MSVCRT_free(MSVCRT_fstream[i]); - - DeleteCriticalSection(&MSVCRT_file_cs); } /*********************************************************************

1 0

Jeremy Newman : add new RSVP form for WineConf 2015
by Jeremy Newman 15 Jul '15

15 Jul '15

Module: website Branch: master Commit: 7af1b4eda7077e93f0346f678773df539da117da URL: http://source.winehq.org/git/website.git/?a=commit;h=7af1b4eda7077e93f0346f… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed Jul 15 10:20:58 2015 -0500 add new RSVP form for WineConf 2015 also remove old forms --- templates/en/wineconf/rsvp.template | 14 +--- templates/en/wineconf/rsvp_done.template | 5 -- templates/en/wineconf/rsvp_form.template | 30 --------- templates/en/wineconf/survey.template | 14 ---- templates/en/wineconf/survey_done.template | 5 -- templates/en/wineconf/survey_form.template | 103 ----------------------------- templates/tr/wineconf/rsvp.template | 14 ---- templates/tr/wineconf/rsvp_done.template | 5 -- templates/tr/wineconf/rsvp_form.template | 30 --------- templates/tr/wineconf/survey.template | 14 ---- templates/tr/wineconf/survey_done.template | 5 -- 11 files changed, 2 insertions(+), 237 deletions(-) diff --git a/templates/en/wineconf/rsvp.template b/templates/en/wineconf/rsvp.template index f07b9ac..3b4db57 100644 --- a/templates/en/wineconf/rsvp.template +++ b/templates/en/wineconf/rsvp.template @@ -1,14 +1,4 @@ - + -<table width="100%"> -<tr> - <td><img src="{$root}/images/wineconf/wineconf_logo.jpg" width="295" height="108" alt="-LOGO-"></td> - <td align="right"><center><FONT size="+2"><b>October 1 - 2, 2011<br>Minneapolis, MN</b></font></center></td> -</tr> -</table> +<iframe id="rsvp" src="https://docs.google.com/forms/d/15RugGIfd1gU-BguHWyfDvhjF2PSkdDpS1-pOkgDrh5…" frameborder="0" marginheight="0" marginwidth="0" width="90%" height="900">Loading...</iframe> -<hr /> - - - -<p> </p> diff --git a/templates/en/wineconf/rsvp_done.template b/templates/en/wineconf/rsvp_done.template deleted file mode 100644 index efd17e3..0000000 --- a/templates/en/wineconf/rsvp_done.template +++ /dev/null @@ -1,5 +0,0 @@ -<h3>Thanks!</h3> - -<p>Your name and email has been listed for attending WineConf.</p> - -<p> </p> diff --git a/templates/en/wineconf/rsvp_form.template b/templates/en/wineconf/rsvp_form.template deleted file mode 100644 index 88843f4..0000000 --- a/templates/en/wineconf/rsvp_form.template +++ /dev/null @@ -1,30 +0,0 @@ -{$error} - -<p>This form is to let us know you plan on attending WineConf</p> - -<form name="rsvp" action="{$self}" method="post"> - -<table> - -<tr> - <th>Name:</th> - <td><input type="text" name="q[name]" size="40" value="{$name}" /></td> -</tr> - -<tr> - <th>Email:</th> - <td><input type="text" name="q[email]" size="40" value="{$email}" /></td> -</tr> - -<tr> - <th>Comments:</th> - <td><textarea name="q[comment]" rows="5" cols="40">{$comment}</textarea></td> -</tr> - -</table> - -<p><input type="submit" name="submit" value=" Submit RSVP " class="button" /></p> - -<input type="hidden" name="fields" value="name|email|comment" /> - -</form> diff --git a/templates/en/wineconf/survey.template b/templates/en/wineconf/survey.template deleted file mode 100644 index 7ded9ea..0000000 --- a/templates/en/wineconf/survey.template +++ /dev/null @@ -1,14 +0,0 @@ - - -<table width="100%"> -<tr> - <td><img src="{$root}/images/wineconf/wineconf_logo.jpg" width="295" height="108" alt="-LOGO-"></td> - <td align="right"></td> -</tr> -</table> - -<hr /> - - - -<p> </p> diff --git a/templates/en/wineconf/survey_done.template b/templates/en/wineconf/survey_done.template deleted file mode 100644 index 52b887d..0000000 --- a/templates/en/wineconf/survey_done.template +++ /dev/null @@ -1,5 +0,0 @@ -<h3>Thanks!</h3> - -<p>This well help us decide on the next WineConf.</p> - -<p> </p> diff --git a/templates/en/wineconf/survey_form.template b/templates/en/wineconf/survey_form.template deleted file mode 100644 index 5463d6a..0000000 --- a/templates/en/wineconf/survey_form.template +++ /dev/null @@ -1,103 +0,0 @@ -{$error} - -<p></p> - -<form name="survey" action="{$self}" method="post"> - -<p> -The current plan is to host Wineconf in Saint Paul, Minnesota, over the -weekend of September 27 and 28, 2008. -</p> -<p> -This year we have some funding in the Wine Party Fund for travel costs. -The hope is that this will mitigate the pain for many Europeans that might not otherwise -come to Minnesota. It's not an infinite supply, so we will -have to prioritize to favor people with proven contribution histories. -</p> -<p> -Please fill out this survey to help me figure out how to manage that -funding and to help me plan the dates. -</p> - -<p>How does the location work for you:</p> - -<ol> - <li> - <input type="radio" name="q[location]" value="good" checked="checked" /> - I am happy to come to the USA, it's the best choice for me. - </li> - - <li> - <input type="radio" name="q[location]" value="okay" /> - St. Paul is okay for this year, but in general, Europe is better. - </li> - - <li> - <input type="radio" name="q[location]" value="hateusa" /> - I will never travel to the USA under any circumstances. - </li> -</ol> - -<p>How does the date work:</p> - -<ol> - <li> - <input type="radio" name="q[date]" value="fine" checked="checked" /> - The weekend of September 27th works fine for me. - </li> - - <li> - <input type="radio" name="q[date]" value="move" /> - I could make it, but I need a different date (please specify below). - </li> - - <li> - <input type="radio" name="q[date]" value="no" /> - This fall is just bad for me; I can't come. - </li> -</ol> - -<p>Do you need travel sponsorship:</p> - -<ol> - - <li> - <input type="radio" name="q[money]" value="need" /> - I can't come without financial aid. - </li> - <li> - <input type="radio" name="q[money]" value="some" /> - I could come, but boy would it be nice to have some help. - </li> - - <li> - <input type="radio" name="q[money]" value="none" /> - I don't need any financial help for the travel. - </li> - -</ol> - -<table> - -<tr> - <th>Name:</th> - <td><input type="text" name="q[name]" size="40" value="{$name}" /></td> -</tr> - -<tr> - <th>Email:</th> - <td><input type="text" name="q[email]" size="40" value="{$email}" /></td> -</tr> - -<tr> - <th>Comments:</th> - <td><textarea name="q[comment]" rows="5" cols="40">{$comment}</textarea></td> -</tr> - -</table> - -<p><input type="submit" name="submit" value=" Submit Survey " class="button" /></p> - -<input type="hidden" name="fields" value="location|date|money|name|email|comment" /> - -</form> diff --git a/templates/tr/wineconf/rsvp.template b/templates/tr/wineconf/rsvp.template deleted file mode 100644 index 647dc0a..0000000 --- a/templates/tr/wineconf/rsvp.template +++ /dev/null @@ -1,14 +0,0 @@ - - -<table width="100%"> -<tr> - <td><img src="{$root}/images/wineconf/wineconf_logo.jpg" width="295" height="108" alt="-LOGO-"></td> - <td align="right"><center><FONT size="+2"><b>1 - 2 Ekim 2011<br>Minneapolis, MN</b></font></center></td> -</tr> -</table> - -<hr /> - - - -<p> </p> diff --git a/templates/tr/wineconf/rsvp_done.template b/templates/tr/wineconf/rsvp_done.template deleted file mode 100644 index 9baac40..0000000 --- a/templates/tr/wineconf/rsvp_done.template +++ /dev/null @@ -1,5 +0,0 @@ -<h3>Teşekkürler!</h3> - -<p>Adınız ve e-postanız WineConf'a katılıyor olarak listelendi.</p> - -<p> </p> diff --git a/templates/tr/wineconf/rsvp_form.template b/templates/tr/wineconf/rsvp_form.template deleted file mode 100644 index dea6d1b..0000000 --- a/templates/tr/wineconf/rsvp_form.template +++ /dev/null @@ -1,30 +0,0 @@ -{$error} - -<p>Bu form, WineConf'a katılmayı planladığınızı bilmemiz içindir</p> - -<form name="rsvp" action="{$self}" method="post"> - -<table> - -<tr> - <th>İsim:</th> - <td><input type="text" name="q[name]" size="40" value="{$name}" /></td> -</tr> - -<tr> - <th>E-posta:</th> - <td><input type="text" name="q[email]" size="40" value="{$email}" /></td> -</tr> - -<tr> - <th>Yorumlar:</th> - <td><textarea name="q[comment]" rows="5" cols="40">{$comment}</textarea></td> -</tr> - -</table> - -<p><input type="submit" name="submit" value=" RSVP Gönder " class="button" /></p> - -<input type="hidden" name="fields" value="name|email|comment" /> - -</form> diff --git a/templates/tr/wineconf/survey.template b/templates/tr/wineconf/survey.template deleted file mode 100644 index 7ded9ea..0000000 --- a/templates/tr/wineconf/survey.template +++ /dev/null @@ -1,14 +0,0 @@ - - -<table width="100%"> -<tr> - <td><img src="{$root}/images/wineconf/wineconf_logo.jpg" width="295" height="108" alt="-LOGO-"></td> - <td align="right"></td> -</tr> -</table> - -<hr /> - - - -<p> </p> diff --git a/templates/tr/wineconf/survey_done.template b/templates/tr/wineconf/survey_done.template deleted file mode 100644 index 35fd894..0000000 --- a/templates/tr/wineconf/survey_done.template +++ /dev/null @@ -1,5 +0,0 @@ -<h3>Teşekkürler!</h3> - -<p>Bu sonraki WineConf için karar vermemizde yardımcı olacaktır.</p> - -<p> </p>

1 0

Dmitry Timoshkov : windowscodecs: Properly handle empty GIF extension blocks.
by Alexandre Julliard 15 Jul '15

15 Jul '15

Module: wine Branch: master Commit: 7eaff17786717f9816a40ee5417a57dd3264b331 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7eaff17786717f9816a40ee54… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jul 15 16:34:34 2015 +0800 windowscodecs: Properly handle empty GIF extension blocks. --- dlls/windowscodecs/ungif.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/windowscodecs/ungif.c b/dlls/windowscodecs/ungif.c index b413ff0..c6711c8 100644 --- a/dlls/windowscodecs/ungif.c +++ b/dlls/windowscodecs/ungif.c @@ -932,9 +932,17 @@ DGifSlurp(GifFileType * GifFile) { Extensions->Function = Function; - /* Create an extension block with our data */ - if (AddExtensionBlock(Extensions, ExtData[0], &ExtData[1]) == GIF_ERROR) - return (GIF_ERROR); + if (ExtData) + { + /* Create an extension block with our data */ + if (AddExtensionBlock(Extensions, ExtData[0], &ExtData[1]) == GIF_ERROR) + return (GIF_ERROR); + } + else /* Empty extension block */ + { + if (AddExtensionBlock(Extensions, 0, NULL) == GIF_ERROR) + return (GIF_ERROR); + } while (ExtData != NULL) { int Len;

1 0

Henri Verbeet : d2d1: Properly trace "vertex_count" in d2d_path_geometry_triangulate().
by Alexandre Julliard 15 Jul '15

15 Jul '15

Module: wine Branch: master Commit: bebee86da69b5981f0fb31035ded502b661866d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bebee86da69b5981f0fb31035… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 15 11:20:06 2015 +0200 d2d1: Properly trace "vertex_count" in d2d_path_geometry_triangulate(). --- dlls/d2d1/geometry.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 6def218..a94277b 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -846,7 +846,7 @@ static HRESULT d2d_path_geometry_triangulate(struct d2d_geometry *geometry) if (vertex_count < 3) { - WARN("Geometry has %u vertices.\n", vertex_count); + WARN("Geometry has %lu vertices.\n", (long)vertex_count); return S_OK; }

1 0

Huw Davies : msi: Fix a registry key leak.
by Alexandre Julliard 15 Jul '15

15 Jul '15

Module: wine Branch: master Commit: 4a992fec01ab142063da2fc2f66b2a58c8845c36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a992fec01ab142063da2fc2f… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jul 15 12:32:18 2015 +0100 msi: Fix a registry key leak. --- dlls/msi/action.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 88bb1bb..22e97a7 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2973,13 +2973,17 @@ static void delete_key( const MSICOMPONENT *comp, HKEY root, const WCHAR *path ) access |= get_registry_view( comp ); if (!(subkey = strdupW( path ))) return; - for (;;) + do { - if ((p = strrchrW( subkey, '\\' ))) *p = 0; - hkey = open_key( comp, root, subkey, FALSE ); - if (!hkey) break; - if (p && p[1]) + if ((p = strrchrW( subkey, '\\' ))) + { + *p = 0; + if (!p[1]) continue; /* trailing backslash */ + hkey = open_key( comp, root, subkey, FALSE ); + if (!hkey) break; res = RegDeleteKeyExW( hkey, p + 1, access, 0 ); + RegCloseKey( hkey ); + } else res = RegDeleteKeyExW( root, subkey, access, 0 ); if (res) @@ -2987,9 +2991,7 @@ static void delete_key( const MSICOMPONENT *comp, HKEY root, const WCHAR *path ) TRACE("failed to delete key %s (%d)\n", debugstr_w(subkey), res); break; } - if (p && p[1]) RegCloseKey( hkey ); - else break; - } + } while (p); msi_free( subkey ); }

1 0

Huw Davies : msi: Be more selective about which access modes are used to open or create keys.
by Alexandre Julliard 15 Jul '15

15 Jul '15

Module: wine Branch: master Commit: e1a65bed682aec5ca4e40d2ac0fc306949b09494 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1a65bed682aec5ca4e40d2ac… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jul 15 12:32:19 2015 +0100 msi: Be more selective about which access modes are used to open or create keys. An installer was failing when trying to create subkeys after denying delete access to their parent key. --- dlls/msi/action.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 22e97a7..3ad387a 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2633,9 +2633,8 @@ static inline REGSAM get_registry_view( const MSICOMPONENT *comp ) return view; } -static HKEY open_key( const MSICOMPONENT *comp, HKEY root, const WCHAR *path, BOOL create ) +static HKEY open_key( const MSICOMPONENT *comp, HKEY root, const WCHAR *path, BOOL create, REGSAM access ) { - REGSAM access = KEY_ALL_ACCESS; WCHAR *subkey, *p, *q; HKEY hkey, ret = NULL; LONG res; @@ -2657,7 +2656,7 @@ static HKEY open_key( const MSICOMPONENT *comp, HKEY root, const WCHAR *path, BO } if (q && q[1]) { - ret = open_key( comp, hkey, q + 1, create ); + ret = open_key( comp, hkey, q + 1, create, access ); RegCloseKey( hkey ); } else ret = hkey; @@ -2882,7 +2881,7 @@ static UINT ITERATE_WriteRegistryValues(MSIRECORD *row, LPVOID param) strcpyW(uikey,szRoot); strcatW(uikey,deformated); - if (!(hkey = open_key( comp, root_key, deformated, TRUE ))) + if (!(hkey = open_key( comp, root_key, deformated, TRUE, KEY_QUERY_VALUE | KEY_SET_VALUE ))) { ERR("Could not create key %s\n", debugstr_w(deformated)); msi_free(uikey); @@ -2979,7 +2978,7 @@ static void delete_key( const MSICOMPONENT *comp, HKEY root, const WCHAR *path ) { *p = 0; if (!p[1]) continue; /* trailing backslash */ - hkey = open_key( comp, root, subkey, FALSE ); + hkey = open_key( comp, root, subkey, FALSE, access ); if (!hkey) break; res = RegDeleteKeyExW( hkey, p + 1, access, 0 ); RegCloseKey( hkey ); @@ -3001,7 +3000,7 @@ static void delete_value( const MSICOMPONENT *comp, HKEY root, const WCHAR *path HKEY hkey; DWORD num_subkeys, num_values; - if ((hkey = open_key( comp, root, path, FALSE ))) + if ((hkey = open_key( comp, root, path, FALSE, KEY_SET_VALUE | KEY_QUERY_VALUE ))) { if ((res = RegDeleteValueW( hkey, value ))) TRACE("failed to delete value %s (%d)\n", debugstr_w(value), res); @@ -3022,7 +3021,7 @@ static void delete_tree( const MSICOMPONENT *comp, HKEY root, const WCHAR *path LONG res; HKEY hkey; - if (!(hkey = open_key( comp, root, path, FALSE ))) return; + if (!(hkey = open_key( comp, root, path, FALSE, KEY_ALL_ACCESS ))) return; res = RegDeleteTreeW( hkey, NULL ); if (res) TRACE("failed to delete subtree of %s (%d)\n", debugstr_w(path), res); delete_key( comp, root, path );

1 0

Nikolay Sivov : dwrite: Partially implement GetGdiCompatibleGlyphAdvances( ).
by Alexandre Julliard 15 Jul '15

15 Jul '15

Module: wine Branch: master Commit: e94d977006985536135fa0c4ce63a756e536e16f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e94d977006985536135fa0c4c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 15 14:40:32 2015 +0300 dwrite: Partially implement GetGdiCompatibleGlyphAdvances(). --- dlls/dwrite/dwrite_private.h | 7 +++++++ dlls/dwrite/font.c | 32 ++++++++++++++++++++++++++------ 2 files changed, 33 insertions(+), 6 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index a102e14..0111e46 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -92,6 +92,13 @@ static inline const char *debugstr_range(const DWRITE_TEXT_RANGE *range) return wine_dbg_sprintf("%u:%u", range->startPosition, range->length); } +static inline const char *debugstr_matrix(const DWRITE_MATRIX *m) +{ + if (!m) return "(null)"; + return wine_dbg_sprintf("{%.2f,%.2f,%.2f,%.2f,%.2f,%.2f}", m->m11, m->m12, m->m21, m->m22, + m->dx, m->dy); +} + static inline unsigned short get_table_entry(const unsigned short *table, WCHAR ch) { return table[table[table[ch >> 8] + ((ch >> 4) & 0x0f)] + (ch & 0xf)]; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 41b0250..9b7a50f 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -619,7 +619,7 @@ static void WINAPI dwritefontface1_GetMetrics(IDWriteFontFace2 *iface, DWRITE_FO static inline int round_metric(FLOAT metric) { - return (int)floor(metric + 0.5); + return (int)floorf(metric + 0.5f); } static HRESULT WINAPI dwritefontface1_GetGdiCompatibleMetrics(IDWriteFontFace2 *iface, FLOAT em_size, FLOAT pixels_per_dip, @@ -729,13 +729,33 @@ static HRESULT WINAPI dwritefontface1_GetDesignGlyphAdvances(IDWriteFontFace2 *i } static HRESULT WINAPI dwritefontface1_GetGdiCompatibleGlyphAdvances(IDWriteFontFace2 *iface, - FLOAT em_size, FLOAT pixels_per_dip, const DWRITE_MATRIX *transform, BOOL use_gdi_natural, - BOOL is_sideways, UINT32 glyph_count, UINT16 const *indices, INT32 *advances) + FLOAT em_size, FLOAT ppdip, const DWRITE_MATRIX *m, BOOL use_gdi_natural, + BOOL is_sideways, UINT32 glyph_count, UINT16 const *glyphs, INT32 *advances) { struct dwrite_fontface *This = impl_from_IDWriteFontFace2(iface); - FIXME("(%p)->(%f %f %p %d %d %u %p %p): stub\n", This, em_size, pixels_per_dip, transform, - use_gdi_natural, is_sideways, glyph_count, indices, advances); - return E_NOTIMPL; + HRESULT hr; + UINT32 i; + + TRACE("(%p)->(%.2f %.2f %p %d %d %u %p %p)\n", This, em_size, ppdip, m, + use_gdi_natural, is_sideways, glyph_count, glyphs, advances); + + if (m && memcmp(m, &identity, sizeof(*m))) + FIXME("transform is not supported, %s\n", debugstr_matrix(m)); + + for (i = 0; i < glyph_count; i++) { + FLOAT scale; + + hr = IDWriteFontFace2_GetDesignGlyphAdvances(iface, 1, glyphs + i, advances + i, is_sideways); + if (FAILED(hr)) + return hr; + + scale = em_size * ppdip / This->metrics.designUnitsPerEm; +#define SCALE_METRIC(x) x = round_metric(round_metric((x) * scale) / scale) + SCALE_METRIC(advances[i]); +#undef SCALE_METRIC + } + + return S_OK; } static HRESULT WINAPI dwritefontface1_GetKerningPairAdjustments(IDWriteFontFace2 *iface, UINT32 count,

1 0

Hans Leidekker : msi: Check the return value of MSI_QueryGetRecord ( Coverity).
by Alexandre Julliard 15 Jul '15

15 Jul '15

Module: wine Branch: master Commit: 17405f6b91d310ec2dbb53f23eb6acc861817003 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17405f6b91d310ec2dbb53f23… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 15 15:13:11 2015 +0200 msi: Check the return value of MSI_QueryGetRecord (Coverity). --- dlls/msi/action.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 3ad387a..c90114c 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -3554,7 +3554,9 @@ static UINT ACTION_ProcessComponents(MSIPACKAGE *package) if (!comp->KeyPath || !(file = msi_get_loaded_file(package, comp->KeyPath))) continue; - row = MSI_QueryGetRecord(package->db, query, file->Sequence); + if (!(row = MSI_QueryGetRecord(package->db, query, file->Sequence))) + return ERROR_FUNCTION_FAILED; + sprintfW(source, fmt, MSI_RecordGetInteger(row, 1)); ptr2 = strrchrW(source, '\\') + 1; msiobj_release(&row->hdr);

1 0

Hans Leidekker : msi: Fix a couple of memory leaks (Coverity).
by Alexandre Julliard 15 Jul '15

15 Jul '15

Module: wine Branch: master Commit: f9dc20cfcc5077f06a572ffc97b47eff07774014 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9dc20cfcc5077f06a572ffc9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 15 15:13:35 2015 +0200 msi: Fix a couple of memory leaks (Coverity). --- dlls/msi/table.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 700a61a..9c31992 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -809,7 +809,7 @@ UINT msi_create_table( MSIDATABASE *db, LPCWSTR name, column_info *col_info, /* add each column to the _Columns table */ r = TABLE_CreateView( db, szColumns, &tv ); if( r ) - return r; + goto err; r = tv->ops->execute( tv, 0 ); TRACE("tv execute returned %x\n", r); @@ -2325,8 +2325,7 @@ err: } static MSIRECORD *msi_get_transform_record( const MSITABLEVIEW *tv, const string_table *st, - IStorage *stg, - const BYTE *rawdata, UINT bytes_per_strref ) + IStorage *stg, const BYTE *rawdata, UINT bytes_per_strref ) { UINT i, val, ofs = 0; USHORT mask; @@ -2359,12 +2358,14 @@ static MSIRECORD *msi_get_transform_record( const MSITABLEVIEW *tv, const string r = msi_record_encoded_stream_name( tv, rec, &encname ); if ( r != ERROR_SUCCESS ) + { + msiobj_release( &rec->hdr ); return NULL; - - r = IStorage_OpenStream( stg, encname, NULL, - STGM_READ | STGM_SHARE_EXCLUSIVE, 0, &stm ); + } + r = IStorage_OpenStream( stg, encname, NULL, STGM_READ | STGM_SHARE_EXCLUSIVE, 0, &stm ); if ( r != ERROR_SUCCESS ) { + msiobj_release( &rec->hdr ); msi_free( encname ); return NULL; }

1 0

Hans Leidekker : msi: Add a stub implementation of MsiJoinTransaction.
by Alexandre Julliard 15 Jul '15

15 Jul '15

Module: wine Branch: master Commit: 0bd46f15010a7b2b580d46c3cc091f34515388e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bd46f15010a7b2b580d46c3c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 15 15:15:05 2015 +0200 msi: Add a stub implementation of MsiJoinTransaction. --- dlls/msi/msi.c | 11 +++++++++++ dlls/msi/msi.spec | 2 +- include/msi.h | 1 + 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 2b531da..ecc3e94 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -4316,6 +4316,17 @@ UINT WINAPI MsiBeginTransactionW( LPCWSTR name, DWORD attrs, MSIHANDLE *id, HAND } /*********************************************************************** + * MsiJoinTransaction [MSI.@] + */ +UINT WINAPI MsiJoinTransaction( MSIHANDLE handle, DWORD attrs, HANDLE *event ) +{ + FIXME("%u %08x %p\n", handle, attrs, event); + + *event = (HANDLE)0xdeadbeef; + return ERROR_SUCCESS; +} + +/*********************************************************************** * MsiEndTransaction [MSI.@] */ UINT WINAPI MsiEndTransaction( DWORD state ) diff --git a/dlls/msi/msi.spec b/dlls/msi/msi.spec index 0ea9a27..d48f08b 100644 --- a/dlls/msi/msi.spec +++ b/dlls/msi/msi.spec @@ -280,7 +280,7 @@ 284 stdcall MsiBeginTransactionA(str long ptr ptr) 285 stdcall MsiBeginTransactionW(wstr long ptr ptr) 286 stdcall MsiEndTransaction(long) -287 stub MsiJoinTransaction +287 stdcall MsiJoinTransaction(long long ptr) 288 stub MsiSetOfflineContextW 289 stdcall MsiEnumComponentsExA(str long long ptr ptr ptr ptr) 290 stdcall MsiEnumComponentsExW(wstr long long ptr ptr ptr ptr) diff --git a/include/msi.h b/include/msi.h index 16189b0..6cbd26f 100644 --- a/include/msi.h +++ b/include/msi.h @@ -703,6 +703,7 @@ UINT WINAPI MsiBeginTransactionA(LPCSTR, DWORD, MSIHANDLE *, HANDLE *); UINT WINAPI MsiBeginTransactionW(LPCWSTR, DWORD, MSIHANDLE *, HANDLE *); #define MsiBeginTransaction WINELIB_NAME_AW(MsiBeginTransaction) +UINT WINAPI MsiJoinTransaction(MSIHANDLE, DWORD, HANDLE *); UINT WINAPI MsiEndTransaction(DWORD); /* Non Unicode */

1 0