September 2007 - Wine-Commits

Alexander Nicolaysen Sørnes : bug: Let objectManager delete bug links
by Chris Morgan Sept. 18, 2007

Sept. 18, 2007

Module: appdb Branch: master Commit: 74cf6afeb286517a69084fb84b78519c38fa2574 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=74cf6afeb286517a69084fb8… Author: Alexander Nicolaysen Sørnes <alexander(a)alex.alexstyrt> Date: Mon Sep 17 20:41:47 2007 +0200 bug: Let objectManager delete bug links --- appview.php | 12 ------------ include/bugs.php | 2 +- 2 files changed, 1 insertions(+), 13 deletions(-) diff --git a/appview.php b/appview.php index 601fc11..ebf028b 100644 --- a/appview.php +++ b/appview.php @@ -80,18 +80,6 @@ if (isset($aClean['sSub'])) if(isset($aClean['iVersionId'])) $oVersion = new Version($aClean['iVersionId']); - if(($aClean['sSub'] == 'delete' ) && ($aClean['iBuglinkId'])) - { - if(($_SESSION['current']->hasPriv("admin") || - $_SESSION['current']->isMaintainer($oVersion->iVersionId) || - $_SESSION['current']->isSuperMaintainer($oVersion->iAppId))) - { - $oBuglink = new Bug($aClean['iBuglinkId']); - $oBuglink->delete(); - util_redirect_and_exit($oVersion->objectMakeUrl()); - } - - } if(($aClean['sSub'] == 'unqueue' ) && ($aClean['iBuglinkId'])) { if(($_SESSION['current']->hasPriv("admin") || diff --git a/include/bugs.php b/include/bugs.php index 7b44519..a68129d 100644 --- a/include/bugs.php +++ b/include/bugs.php @@ -563,7 +563,7 @@ function view_version_bugs($iVersionId = null, $aBuglinkIds) if($bCanEdit == true) { - echo "<td align=center>[<a href='".$oVersion->objectMakeUrl()."&sSub=delete&iBuglinkId=".$oBuglink->iLinkId."'>delete</a>]</td>\n"; + echo "<td align=center>[<a href='objectManager.php?sClass=bug&iId=".$oBuglink->iLinkId."&sAction=delete&sSubmit=Delete&sReturnTo=".$oVersion->objectMakeUrl()."'>delete</a>]</td>\n"; if ($oBuglink->bQueued) { echo "<td align=center>[<a href='".$oVersion->objectMakeUrl()."&sSub=unqueue&iBuglinkId=".$oBuglink->iLinkId."'>OK</a>]</td>\n";

1 0

Alexander Nicolaysen Sørnes : Return user to the version view after submitting test data
by Chris Morgan Sept. 18, 2007

Sept. 18, 2007

Module: appdb Branch: master Commit: 0f21daba18e1b704883310256d515aa81c8586c0 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=0f21daba18e1b70488331025… Author: Alexander Nicolaysen Sørnes <alexander(a)ivan.alexstyrt> Date: Mon Sep 17 12:30:53 2007 +0200 Return user to the version view after submitting test data --- include/version.php | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/include/version.php b/include/version.php index fab4ff0..157c9c2 100644 --- a/include/version.php +++ b/include/version.php @@ -980,7 +980,8 @@ class version { { echo '<form method=post name=sMessage action=objectManager.php?'. 'sClass=testData_queue&sAction=add&iVersionId='.$this->iVersionId. - '&sTitle=Add+Test+Data>'."\n"; + '&sTitle=Add+Test+Data&sReturnTo='. + $this->objectMakeUrl().'>'."\n"; echo "\t".'<input type=submit value="Add Test Data" class="button" />'."\n"; echo '</form>'."\n"; } else

1 0

Mikolaj Zalewski : gdi32: If freetype fails try to load manually fonts wrapped as PE resources.
by Alexandre Julliard Sept. 17, 2007

Sept. 17, 2007

Module: wine Branch: master Commit: 0eb910352cc1413d48e8594a92547fc2a21ae168 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0eb910352cc1413d48e8594a9… Author: Mikolaj Zalewski <mikolajz(a)google.com> Date: Fri Sep 7 10:11:09 2007 -0700 gdi32: If freetype fails try to load manually fonts wrapped as PE resources. --- dlls/gdi32/font.c | 38 +++++++++++++++++++++++++++++++++++++- 1 files changed, 37 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 01182fa..0cc7339 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -3185,12 +3185,48 @@ INT WINAPI AddFontResourceExA( LPCSTR str, DWORD fl, PVOID pdv ) return ret; } +static BOOL CALLBACK load_enumed_resource(HMODULE hModule, LPCWSTR type, LPWSTR name, LONG_PTR lParam) +{ + HRSRC rsrc = FindResourceW(hModule, name, type); + HGLOBAL hMem = LoadResource(hModule, rsrc); + LPVOID *pMem = LockResource(hMem); + int *num_total = (int *)lParam; + DWORD num_in_res; + + TRACE("Found resource %s - trying to load\n", wine_dbgstr_w(type)); + if (!AddFontMemResourceEx(pMem, SizeofResource(hModule, rsrc), NULL, &num_in_res)) + { + ERR("Failed to load PE font resource mod=%p ptr=%p\n", hModule, hMem); + return FALSE; + } + + *num_total += num_in_res; + return TRUE; +} + /*********************************************************************** * AddFontResourceExW (GDI32.@) */ INT WINAPI AddFontResourceExW( LPCWSTR str, DWORD fl, PVOID pdv ) { - return WineEngAddFontResourceEx(str, fl, pdv); + int ret = WineEngAddFontResourceEx(str, fl, pdv); + if (ret == 0) + { + /* Freetype <2.3.5 have problems reading resources wrapped in PE files. */ + HMODULE hModule = LoadLibraryExW(str, NULL, LOAD_LIBRARY_AS_DATAFILE); + if (hModule != NULL) + { + int num_resources = 0; + LPWSTR rt_font = (LPWSTR)((ULONG_PTR)8); /* we don't want to include winuser.h */ + + TRACE("WineEndAddFontResourceEx failed on PE file %s - trying to load resources manualy\n", + wine_dbgstr_w(str)); + if (EnumResourceNamesW(hModule, rt_font, load_enumed_resource, (LONG_PTR)&num_resources)) + ret = num_resources; + FreeLibrary(hModule); + } + } + return ret; } /***********************************************************************

1 0

Mikolaj Zalewski : gdi32: Implement AddFontMemResourceEx ( based on a patch of Byeong-Sik Jeon).
by Alexandre Julliard Sept. 17, 2007

Sept. 17, 2007

Module: wine Branch: master Commit: baee27c69c15f77e3d9cb7e21b38e38da1a2fa00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=baee27c69c15f77e3d9cb7e21… Author: Mikolaj Zalewski <mikolajz(a)google.com> Date: Thu Sep 13 10:42:55 2007 -0700 gdi32: Implement AddFontMemResourceEx (based on a patch of Byeong-Sik Jeon). --- dlls/gdi32/font.c | 3 +- dlls/gdi32/freetype.c | 137 ++++++++++++++++++++++++++++++++++++--------- dlls/gdi32/gdi_private.h | 1 + include/wingdi.h | 1 + 4 files changed, 112 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=baee27c69c15f77e3d9cb…

1 0

Mikolaj Zalewski : gdi32: Return the correct font type, ntmFlags and PitchAndFamily for Type1 fonts.
by Alexandre Julliard Sept. 17, 2007

Sept. 17, 2007

Module: wine Branch: master Commit: c6efacd86a31dca83ea7b0531b3cb858b3daa38e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6efacd86a31dca83ea7b0531… Author: Mikolaj Zalewski <mikolajz(a)google.com> Date: Fri Sep 7 14:30:40 2007 -0700 gdi32: Return the correct font type, ntmFlags and PitchAndFamily for Type1 fonts. --- dlls/gdi32/freetype.c | 32 ++++++++++++++++++++++++++++++-- 1 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 769e2c2..c556c3d 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -243,6 +243,7 @@ typedef struct tagFace { BOOL Bold; FONTSIGNATURE fs; FONTSIGNATURE fs_links; + DWORD ntmFlags; /* Only some bits stored here. Others are computed on the fly */ FT_Fixed font_version; BOOL scalable; Bitmap_Size size; /* set if face is a bitmap */ @@ -307,6 +308,7 @@ struct tagGdiFont { SHORT yMax; SHORT yMin; OUTLINETEXTMETRICW *potm; + DWORD ntmFlags; DWORD total_kern_pairs; KERNINGPAIR *kern_pairs; FONTSIGNATURE fs; @@ -1042,6 +1044,7 @@ static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_ bitmap_num = 0; do { My_FT_Bitmap_Size *size = NULL; + FT_ULong tmp_size; if(!FT_IS_SCALABLE(ft_face)) size = (My_FT_Bitmap_Size *)ft_face->available_sizes + bitmap_num; @@ -1190,6 +1193,16 @@ static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_ face->scalable = FALSE; } + /* check for the presence of the 'CFF ' table to check if the font is Type1 */ + tmp_size = 0; + if (pFT_Load_Sfnt_Table && !pFT_Load_Sfnt_Table(ft_face, 0x43464620, 0, NULL, &tmp_size)) + { + TRACE("Font %s/%p is OTF Type1\n", wine_dbgstr_a(file), font_data_ptr); + face->ntmFlags = NTM_PS_OPENTYPE; + } + else + face->ntmFlags = 0; + TRACE("fsCsb = %08x %08x/%08x %08x %08x %08x\n", face->fs.fsCsb[0], face->fs.fsCsb[1], face->fs.fsUsb[0], face->fs.fsUsb[1], @@ -2982,6 +2995,8 @@ found: return 0; } + ret->ntmFlags = face->ntmFlags; + if (ret->charset == SYMBOL_CHARSET && !pFT_Select_Charmap(ret->ft_face, FT_ENCODING_MS_SYMBOL)) { /* No ops */ @@ -3116,6 +3131,7 @@ static void GetEnumStructs(Face *face, LPENUMLOGFONTEXW pelf, } font->name = strdupW(face->family->FamilyName); + font->ntmFlags = face->ntmFlags; memset(&pelf->elfLogFont, 0, sizeof(LOGFONTW)); @@ -3154,13 +3170,18 @@ static void GetEnumStructs(Face *face, LPENUMLOGFONTEXW pelf, pelf->elfLogFont.lfClipPrecision = CLIP_STROKE_PRECIS; pelf->elfLogFont.lfQuality = DRAFT_QUALITY; - *ptype = ptm->tmPitchAndFamily & TMPF_TRUETYPE ? TRUETYPE_FONTTYPE : 0; + *ptype = 0; + if (ptm->tmPitchAndFamily & TMPF_TRUETYPE) + *ptype |= TRUETYPE_FONTTYPE; + if (ptm->tmPitchAndFamily & TMPF_DEVICE) + *ptype |= DEVICE_FONTTYPE; if(!(ptm->tmPitchAndFamily & TMPF_VECTOR)) *ptype |= RASTER_FONTTYPE; pntm->ntmTm.ntmFlags = ptm->tmItalic ? NTM_ITALIC : 0; if(ptm->tmWeight > 550) pntm->ntmTm.ntmFlags |= NTM_BOLD; if(pntm->ntmTm.ntmFlags == 0) pntm->ntmTm.ntmFlags = NTM_REGULAR; + pntm->ntmTm.ntmFlags |= face->ntmFlags; pntm->ntmTm.ntmCellHeight = pntm->ntmTm.tmHeight; pntm->ntmTm.ntmAvgWidth = pntm->ntmTm.tmAveCharWidth; @@ -4127,8 +4148,14 @@ UINT WineEngGetOutlineTextMetrics(GdiFont *font, UINT cbSize, if(FT_IS_SCALABLE(ft_face)) TM.tmPitchAndFamily |= TMPF_VECTOR; + if(FT_IS_SFNT(ft_face)) - TM.tmPitchAndFamily |= TMPF_TRUETYPE; + { + if (font->ntmFlags & NTM_PS_OPENTYPE) + TM.tmPitchAndFamily |= TMPF_DEVICE; + else + TM.tmPitchAndFamily |= TMPF_TRUETYPE; + } TM.tmCharSet = font->charset; #undef TM @@ -4216,6 +4243,7 @@ static BOOL load_child_font(GdiFont *font, CHILD_FONT *child) return FALSE; } + child->font->ntmFlags = child->face->ntmFlags; child->font->orientation = font->orientation; hfontlist = HeapAlloc(GetProcessHeap(), 0, sizeof(*hfontlist)); hfontlist->hfont = CreateFontIndirectW(&font->font_desc.lf);

1 0

Mikolaj Zalewski : gdi32: Store child font links as pointers to struct Face instead of filename/ index.
by Alexandre Julliard Sept. 17, 2007

Sept. 17, 2007

Module: wine Branch: master Commit: 66cf4f7d53ec67628611a3313fbca81d0e3102e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66cf4f7d53ec67628611a3313… Author: Mikolaj Zalewski <mikolajz(a)google.com> Date: Thu Sep 6 11:40:00 2007 -0700 gdi32: Store child font links as pointers to struct Face instead of filename/index. --- dlls/gdi32/freetype.c | 58 ++++++++++++------------------------------------ 1 files changed, 15 insertions(+), 43 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index b978d35..b7182e0 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -281,8 +281,7 @@ typedef struct tagHFONTLIST { typedef struct { struct list entry; - char *file_name; - INT index; + Face *face; GdiFont *font; } CHILD_FONT; @@ -738,24 +737,6 @@ static Family *find_family_from_name(const WCHAR *name) return NULL; } -static Face *find_face_from_path_index(const CHAR *file_name, const INT index) -{ - Family *family; - Face *face; - - TRACE("looking for file %s index %i\n", debugstr_a(file_name), index); - - LIST_FOR_EACH_ENTRY(family, &font_list, Family, entry) - { - LIST_FOR_EACH_ENTRY(face, &family->faces, Face, entry) - { - if(!strcasecmp(face->file, file_name) && face->face_index == index) - return face; - } - } - return NULL; -} - static void DumpSubstList(void) { FontSubst *psub; @@ -1372,12 +1353,11 @@ static BOOL init_system_links(void) } child_font = HeapAlloc(GetProcessHeap(), 0, sizeof(*child_font)); - child_font->file_name = strdupA(face->file); - child_font->index = face->face_index; + child_font->face = face; child_font->font = NULL; fs.fsCsb[0] |= face->fs.fsCsb[0]; fs.fsCsb[1] |= face->fs.fsCsb[1]; - TRACE("Adding file %s index %d\n", child_font->file_name, child_font->index); + TRACE("Adding file %s index %ld\n", child_font->face->file, child_font->face->face_index); list_add_tail(&font_link->links, &child_font->entry); } family = find_family_from_name(font_link->font_name); @@ -1409,10 +1389,9 @@ static BOOL init_system_links(void) if(face) { child_font = HeapAlloc(GetProcessHeap(), 0, sizeof(*child_font)); - child_font->file_name = strdupA(face->file); - child_font->index = face->face_index; + child_font->face = face; child_font->font = NULL; - TRACE("Found Tahoma in %s index %d\n", child_font->file_name, child_font->index); + TRACE("Found Tahoma in %s index %ld\n", child_font->face->file, child_font->face->face_index); list_add_tail(&system_font_link->links, &child_font->entry); } LIST_FOR_EACH_ENTRY(font_link, &system_links, SYSTEM_LINKS, entry) @@ -1424,8 +1403,7 @@ static BOOL init_system_links(void) { CHILD_FONT *new_child; new_child = HeapAlloc(GetProcessHeap(), 0, sizeof(*new_child)); - new_child->file_name = strdupA(font_link_entry->file_name); - new_child->index = font_link_entry->index; + new_child->face = font_link_entry->face; new_child->font = NULL; list_add_tail(&system_font_link->links, &new_child->entry); } @@ -2361,7 +2339,6 @@ static void free_font(GdiFont *font) HeapFree(GetProcessHeap(), 0, hfontlist); free_font(child->font); } - HeapFree(GetProcessHeap(), 0, child->file_name); HeapFree(GetProcessHeap(), 0, child); } @@ -2633,11 +2610,10 @@ static BOOL create_child_font_list(GdiFont *font) LIST_FOR_EACH_ENTRY(font_link_entry, &font_link->links, CHILD_FONT, entry) { new_child = HeapAlloc(GetProcessHeap(), 0, sizeof(*new_child)); - new_child->file_name = strdupA(font_link_entry->file_name); - new_child->index = font_link_entry->index; + new_child->face = font_link_entry->face; new_child->font = NULL; list_add_tail(&font->child_fonts, &new_child->entry); - TRACE("font %s %d\n", debugstr_a(new_child->file_name), new_child->index); + TRACE("font %s %ld\n", debugstr_a(new_child->face->file), new_child->face->face_index); } ret = TRUE; break; @@ -2773,17 +2749,13 @@ GdiFont *WineEngCreateFontInstance(DC *dc, HFONT hfont) TRACE("found entry in system list\n"); LIST_FOR_EACH_ENTRY(font_link_entry, &font_link->links, CHILD_FONT, entry) { - face = find_face_from_path_index(font_link_entry->file_name, - font_link_entry->index); - if (face) + face = font_link_entry->face; + family = face->family; + if(csi.fs.fsCsb[0] & + (face->fs.fsCsb[0] | face->fs_links.fsCsb[0]) || !csi.fs.fsCsb[0]) { - family = face->family; - if(csi.fs.fsCsb[0] & - (face->fs.fsCsb[0] | face->fs_links.fsCsb[0]) || !csi.fs.fsCsb[0]) - { - if(face->scalable || can_use_bitmap) - goto found; - } + if(face->scalable || can_use_bitmap) + goto found; } } } @@ -4161,7 +4133,7 @@ static BOOL load_child_font(GdiFont *font, CHILD_FONT *child) { HFONTLIST *hfontlist; child->font = alloc_font(); - child->font->ft_face = OpenFontFile(child->font, child->file_name, child->index, 0, -font->ppem); + child->font->ft_face = OpenFontFile(child->font, child->face->file, child->face->face_index, 0, -font->ppem); if(!child->font->ft_face) { free_font(child->font);

1 0

Alexandre Julliard : user32/tests: Properly flush events in the update rect tests.
by Alexandre Julliard Sept. 17, 2007

Sept. 17, 2007

Module: wine Branch: master Commit: 9c27ed21a238abdaa57918030983f7d03ff927a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c27ed21a238abdaa57918030… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 17 14:13:37 2007 +0200 user32/tests: Properly flush events in the update rect tests. --- dlls/user32/tests/win.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 8da30bf..b318677 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -4229,6 +4229,7 @@ static void test_GetUpdateRect(void) ShowWindow(hgrandparent, SW_SHOW); UpdateWindow(hgrandparent); + flush_events(); ShowWindow(hchild, SW_HIDE); SetRect(&rc2, 0, 0, 0, 0); @@ -4288,6 +4289,7 @@ static void test_GetUpdateRect(void) ShowWindow(hgrandparent, SW_SHOW); UpdateWindow(hgrandparent); + flush_events(); ret = GetUpdateRect(hgrandparent, &rc1, FALSE); ok(!ret, "GetUpdateRect returned not empty region\n");

1 0

Andrew Talbot : crypt32: Fix some memory leaks.
by Alexandre Julliard Sept. 17, 2007

Sept. 17, 2007

Module: wine Branch: master Commit: f19086e9d3e51f24fc65a88d4b1a75094dd4da9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f19086e9d3e51f24fc65a88d4… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Sep 14 17:02:33 2007 +0100 crypt32: Fix some memory leaks. --- dlls/crypt32/msg.c | 1 + dlls/crypt32/rootstore.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 4e608bc..40d8390 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -2079,6 +2079,7 @@ static BOOL CDecodeHashMsg_VerifyHash(CDecodeMsg *msg) if (ret) ret = !memcmp(hashBlob.pbData, computedHash, hashBlob.cbData); + CryptMemFree(computedHash); } else ret = FALSE; diff --git a/dlls/crypt32/rootstore.c b/dlls/crypt32/rootstore.c index 945b9c8..0bd537d 100644 --- a/dlls/crypt32/rootstore.c +++ b/dlls/crypt32/rootstore.c @@ -137,6 +137,7 @@ static BOOL import_base64_certs_from_fp(FILE *fp, HCERTSTORE store) if (CertAddEncodedCertificateToStore(store, X509_ASN_ENCODING, buf, size, CERT_STORE_ADD_NEW, NULL)) num_certs++; + CryptMemFree(buf); } } }

1 0

Peter Oberndorfer : configure: Recognize i686-mingw32 prefix for crosscompiling.
by Alexandre Julliard Sept. 17, 2007

Sept. 17, 2007

Module: wine Branch: master Commit: cfd561f605dbcc16cd524a1714446994b5d910bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfd561f605dbcc16cd524a171… Author: Peter Oberndorfer <kumbayo84(a)arcor.de> Date: Sun Sep 16 20:11:12 2007 +0200 configure: Recognize i686-mingw32 prefix for crosscompiling. --- aclocal.m4 | 2 +- configure | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 1799ff0..a0b08d7 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -141,7 +141,7 @@ dnl AC_DEFUN([WINE_CHECK_MINGW_PROG], [AC_CHECK_PROGS([$1], m4_foreach([ac_wine_prefix], - [i586-mingw32msvc, i386-mingw32msvc, i386-mingw32, mingw32, mingw], + [i586-mingw32msvc, i386-mingw32msvc, i686-mingw32, i386-mingw32, mingw32, mingw], [ac_wine_prefix-$2 ]), [$3],[$4])]) diff --git a/configure b/configure index 54cd060..9b5d197 100755 --- a/configure +++ b/configure @@ -8876,7 +8876,7 @@ echo "${ECHO_T}$ac_cv_c_dll_hpux" >&6; } if test "$cross_compiling" = "no" then - for ac_prog in i586-mingw32msvc-gcc i386-mingw32msvc-gcc i386-mingw32-gcc mingw32-gcc mingw-gcc + for ac_prog in i586-mingw32msvc-gcc i386-mingw32msvc-gcc i686-mingw32-gcc i386-mingw32-gcc mingw32-gcc mingw-gcc do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -8919,7 +8919,7 @@ fi done test -n "$CROSSCC" || CROSSCC="false" - for ac_prog in i586-mingw32msvc-dlltool i386-mingw32msvc-dlltool i386-mingw32-dlltool mingw32-dlltool mingw-dlltool + for ac_prog in i586-mingw32msvc-dlltool i386-mingw32msvc-dlltool i686-mingw32-dlltool i386-mingw32-dlltool mingw32-dlltool mingw-dlltool do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -8962,7 +8962,7 @@ fi done test -n "$DLLTOOL" || DLLTOOL="false" - for ac_prog in i586-mingw32msvc-windres i386-mingw32msvc-windres i386-mingw32-windres mingw32-windres mingw-windres + for ac_prog in i586-mingw32msvc-windres i386-mingw32msvc-windres i686-mingw32-windres i386-mingw32-windres mingw32-windres mingw-windres do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -9005,7 +9005,7 @@ fi done test -n "$CROSSWINDRES" || CROSSWINDRES="false" - for ac_prog in i586-mingw32msvc-ar i386-mingw32msvc-ar i386-mingw32-ar mingw32-ar mingw-ar + for ac_prog in i586-mingw32msvc-ar i386-mingw32msvc-ar i686-mingw32-ar i386-mingw32-ar mingw32-ar mingw-ar do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2

1 0

Michael Stefaniuc : janitorial: Remove two fresh redundant NULL checks before HeapFree(). Found by Smatch.
by Alexandre Julliard Sept. 17, 2007

Sept. 17, 2007

Module: wine Branch: master Commit: a5fdea0e6aadc0b292d471c8fbca107c020d887f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5fdea0e6aadc0b292d471c8f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Sep 14 22:34:15 2007 +0200 janitorial: Remove two fresh redundant NULL checks before HeapFree(). Found by Smatch. --- dlls/shell32/shlfileop.c | 3 +-- dlls/wined3d/surface.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index 134d6c5..4f89c4c 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -1753,8 +1753,7 @@ HRESULT WINAPI SHPathPrepareForWriteW(HWND hwnd, IUnknown *modless, LPCWSTR path /* check if we can access the directory */ res = GetFileAttributesW(realpath); - if (temppath) - HeapFree(GetProcessHeap(), 0, temppath); + HeapFree(GetProcessHeap(), 0, temppath); if (res == INVALID_FILE_ATTRIBUTES) { diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index fc0ba4a..7bad3d7 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -796,7 +796,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LockRect(IWineD3DSurface *iface, WINED checkGLcall("glBindBufferARB"); /* We don't need the system memory anymore and we can't even use it for PBOs */ - if(This->resource.allocatedMemory) HeapFree(GetProcessHeap(), 0, This->resource.allocatedMemory); + HeapFree(GetProcessHeap(), 0, This->resource.allocatedMemory); This->resource.allocatedMemory = NULL; This->Flags |= SFLAG_PBO; LEAVE_GL();

1 0