September 2011 - Wine-Commits

Marcus Meissner : user32: Fixed single byte array overflow.
by Alexandre Julliard Sept. 12, 2011

Sept. 12, 2011

Module: wine Branch: master Commit: d177a97d287221a26987049ae29cf6e40c80cd2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d177a97d287221a26987049ae… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Sep 10 00:40:07 2011 +0200 user32: Fixed single byte array overflow. --- dlls/user32/wsprintf.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/wsprintf.c b/dlls/user32/wsprintf.c index fe20536..5e618d6 100644 --- a/dlls/user32/wsprintf.c +++ b/dlls/user32/wsprintf.c @@ -316,7 +316,7 @@ static INT wvsnprintfA( LPSTR buffer, UINT maxlen, LPCSTR spec, __ms_va_list arg WPRINTF_FORMAT format; LPSTR p = buffer; UINT i, len, sign; - CHAR number[20]; + CHAR number[21]; /* 64bit number can be 18446744073709551616 which is 20 chars. and a \0 */ WPRINTF_DATA argData; TRACE("%p %u %s\n", buffer, maxlen, debugstr_a(spec)); @@ -421,7 +421,7 @@ static INT wvsnprintfW( LPWSTR buffer, UINT maxlen, LPCWSTR spec, __ms_va_list a WPRINTF_FORMAT format; LPWSTR p = buffer; UINT i, len, sign; - CHAR number[20]; + CHAR number[21]; /* 64bit number can be 18446744073709551616 which is 20 chars. and a \0 */ WPRINTF_DATA argData; TRACE("%p %u %s\n", buffer, maxlen, debugstr_w(spec));

1 0

Thomas Mullaly : urlmon/tests: Removed a test that causes random failures on some machines.
by Alexandre Julliard Sept. 12, 2011

Sept. 12, 2011

Module: wine Branch: master Commit: 24aa18d91491b36a94d20c22557fe243f29b6953 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24aa18d91491b36a94d20c225… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Sat Sep 10 13:11:37 2011 -0400 urlmon/tests: Removed a test that causes random failures on some machines. --- dlls/urlmon/tests/sec_mgr.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c index c8d5b8b..afd0d97 100644 --- a/dlls/urlmon/tests/sec_mgr.c +++ b/dlls/urlmon/tests/sec_mgr.c @@ -1631,7 +1631,6 @@ static const struct { {"about:blank",0,0,URLZONE_INTERNET}, {"ftp://zone3.winetest/file.test",0,0,URLZONE_INTERNET}, {"/file/testing/test.test",Uri_CREATE_ALLOW_RELATIVE,0,URLZONE_INTERNET}, - {"file/testing/test.test",Uri_CREATE_ALLOW_RELATIVE,0,URLZONE_INTERNET}, {"zip://testing.com/",0,0,URLZONE_INTERNET}, {"zip:testing.com",0,0,URLZONE_INTERNET} };

1 0

Maarten Lankhorst : kernel32: Fix overflow on 32-bits systems.
by Alexandre Julliard Sept. 12, 2011

Sept. 12, 2011

Module: wine Branch: master Commit: 81a6be568e69fd77ff6de4db198d627d8810c1bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=81a6be568e69fd77ff6de4db1… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sat Sep 10 11:22:59 2011 +0200 kernel32: Fix overflow on 32-bits systems. --- dlls/kernel32/heap.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index 598bfe4..db21b7a 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -1204,17 +1204,17 @@ BOOL WINAPI GlobalMemoryStatusEx( LPMEMORYSTATUSEX lpmemex ) /* new style /proc/meminfo ... */ if (sscanf(buffer, "MemTotal: %lu", &total)) - lpmemex->ullTotalPhys = total*1024; + lpmemex->ullTotalPhys = (ULONG64)total*1024; if (sscanf(buffer, "MemFree: %lu", &free)) - lpmemex->ullAvailPhys = free*1024; + lpmemex->ullAvailPhys = (ULONG64)free*1024; if (sscanf(buffer, "SwapTotal: %lu", &total)) - lpmemex->ullTotalPageFile = total*1024; + lpmemex->ullTotalPageFile = (ULONG64)total*1024; if (sscanf(buffer, "SwapFree: %lu", &free)) - lpmemex->ullAvailPageFile = free*1024; + lpmemex->ullAvailPageFile = (ULONG64)free*1024; if (sscanf(buffer, "Buffers: %lu", &buffers)) - lpmemex->ullAvailPhys += buffers*1024; + lpmemex->ullAvailPhys += (ULONG64)buffers*1024; if (sscanf(buffer, "Cached: %lu", &cached)) - lpmemex->ullAvailPhys += cached*1024; + lpmemex->ullAvailPhys += (ULONG64)cached*1024; } fclose( f ); }

1 0

Josh Juran : gdi32: Simplify logic in WineEngGetFontData().
by Alexandre Julliard Sept. 12, 2011

Sept. 12, 2011

