January 2013 - Wine-commits

Jacek Caban : wininet: Fixed handling NULL buffer in INTERNET_OPTION_PROXY queries.
by Alexandre Julliard 08 Jan '13

08 Jan '13

Module: wine Branch: master Commit: 81edd2acfc8a98ea225412aa37a8a83303732ea4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81edd2acfc8a98ea225412aa3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 7 18:12:01 2013 +0100 wininet: Fixed handling NULL buffer in INTERNET_OPTION_PROXY queries. --- dlls/wininet/internet.c | 4 ++-- dlls/wininet/tests/internet.c | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index e95070f..3f59017 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -821,7 +821,7 @@ static DWORD APPINFO_QueryOption(object_header_t *hdr, DWORD option, void *buffe proxyBytesRequired = (lstrlenW(ai->proxy) + 1) * sizeof(WCHAR); if (ai->proxyBypass) proxyBypassBytesRequired = (lstrlenW(ai->proxyBypass) + 1) * sizeof(WCHAR); - if (*size < sizeof(INTERNET_PROXY_INFOW) + proxyBytesRequired + proxyBypassBytesRequired) + if (!pi || *size < sizeof(INTERNET_PROXY_INFOW) + proxyBytesRequired + proxyBypassBytesRequired) { *size = sizeof(INTERNET_PROXY_INFOW) + proxyBytesRequired + proxyBypassBytesRequired; return ERROR_INSUFFICIENT_BUFFER; @@ -854,7 +854,7 @@ static DWORD APPINFO_QueryOption(object_header_t *hdr, DWORD option, void *buffe if (ai->proxyBypass) proxyBypassBytesRequired = WideCharToMultiByte(CP_ACP, 0, ai->proxyBypass, -1, NULL, 0, NULL, NULL); - if (*size < sizeof(INTERNET_PROXY_INFOA) + proxyBytesRequired + proxyBypassBytesRequired) + if (!pi || *size < sizeof(INTERNET_PROXY_INFOA) + proxyBytesRequired + proxyBypassBytesRequired) { *size = sizeof(INTERNET_PROXY_INFOA) + proxyBytesRequired + proxyBypassBytesRequired; return ERROR_INSUFFICIENT_BUFFER; diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 4fb9e23..15a600c 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -164,6 +164,12 @@ static void test_InternetQueryOptionA(void) int retval; BOOL res; + SetLastError(0xdeadbeef); + len = 0xdeadbeef; + retval = InternetQueryOptionA(NULL, INTERNET_OPTION_PROXY, NULL, &len); + ok(!retval && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Got wrong error %x(%u)\n", retval, GetLastError()); + ok(len >= sizeof(INTERNET_PROXY_INFO) && len != 0xdeadbeef,"len = %u\n", len); + hinet = InternetOpenA(useragent,INTERNET_OPEN_TYPE_DIRECT,NULL,NULL, 0); ok((hinet != 0x0),"InternetOpen Failed\n");

1 0

Vincent Povirk : windowscodecs: Don't copy extra data from the end of a row .
by Alexandre Julliard 08 Jan '13

08 Jan '13

Module: wine Branch: master Commit: e61e4719e52aafd47eb3d85f29fcdf5e621c0e47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e61e4719e52aafd47eb3d85f2… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Jan 2 14:12:27 2013 -0600 windowscodecs: Don't copy extra data from the end of a row. --- dlls/windowscodecs/main.c | 3 ++- dlls/windowscodecs/tests/bitmap.c | 5 +---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/windowscodecs/main.c b/dlls/windowscodecs/main.c index 2898d97..b63edf5 100644 --- a/dlls/windowscodecs/main.c +++ b/dlls/windowscodecs/main.c @@ -86,7 +86,8 @@ HRESULT copy_pixels(UINT bpp, const BYTE *srcbuffer, return E_INVALIDARG; /* if the whole bitmap is copied and the buffer format matches then it's a matter of a single memcpy */ - if (rc->X == 0 && rc->Y == 0 && rc->Width == srcwidth && rc->Height == srcheight && srcstride == dststride) + if (rc->X == 0 && rc->Y == 0 && rc->Width == srcwidth && rc->Height == srcheight && + srcstride == dststride && srcstride == bytesperrow) { memcpy(dstbuffer, srcbuffer, srcstride * srcheight); return S_OK; diff --git a/dlls/windowscodecs/tests/bitmap.c b/dlls/windowscodecs/tests/bitmap.c index f2f9cb6..68d681a 100644 --- a/dlls/windowscodecs/tests/bitmap.c +++ b/dlls/windowscodecs/tests/bitmap.c @@ -489,10 +489,7 @@ static void test_CreateBitmapFromMemory(void) hr = IWICBitmap_CopyPixels(bitmap, NULL, 13, sizeof(data), data); ok(hr == S_OK, "IWICBitmap_CopyPixels error %#x\n", hr); for (i = 0; i < sizeof(data); i++) - if ((i % 13) < 9) - ok(data[i] == data3x2[i], "%u: expected %u, got %u\n", i, data3x2[i], data[i]); - else - todo_wine ok(data[i] == data3x2[i], "%u: expected %u, got %u\n", i, data3x2[i], data[i]); + ok(data[i] == data3x2[i], "%u: expected %u, got %u\n", i, data3x2[i], data[i]); IWICBitmap_Release(bitmap); }

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 08 Jan '13

08 Jan '13

Module: wine Branch: master Commit: 29957438fb80053fd4da6fe41464583ba6958beb URL: http://source.winehq.org/git/wine.git/?a=commit;h=29957438fb80053fd4da6fe41… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Mon Jan 7 22:01:02 2013 +0200 po: Update Lithuanian translation. --- po/lt.po | 20 ++++++-------------- 1 files changed, 6 insertions(+), 14 deletions(-) diff --git a/po/lt.po b/po/lt.po index 1f806bd..7625ff8 100644 --- a/po/lt.po +++ b/po/lt.po @@ -1,11 +1,11 @@ # Lithuanian translations for Wine -# Aurimas Fišeras <aurimas(a)members.fsf.org>, 2011, 2012. +# Aurimas Fišeras <aurimas(a)members.fsf.org>, 2011, 2012, 2013. msgid "" 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-12-29 09:34+0300\n" +"PO-Revision-Date: 2013-01-07 21:59+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -8280,16 +8280,12 @@ msgid "Don't install" msgstr "Nediegti" #: urlmon.rc:40 -#, fuzzy -#| msgid "" -#| "When installed, ActiveX has full access to your computer.Do not click " -#| "install unless you have absolute trust in the above source." msgid "" "When installed, an ActiveX component 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." +"Kai įdiegtas, ActiveX komponentas turi visišką prieigą prie kompiuterio. " +"Nespauskite „Įdiegti“, nebent visiškai pasitikite šaltiniu aukščiau." #: urlmon.rc:48 msgid "Installation of component failed: %08x" @@ -10204,10 +10200,8 @@ msgid "Connection-specific DNS suffix" msgstr "Ryšiui būdingas DNS sufiksas" #: ipconfig.rc:33 -#, fuzzy -#| msgid "IP address" msgid "IPv4 address" -msgstr "IP adresas" +msgstr "IPv4 adresas" #: ipconfig.rc:34 msgid "Hostname" @@ -10250,10 +10244,8 @@ msgid "Default gateway" msgstr "Numatytasis šliuzas" #: ipconfig.rc:47 -#, fuzzy -#| msgid "IP address" msgid "IPv6 address" -msgstr "IP adresas" +msgstr "IPv6 adresas" #: net.rc:27 msgid ""

1 0

Marcus Meissner : oledb32: Check start for NULL before strstrW (Coverity).
by Alexandre Julliard 08 Jan '13

08 Jan '13

Module: wine Branch: master Commit: 8105a1207b8f3095e7046fd56fd0f2a9ff4efc63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8105a1207b8f3095e7046fd56… Author: Marcus Meissner <meissner(a)suse.de> Date: Mon Jan 7 22:17:22 2013 +0100 oledb32: Check start for NULL before strstrW (Coverity). --- dlls/oledb32/datainit.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c index a870bbc..aa61d3b 100644 --- a/dlls/oledb32/datainit.c +++ b/dlls/oledb32/datainit.c @@ -414,8 +414,6 @@ static HRESULT WINAPI datainit_GetDataSource(IDataInitialize *iface, IUnknown *o /* now set properties */ if (initstring) { - static const WCHAR scolW[] = {';',0}; - static const WCHAR eqW[] = {'=',0}; WCHAR *eq, *start; hr = IUnknown_QueryInterface(*datasource, &IID_IDBProperties, (void**)&dbprops); @@ -426,10 +424,10 @@ static HRESULT WINAPI datainit_GetDataSource(IDataInitialize *iface, IUnknown *o } start = initstring; - while ((eq = strstrW(start, eqW))) + while (start && (eq = strchrW(start, '='))) { static const WCHAR providerW[] = {'P','r','o','v','i','d','e','r',0}; - WCHAR *scol = strstrW(eq+1, scolW); + WCHAR *scol = strchrW(eq+1, ';'); BSTR value, name; name = SysAllocStringLen(start, eq - start);

1 0

Marcus Meissner : comctl32: Free the selection ranges (Coverity).
by Alexandre Julliard 08 Jan '13

08 Jan '13

Module: wine Branch: master Commit: 3173f17315f8797716ef6ed3e03a628ffbb9790a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3173f17315f8797716ef6ed3e… Author: Marcus Meissner <meissner(a)suse.de> Date: Mon Jan 7 22:17:39 2013 +0100 comctl32: Free the selection ranges (Coverity). --- dlls/comctl32/listview.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 3076249..2c953ad 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -3594,9 +3594,15 @@ static void LISTVIEW_SetGroupSelection(LISTVIEW_INFO *infoPtr, INT nItem) POINT ptItem; rcItem.left = LVIR_BOUNDS; - if (!LISTVIEW_GetItemRect(infoPtr, nItem, &rcItem)) return; + if (!LISTVIEW_GetItemRect(infoPtr, nItem, &rcItem)) { + ranges_destroy (selection); + return; + } rcSelMark.left = LVIR_BOUNDS; - if (!LISTVIEW_GetItemRect(infoPtr, infoPtr->nSelectionMark, &rcSelMark)) return; + if (!LISTVIEW_GetItemRect(infoPtr, infoPtr->nSelectionMark, &rcSelMark)) { + ranges_destroy (selection); + return; + } UnionRect(&rcSel, &rcItem, &rcSelMark); iterator_frameditems(&i, infoPtr, &rcSel); while(iterator_next(&i))

1 0

Marcus Meissner : advpack: Avoid using sessions uninitialized (Coverity).
by Alexandre Julliard 08 Jan '13

08 Jan '13

Module: wine Branch: master Commit: a6e4c094d0002e35f9a70902565c4896d2a6ab83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6e4c094d0002e35f9a709025… Author: Marcus Meissner <meissner(a)suse.de> Date: Mon Jan 7 22:17:36 2013 +0100 advpack: Avoid using sessions uninitialized (Coverity). --- dlls/advpack/files.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/advpack/files.c b/dlls/advpack/files.c index c34f6d5..a1d52f8 100644 --- a/dlls/advpack/files.c +++ b/dlls/advpack/files.c @@ -708,6 +708,8 @@ HRESULT WINAPI ExtractFilesA(LPCSTR CabName, LPCSTR ExpandDir, DWORD Flags, if (!hCabinet) return E_FAIL; + ZeroMemory(&session, sizeof(SESSION)); + pExtract = (void *)GetProcAddress(hCabinet, "Extract"); if (!pExtract) { @@ -715,7 +717,6 @@ HRESULT WINAPI ExtractFilesA(LPCSTR CabName, LPCSTR ExpandDir, DWORD Flags, goto done; } - ZeroMemory(&session, sizeof(SESSION)); lstrcpyA(session.Destination, ExpandDir); if (FileList)

1 0

Marcus Meissner : dmsynth: Remove now useless NULL ptr check (Coverity).
by Alexandre Julliard 08 Jan '13

08 Jan '13

Module: wine Branch: master Commit: 4d5dcdca48b7a3101ea24065d7e7b637aefb3ede URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d5dcdca48b7a3101ea24065d… Author: Marcus Meissner <meissner(a)suse.de> Date: Mon Jan 7 22:17:30 2013 +0100 dmsynth: Remove now useless NULL ptr check (Coverity). --- dlls/dmsynth/synth.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index 4392230..7a966a8 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -126,7 +126,7 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_SetNumChannelGroups(LPDIRECTMUSICSY static HRESULT WINAPI IDirectMusicSynth8Impl_Download(LPDIRECTMUSICSYNTH8 iface, LPHANDLE hDownload, LPVOID data, LPBOOL free) { IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface); - LPBYTE buffer = (LPBYTE)data; + LPBYTE buffer = data; DMUS_DOWNLOADINFO *info = (DMUS_DOWNLOADINFO*)buffer; ULONG *offsets = ((DMUS_OFFSETTABLE*)(buffer + sizeof(DMUS_DOWNLOADINFO)))->ulOffsetTable; LPBYTE object = buffer + sizeof(DMUS_DOWNLOADINFO) + info->dwNumOffsetTableEntries * sizeof(ULONG); @@ -135,7 +135,7 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_Download(LPDIRECTMUSICSYNTH8 iface, /* FIXME: Currently we only dump data which is very useful to known how native dmusic behave and debug builtin dmusic */ - if (!hDownload || !data || !free) + if (!hDownload || !free) return E_POINTER; if (TRACE_ON(dmsynth))

1 0

Marcus Meissner : advapi32: Close scm_handle on error exit (Coverity).
by Alexandre Julliard 08 Jan '13

08 Jan '13

Module: wine Branch: master Commit: a422d6b382071f022596402fca33bc5c70e19da1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a422d6b382071f022596402fc… Author: Marcus Meissner <meissner(a)suse.de> Date: Mon Jan 7 22:17:33 2013 +0100 advapi32: Close scm_handle on error exit (Coverity). --- dlls/advapi32/tests/service.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 2eeb40a..5248e82 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -1866,7 +1866,10 @@ static void test_sequence(void) } } - if (!svc_handle) return; + if (!svc_handle) { + CloseServiceHandle(scm_handle); + return; + } /* TODO: * Before we do a QueryServiceConfig we should check the registry. This will make sure

1 0

André Hentschel : netstat: Implement -a option.
by Alexandre Julliard 08 Jan '13

08 Jan '13

Module: wine Branch: master Commit: 6158a5ccf3c390840a6b071d52aa0d2d6866a1e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6158a5ccf3c390840a6b071d5… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jan 7 23:26:55 2013 +0100 netstat: Implement -a option. --- programs/netstat/netstat.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/programs/netstat/netstat.c b/programs/netstat/netstat.c index 4f29788..268cec1 100644 --- a/programs/netstat/netstat.c +++ b/programs/netstat/netstat.c @@ -145,7 +145,7 @@ static WCHAR *NETSTAT_host_name(UINT ip, WCHAR name[]) return name; } -static void NETSTAT_tcp_header(void) +static void NETSTAT_conn_header(void) { WCHAR local[22], remote[22], state[22]; NETSTAT_wprintf(fmtnn, NETSTAT_load_message(IDS_TCP_ACTIVE_CONN)); @@ -175,8 +175,6 @@ static void NETSTAT_tcp_table(void) if (err) return; - NETSTAT_tcp_header(); - for (i = 0; i < table->dwNumEntries; i++) { if ((table->table[i].u.dwState == MIB_TCP_STATE_CLOSE_WAIT) || @@ -213,8 +211,6 @@ static void NETSTAT_udp_table(void) if (err) return; - NETSTAT_tcp_header(); - for (i = 0; i < table->dwNumEntries; i++) { NETSTAT_host_name(table->table[i].dwLocalAddr, HostIp); @@ -252,6 +248,7 @@ int wmain(int argc, WCHAR *argv[]) if (argc == 1) { /* No options */ + NETSTAT_conn_header(); NETSTAT_tcp_table(); return 0; } @@ -260,21 +257,28 @@ int wmain(int argc, WCHAR *argv[]) { switch (argv[1][1]) { + case 'a': + NETSTAT_conn_header(); + NETSTAT_tcp_table(); + NETSTAT_udp_table(); + return 0; case 'p': argv++; argc--; if (argc == 1) return 1; switch (NETSTAT_get_protocol(argv[1])) { case PROT_TCP: + NETSTAT_conn_header(); NETSTAT_tcp_table(); break; case PROT_UDP: + NETSTAT_conn_header(); NETSTAT_udp_table(); break; default: WINE_FIXME("Protocol not yet implemented: %s\n", debugstr_w(argv[1])); } - break; + return 0; default: WINE_FIXME("Unknown option: %s\n", debugstr_w(argv[1])); return 1;

1 0

Łukasz Wojniłowicz : Polish translation for release 1.5.21
by Jeremy Newman 08 Jan '13

08 Jan '13

Module: website Branch: master Commit: a23f8f8687810447893d4e64bd1e4e0af13d8df0 URL: http://source.winehq.org/git/website.git/?a=commit;h=a23f8f8687810447893d4e… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Mon Jan 7 17:21:32 2013 +0100 Polish translation for release 1.5.21 --- news/pl/2013010401.xml | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/news/pl/2013010401.xml b/news/pl/2013010401.xml new file mode 100644 index 0000000..3524773 --- /dev/null +++ b/news/pl/2013010401.xml @@ -0,0 +1,14 @@ +<news> +<date>Styczeń 4, 2013</date> +<title>Wydano Wine 1.5.21</title> +<body> +<p> Wydanie rozwojowe Wine 1.5.21 jest już dostępne.</p> +<p> <a href="{$root}/announce/1.5.21">Co nowego</a> w tym wydaniu: +<ul> + <li>Początki wbudowanego programu netstat.</li> + <li>Wsparcie dla wybierania rozdzielczości w sterowniku PostScript.</li> + <li>Rozmaite poprawki błędów.</li> +</ul></p> +<p><p>Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.21.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</p></body></news>

1 0