wine-commits November 2012

wine-commits@winehq.org

2 participants
708 discussions

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: d55bb4497f380aba5e4bd691fd5e21ce18fe51a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d55bb4497f380aba5e4bd691f… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Nov 4 11:06:58 2012 +0100 Assorted spelling fixes. --- dlls/ntdll/nt.c | 2 +- dlls/urlmon/axinstall.c | 2 +- programs/cmd/tests/test_builtins.cmd | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index ab08190..d415db4 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1143,7 +1143,7 @@ void fill_cpu_info(void) } #else num = 1; - FIXME("Detecting the number of processors not suported.\n"); + FIXME("Detecting the number of processors is not supported.\n"); #endif NtCurrentTeb()->Peb->NumberOfProcessors = num; diff --git a/dlls/urlmon/axinstall.c b/dlls/urlmon/axinstall.c index dedfb15..9f53ce0 100644 --- a/dlls/urlmon/axinstall.c +++ b/dlls/urlmon/axinstall.c @@ -324,7 +324,7 @@ static HRESULT install_file(install_ctx_t *ctx, const WCHAR *cache_file) if(!strcmpW(ext, cab_extW)) { hres = install_cab_file(ctx); }else { - FIXME("Unsupported extention %s\n", debugstr_w(ext)); + FIXME("Unsupported extension %s\n", debugstr_w(ext)); hres = E_NOTIMPL; } SysFreeString(path); diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index bfd051b..7f90549 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -732,8 +732,8 @@ for %%i in (%INT_PARMS%) do call :EQUtest %%i 10 for %%i in (%INT_PARMS%) do call :EQUtest %%i 9 if 011 EQU 9 (echo octal ok) if 0xA1 EQU 161 (echo hexa ok) -if 0xA1 EQU "161" (echo hexa should be be recognized) else (echo string/hexa compare ok) -if "0xA1" EQU 161 (echo hexa should be be recognized) else (echo string/hexa compare ok) +if 0xA1 EQU "161" (echo hexa should be recognized) else (echo string/hexa compare ok) +if "0xA1" EQU 161 (echo hexa should be recognized) else (echo string/hexa compare ok) for %%i in (%INT_PARMS%) do call :NEQtest %%i 0 for %%i in (%INT_PARMS%) do call :NEQtest %%i 1 for %%i in (%INT_PARMS%) do call :NEQtest %%i 10

1 0

Francois Gouget : msvcp71: Remove an unused VTBL wrapper.
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: f397f482172326f0f0a265850ca1e9a885ce27fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=f397f482172326f0f0a265850… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Nov 4 11:06:47 2012 +0100 msvcp71: Remove an unused VTBL wrapper. --- dlls/msvcp71/msvcp71.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/msvcp71/msvcp71.c b/dlls/msvcp71/msvcp71.c index cb36893..bcc3685 100644 --- a/dlls/msvcp71/msvcp71.c +++ b/dlls/msvcp71/msvcp71.c @@ -49,7 +49,6 @@ DEFINE_VTBL_WRAPPER(36); DEFINE_VTBL_WRAPPER(40); DEFINE_VTBL_WRAPPER(44); DEFINE_VTBL_WRAPPER(48); -DEFINE_VTBL_WRAPPER(52); #endif

1 0