Module: wine Branch: master Commit: b27e814de6fe9e784a851fe1ed7cfa934a591c61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b27e814de6fe9e784a851fe1e… Author: Josh Juran <josh(a)iswifter.net> Date: Fri Sep 9 14:19:12 2011 -0700 gdi32: Simplify logic in WineEngGetFontData(). --- dlls/gdi32/freetype.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 716a37f..d71b0c5 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6198,7 +6198,7 @@ DWORD WineEngGetFontData(GdiFont *font, DWORD table, DWORD offset, LPVOID buf, if(!FT_IS_SFNT(ft_face)) return GDI_ERROR; - if(!buf || !cbData) + if(!buf) len = 0; else len = cbData;

1 0

Andrew Talbot : d3dx9_36: Eliminate comparisons of unsigned values about zero.
by Alexandre Julliard Sept. 12, 2011

Sept. 12, 2011

Module: wine Branch: master Commit: 22beb872f2565cbfbea39685505d45074a1a804d URL: http://source.winehq.org/git/wine.git/?a=commit;h=22beb872f2565cbfbea396855… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Sep 9 22:12:43 2011 +0100 d3dx9_36: Eliminate comparisons of unsigned values about zero. --- dlls/d3dx9_36/mesh.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index c6317c8..760931c 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -638,7 +638,7 @@ static HRESULT propagate_face_vertices(CONST DWORD *adjacency, DWORD *point_reps { DWORD adj_face = adjacency[face_base + edge]; DWORD adj_face_base; - DWORD i,j; + DWORD i; if (adj_face == -1) /* No adjacent face. */ continue; else if (adj_face >= numfaces) @@ -659,9 +659,9 @@ static HRESULT propagate_face_vertices(CONST DWORD *adjacency, DWORD *point_reps } /* Replaces vertices in opposite edge with vertices from current edge. */ - for (i = 0, j = 1; i < 2 && (j+1) > 0; i++, j--) + for (i = 0; i < 2; i++) { - DWORD from = face_base + (edge + j) % VERTS_PER_FACE; + DWORD from = face_base + (edge + (1 - i)) % VERTS_PER_FACE; DWORD to = adj_face_base + (opp_edge + i) % VERTS_PER_FACE; /* Propagate lowest index. */ @@ -759,9 +759,11 @@ static HRESULT WINAPI ID3DXMeshImpl_ConvertAdjacencyToPointReps(ID3DXMesh *iface if (FAILED(hr)) goto cleanup; } /* Go in opposite direction to catch all face orderings */ - for (face = This->numfaces - 1; face + 1 > 0; face--) + for (face = 0; face < This->numfaces; face++) { - hr = propagate_face_vertices(adjacency, point_reps, indices, new_indices, face, This->numfaces); + hr = propagate_face_vertices(adjacency, point_reps, + indices, new_indices, + (This->numfaces - 1) - face, This->numfaces); if (FAILED(hr)) goto cleanup; }

1 0

Frédéric Delanoy : cmd: GOTO is a no-op and doesn 't output anything in interactive mode.
by Alexandre Julliard Sept. 12, 2011

Sept. 12, 2011

Module: wine Branch: master Commit: 6e506eaea90a21f41de7fd82a320e1c9ef7c7ff2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e506eaea90a21f41de7fd82a… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Sep 9 21:54:41 2011 +0200 cmd: GOTO is a no-op and doesn't output anything in interactive mode. --- programs/cmd/builtins.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 7122301..dcbc73e 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1377,14 +1377,15 @@ void WCMD_goto (CMD_LIST **cmdList) { /* Do not process any more parts of a processed multipart or multilines command */ if (cmdList) *cmdList = NULL; - if (param1[0] == 0x00) { - WCMD_output (WCMD_LoadMessage(WCMD_NOARG)); - return; - } if (context != NULL) { WCHAR *paramStart = param1, *str; static const WCHAR eofW[] = {':','e','o','f','\0'}; + if (param1[0] == 0x00) { + WCMD_output (WCMD_LoadMessage(WCMD_NOARG)); + return; + } + /* Handle special :EOF label */ if (lstrcmpiW (eofW, param1) == 0) { context -> skip_rest = TRUE;

1 0

Frédéric Delanoy : cmd/tests: Segment CALL tests for an easier read.
by Alexandre Julliard Sept. 12, 2011

Sept. 12, 2011

Module: wine Branch: master Commit: d029a334538d380269a13eeee754d23374685d1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d029a334538d380269a13eeee… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Sep 11 16:54:08 2011 +0200 cmd/tests: Segment CALL tests for an easier read. --- programs/cmd/tests/test_builtins.cmd | 9 +++++---- programs/cmd/tests/test_builtins.cmd.exp | 5 ++++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 9a5f786..c5f4bd9 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1196,9 +1196,9 @@ set FOO= endlocal cd .. & rd /s/q foobar -echo ------------ Testing CALL -------------- +echo ------------ Testing CALL ------------ mkdir foobar & cd foobar -rem External script +echo ... external script ... echo echo foo %%1> foo.cmd call foo call foo.cmd 8 @@ -1210,7 +1210,8 @@ call foo.cmd "" bar call foo.cmd foo '' call foo.cmd '' bar del foo.cmd -rem Internal routines + +echo ... internal routines ... call :testRoutine :testRoutine goto :endTestRoutine :testRoutine @@ -1230,7 +1231,7 @@ echo %1 %2 goto :eof :endTestRoutineArgs -rem Should work for builtins... +echo ... with builtins ... call mkdir foo echo %ErrorLevel% if exist foo (echo foo created) else echo foo should exist! diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 90dfb45..7dd6207 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -696,7 +696,8 @@ footype=foo_opencmd footype=foo_opencmd ...resetting association @todo_wine(a)original value(a)or_broken@buggyXP(a)or_broken@!FOO! ------------- Testing CALL -------------- +------------ Testing CALL ------------ +... external script ... foo(a)space@ foo 8 foo(a)space@@space@ @@ -705,6 +706,7 @@ foo bar(a)space@ @todo_wine@"" bar(a)space@ foo ''@space@ '' bar(a)space@ +... internal routines ... bar :testRoutine foo(a)space@ foo bar @@ -712,6 +714,7 @@ foo bar @todo_wine@"" bar foo '' '' bar +... with builtins ... @todo_wine(a)0 @todo_wine(a)foo created @todo_wine(a)Should expand foobaz

1 0

Marcus Meissner : dinput: Fixed bad sizeof (pointer -> struct) (Coverity).
by Alexandre Julliard Sept. 12, 2011

Sept. 12, 2011

Module: wine Branch: master Commit: a038ec330a81dd3cf7bf7c77a061a9f20cd634ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=a038ec330a81dd3cf7bf7c77a… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Sep 10 11:25:16 2011 +0200 dinput: Fixed bad sizeof (pointer -> struct) (Coverity). --- dlls/dinput/config.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dinput/config.c b/dlls/dinput/config.c index 9e080f1..dee76a3 100644 --- a/dlls/dinput/config.c +++ b/dlls/dinput/config.c @@ -368,7 +368,7 @@ static INT_PTR CALLBACK ConfigureDevicesDlgProc(HWND dialog, UINT uMsg, WPARAM w init_listview_columns(dialog); /* Create a backup action format for CANCEL and RESET operations */ - data->original_lpdiaf = HeapAlloc(GetProcessHeap(), 0, sizeof(LPDIACTIONFORMATW)); + data->original_lpdiaf = HeapAlloc(GetProcessHeap(), 0, sizeof(*data->original_lpdiaf)); data->original_lpdiaf->dwNumActions = data->lpdiaf->dwNumActions; data->original_lpdiaf->rgoAction = HeapAlloc(GetProcessHeap(), 0, sizeof(DIACTIONW)*data->lpdiaf->dwNumActions); copy_actions(data->original_lpdiaf, data->lpdiaf);

1 0

Nikolay Sivov : shell32: Fix pidl leak (Valgrind).
by Alexandre Julliard Sept. 12, 2011

Sept. 12, 2011

Module: wine Branch: master Commit: ff090f749d735fb85651f5ff9ff9da576c3cace6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff090f749d735fb85651f5ff9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Sep 11 19:23:00 2011 +0400 shell32: Fix pidl leak (Valgrind). --- dlls/shell32/shlview.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index eee447e..3f18256 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -752,6 +752,7 @@ static LRESULT ShellView_OnCreate(IShellViewImpl *This) This->hNotify = SHChangeNotifyRegister(This->hWnd, SHCNRF_InterruptLevel, SHCNE_ALLEVENTS, SHV_CHANGE_NOTIFY, 1, &ntreg); SHFree((LPITEMIDLIST)ntreg.pidl); + SHFree(computer_pidl); } IPersistFolder2_Release(ppf2); }

1 0

André Hentschel : Wine 1.3.28 freigegeben
by Jeremy Newman Sept. 12, 2011

Sept. 12, 2011

Module: website Branch: master Commit: c50ebcb17df7b9ff3f68b9834a90b289d18ccfb2 URL: http://source.winehq.org/git/website.git/?a=commit;h=c50ebcb17df7b9ff3f68b9… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Sep 9 22:43:07 2011 +0200 Wine 1.3.28 freigegeben --- news/de/2011090901.xml | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/news/de/2011090901.xml b/news/de/2011090901.xml new file mode 100644 index 0000000..53eda13 --- /dev/null +++ b/news/de/2011090901.xml @@ -0,0 +1,19 @@ +<news> +<date>9. September 2011</date> +<title>Wine 1.3.28 freigegeben</title> +<body> + Die Entwicklungsversion 1.3.28 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.3.28">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Anfangsversion eines VBScript Parsers.</li> + <li>Automagische Audio Treiber Wahl.</li> + <li>Unterstützung für die Datenträgerinformationen bei UDF Dateisystemen.</li> + <li>Der OpenGL Renderer ist jetzt Standard für DirectDraw.</li> + <li>Geräte-Konfigurationsdialog in DirectInput.</li> + <li>SetDIBitsToDevice Unterstützung in der DIB Engine.</li> + <li>Einige Verbesserungen am cmd Parser.</li> + <li>Verschiedene Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.28.tar.bz2">verfügbar</a>. +Binär-Downloads werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Download-Seiten</a> zur Verfügung. +</body></news>

1 0