Francois Gouget : kernel32/tests: Make test_CompareStringOrdinal() static.
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: a4f2c0052639344ecbf93b1dfbb43745cc0e3b3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4f2c0052639344ecbf93b1df… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Nov 4 11:06:40 2012 +0100 kernel32/tests: Make test_CompareStringOrdinal() static. --- dlls/kernel32/tests/locale.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 197f562..ebd7278 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -3480,7 +3480,7 @@ static void test_IsValidLocaleName(void) ok(!ret, "IsValidLocaleName should have failed\n"); } -void test_CompareStringOrdinal(void) +static void test_CompareStringOrdinal(void) { INT ret; WCHAR test1[] = { 't','e','s','t',0 };

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: b7576d6f04c533100772c710585e2486209899cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7576d6f04c533100772c7105… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Sat Nov 3 19:50:23 2012 +0200 po: Update Finnish translation. --- po/fi.po | 22 +++++++--------------- 1 files changed, 7 insertions(+), 15 deletions(-) diff --git a/po/fi.po b/po/fi.po index 36cbd97..30a01f3 100644 --- a/po/fi.po +++ b/po/fi.po @@ -8253,44 +8253,36 @@ msgid "Security Warning" msgstr "Turvallisuusvaroitus" #: urlmon.rc:32 -#, fuzzy -#| msgid "Do you want to continue anyway?" msgid "Do you want to install this software?" -msgstr "Haluatko jatkaa joka tapauksessa?" +msgstr "Haluatko asentaa tämän ohjelmiston?" #: urlmon.rc:34 explorer.rc:29 msgid "Location:" msgstr "Sijainti:" #: urlmon.rc:36 -#, fuzzy -#| msgid "Install/Uninstall" msgid "Don't install" -msgstr "Asenna/Poista" +msgstr "Älä asenna" #: urlmon.rc:40 msgid "" "When installed, ActiveX has full access to your computer.Do not click " "install unless you have absolute trust in the above source." msgstr "" +"Asennuksen jälkeen ActiveX voi täysin hallita tietokonettasi. Asenna vain, " +"jos luotat yllä mainittuun lähteeseen täysin." #: urlmon.rc:47 -#, fuzzy -#| msgid "Installation transform failed to apply.\n" msgid "Installation of component failed: %08x" -msgstr "Muunnoksissa tapahtui virhe.\n" +msgstr "Komponentin asennus epäonnistui: %08x" #: urlmon.rc:48 -#, fuzzy -#| msgid "&Install" msgid "Install (%d)" -msgstr "&Asenna" +msgstr "Asenna (%d)" #: urlmon.rc:49 -#, fuzzy -#| msgid "&Install" msgid "Install" -msgstr "&Asenna" +msgstr "Asenna" #: user32.rc:27 user32.rc:40 taskmgr.rc:138 msgctxt "window"

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: 571d595b16fbeed6d96474e69ea7ca0a4229032d URL: http://source.winehq.org/git/wine.git/?a=commit;h=571d595b16fbeed6d96474e69… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Sat Nov 3 18:44:13 2012 +0200 po: Update Lithuanian translation. --- po/lt.po | 24 ++++++++---------------- 1 files changed, 8 insertions(+), 16 deletions(-) diff --git a/po/lt.po b/po/lt.po index d99b240..7462b4c 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-10-27 10:40+0300\n" +"PO-Revision-Date: 2012-11-03 18:42+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -8270,44 +8270,36 @@ msgid "Security Warning" msgstr "Įspėjimas apie saugumą" #: urlmon.rc:32 -#, fuzzy -#| msgid "Do you want to continue anyway?" msgid "Do you want to install this software?" -msgstr "Ar vis tiek norite tęsti?" +msgstr "Ar norite įdiegti šią programinę įrangą?" #: urlmon.rc:34 explorer.rc:29 msgid "Location:" msgstr "Vieta:" #: urlmon.rc:36 -#, fuzzy -#| msgid "Install/Uninstall" msgid "Don't install" -msgstr "Įdiegti/Pašalinti" +msgstr "Nediegti" #: urlmon.rc:40 msgid "" "When installed, ActiveX has full access to your computer.Do not click " "install unless you have absolute trust in the above source." msgstr "" +"Kai įdiegta, ActiveX turi visišką prieigą prie kompiuterio. Nespauskite " +"„Įdiegti“, nebent visiškai pasitikite šaltiniu aukščiau." #: urlmon.rc:47 -#, fuzzy -#| msgid "Installation transform failed to apply.\n" msgid "Installation of component failed: %08x" -msgstr "Nepavyko pritaikyti įdiegimo transformacijos.\n" +msgstr "Nepavyko įdiegti komponento: %08x" #: urlmon.rc:48 -#, fuzzy -#| msgid "&Install" msgid "Install (%d)" -msgstr "&Įdiegti" +msgstr "Įdiegti (%d)" #: urlmon.rc:49 -#, fuzzy -#| msgid "&Install" msgid "Install" -msgstr "&Įdiegti" +msgstr "Įdiegti" #: user32.rc:27 user32.rc:40 taskmgr.rc:138 msgctxt "window"

1 0

André Hentschel : dmloader: Fix sizeof statement ( coverity).
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: 295ffdfa964183afeba40fca75d926d3232b98df URL: http://source.winehq.org/git/wine.git/?a=commit;h=295ffdfa964183afeba40fca7… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Nov 3 17:26:13 2012 +0100 dmloader: Fix sizeof statement (coverity). --- dlls/dmloader/loader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c index f97fad4..cfb3de9 100644 --- a/dlls/dmloader/loader.c +++ b/dlls/dmloader/loader.c @@ -767,7 +767,7 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_ReleaseObjectByU TRACE("(%p, %p)\n", This, pObject); - if (IsBadReadPtr (pObject, sizeof(LPUNKNOWN))) { + if (IsBadReadPtr (pObject, sizeof(*pObject))) { ERR(": pObject bad write pointer\n"); return E_POINTER; }

1 0

André Hentschel : d3dx9_36: Return on error (coverity) .
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: e15618a89649db1ee0b91d6120cf77806d0fa59f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e15618a89649db1ee0b91d612… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Nov 3 17:26:26 2012 +0100 d3dx9_36: Return on error (coverity). --- dlls/d3dx9_36/mesh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 10c3a73..f1ad7c8 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -3582,7 +3582,7 @@ static HRESULT filedata_get_name(IDirectXFileData *filedata, char **name) hr = IDirectXFileObject_GetName(filedata, *name, &name_len); if (FAILED(hr)) HeapFree(GetProcessHeap(), 0, *name); - if (!name_len) + else if (!name_len) (*name)[0] = 0; return hr;

1 0

André Hentschel : urlmon: Fix copy and paste error ( coverity).
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: 93936c4f9986eb411168402288f072632a469c8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=93936c4f9986eb41116840228… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Nov 3 17:26:03 2012 +0100 urlmon: Fix copy and paste error (coverity). --- dlls/urlmon/uri.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 18e2ebb..0a68b43 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -272,7 +272,7 @@ static inline BOOL is_drive_path(const WCHAR *str) { } static inline BOOL is_unc_path(const WCHAR *str) { - return (str[0] == '\\' && str[0] == '\\'); + return (str[0] == '\\' && str[1] == '\\'); } static inline BOOL is_forbidden_dos_path_char(WCHAR val) {

1 0

André Hentschel : riched20: Remove duplicate operand in expression (coverity).
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: 34f74fdc7182006d69e5971b1f8ca0f7b78f571f URL: http://source.winehq.org/git/wine.git/?a=commit;h=34f74fdc7182006d69e5971b1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Nov 3 17:25:52 2012 +0100 riched20: Remove duplicate operand in expression (coverity). --- dlls/riched20/writer.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index a5e5d50..653eab6 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -251,11 +251,8 @@ ME_StreamOutRTFFontAndColorTbl(ME_OutStream *pStream, ME_DisplayItem *pFirstRun, } while (item); item = ME_GetParagraph(pFirstRun); do { - if (item->member.para.pCell && item->member.para.pCell) + if ((pCell = item->member.para.pCell)) { - pCell = item->member.para.pCell; - if (pCell) - { ME_Border* borders[4] = { &pCell->member.cell.border.top, &pCell->member.cell.border.left, &pCell->member.cell.border.bottom, @@ -275,7 +272,6 @@ ME_StreamOutRTFFontAndColorTbl(ME_OutStream *pStream, ME_DisplayItem *pFirstRun, } } } - } } if (item == pLastPara) break;

1 0

André Hentschel : winex11: Avoid memory leaks ( coverity).
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: 574cf27f2afd676fb90087be1c0bd6967c1ca160 URL: http://source.winehq.org/git/wine.git/?a=commit;h=574cf27f2afd676fb90087be1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Nov 3 17:25:45 2012 +0100 winex11: Avoid memory leaks (coverity). --- dlls/winex11.drv/clipboard.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index bd3ef7b..e2f5b12 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -1370,6 +1370,8 @@ static HANDLE X11DRV_CLIPBOARD_ImportXAPIXMAP(Display *display, Window w, Atom p } if (bits.free) bits.free( &bits ); } + + HeapFree(GetProcessHeap(), 0, lpdata); } return hClipData; @@ -1489,7 +1491,10 @@ static HANDLE X11DRV_CLIPBOARD_ImportClipboardData(Display *display, Window w, A /* Turn on the DDESHARE flag to enable shared 32 bit memory */ hClipData = GlobalAlloc(GMEM_MOVEABLE | GMEM_DDESHARE, cbytes); if (hClipData == 0) + { + HeapFree(GetProcessHeap(), 0, lpdata); return NULL; + } if ((lpClipData = GlobalLock(hClipData))) {

1 0

← Newer
1
...
62
63
64
65
66
67
68
...
71
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 November 2012