September 2008 - Wine-Commits

Juan Lang : user32: Don't crash if passed a non-scrollbar HWND. Fixes Coverity id 265.
by Alexandre Julliard Sept. 12, 2008

Sept. 12, 2008

Module: wine Branch: master Commit: 6049ad74e9d2c44154fad1b6e1de7aed4c299ec8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6049ad74e9d2c44154fad1b6e… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Sep 11 09:21:43 2008 -0700 user32: Don't crash if passed a non-scrollbar HWND. Fixes Coverity id 265. --- dlls/user32/scroll.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index af35c97..5556315 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -1256,7 +1256,9 @@ static BOOL SCROLL_GetScrollBarInfo(HWND hwnd, LONG idObject, LPSCROLLBARINFO in info->xyThumbBottom = info->xyThumbTop + info->dxyLineButton; infoPtr = SCROLL_GetInternalInfo(hwnd, nBar, TRUE); - + if (!infoPtr) + return FALSE; + /* Scroll bar state */ info->rgstate[0] = 0; if ((nBar == SB_HORZ && !(style & WS_HSCROLL))

1 0

Francois Gouget : crypt32/tests: Win98 is missing Crypt{Encode, Decode}ObjectEx().
by Alexandre Julliard Sept. 12, 2008

Sept. 12, 2008

Module: wine Branch: master Commit: 2797e8fcb6e74971a8e2fbeab5b77610616bf412 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2797e8fcb6e74971a8e2fbeab… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Sep 11 16:51:11 2008 +0200 crypt32/tests: Win98 is missing Crypt{Encode,Decode}ObjectEx(). --- dlls/crypt32/tests/encode.c | 116 +++++++++++++++++++++--------------------- 1 files changed, 58 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2797e8fcb6e74971a8e2f…

1 0

Alistair Leslie-Hughes : mshtml: Add IHTMLStyle margin tests.
by Alexandre Julliard Sept. 12, 2008

Sept. 12, 2008

Module: wine Branch: master Commit: 3ed35309c1f04763f38985ae0fa1f2697f4fd39f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ed35309c1f04763f38985ae0… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Sep 11 11:50:29 2008 +1000 mshtml: Add IHTMLStyle margin tests. --- dlls/mshtml/tests/dom.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index c294140..ed28808 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2011,6 +2011,24 @@ static void test_default_style(IHTMLStyle *style) ok(V_VT(&v) == VT_BSTR, "V_VT(v)=%d\n", V_VT(&v)); ok(!strcmp_wa(V_BSTR(&v), "auto"), "V_BSTR(v)=%s\n", dbgstr_w(V_BSTR(&v))); VariantClear(&v); + + /* margin tests */ + str = (void*)0xdeadbeef; + hres = IHTMLStyle_get_margin(style, &str); + ok(hres == S_OK, "get_margin failed: %08x\n", hres); + ok(!str, "margin = %s\n", dbgstr_w(str)); + + str = a2bstr("1"); + hres = IHTMLStyle_put_margin(style, str); + ok(hres == S_OK, "get_margin failed: %08x\n", hres); + SysFreeString(str); + + hres = IHTMLStyle_get_margin(style, &str); + ok(hres == S_OK, "get_margin failed: %08x\n", hres); + ok(strcmp_wa(str, "1"), "margin = %s\n", dbgstr_w(str)); + + hres = IHTMLStyle_put_margin(style, NULL); + ok(hres == S_OK, "get_margin failed: %08x\n", hres); } static void test_default_selection(IHTMLDocument2 *doc)

1 0

Florian Köberle : winedbg: Fixed an infinite loop.
by Alexandre Julliard Sept. 12, 2008

Sept. 12, 2008

Module: wine Branch: master Commit: 49c96a507530b6c361cf25e7dd7a02f70334c434 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49c96a507530b6c361cf25e7d… Author: Florian Köberle <FloriansKarten(a)web.de> Date: Wed Sep 10 09:39:24 2008 +0200 winedbg: Fixed an infinite loop. --- programs/winedbg/memory.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c index dfb014e..f605421 100644 --- a/programs/winedbg/memory.c +++ b/programs/winedbg/memory.c @@ -452,9 +452,9 @@ static void print_typed_basic(const struct dbg_lvalue* lvalue) } } } + count -= min(count, 256); + fcp->Start += 256; } - count -= min(count, 256); - fcp->Start += 256; } if (!ok) dbg_print_longlong(val_int, TRUE); }

1 0

Paul Vriens : setupapi/tests: Fix a failure on Windows 2000.
by Alexandre Julliard Sept. 12, 2008

Sept. 12, 2008

Module: wine Branch: master Commit: c79759786da4294c4e9c1a4fc6d66c2eb673ca34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c79759786da4294c4e9c1a4fc… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu Sep 11 15:23:58 2008 +0200 setupapi/tests: Fix a failure on Windows 2000. --- dlls/setupapi/tests/query.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/tests/query.c b/dlls/setupapi/tests/query.c index c3dc46b..67c44f9 100644 --- a/dlls/setupapi/tests/query.c +++ b/dlls/setupapi/tests/query.c @@ -154,7 +154,8 @@ static void test_SetupGetInfInformation(void) broken(GetLastError() == ERROR_BAD_PATHNAME) || /* win95 */ broken(GetLastError() == ERROR_FILE_NOT_FOUND) || /* win98 */ broken(GetLastError() == ERROR_PATH_NOT_FOUND) || /* NT4 */ - broken(GetLastError() == ERROR_INVALID_NAME), /* win2k */ + broken(GetLastError() == ERROR_INVALID_NAME) || /* win2k */ + broken(GetLastError() == ERROR_GENERAL_SYNTAX), /* another win2k */ "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); ok(size == 0xdeadbeef, "Expected size to remain unchanged\n");

1 0

Paul Vriens : jscript/tests: Fix crash and failures on win9x.
by Alexandre Julliard Sept. 12, 2008

Sept. 12, 2008

Module: wine Branch: master Commit: 98aaad7810256923f790c7ea2cf0906a3a255cad URL: http://source.winehq.org/git/wine.git/?a=commit;h=98aaad7810256923f790c7ea2… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu Sep 11 15:13:10 2008 +0200 jscript/tests: Fix crash and failures on win9x. --- dlls/jscript/tests/run.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index bb8b47f..3409b7e 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -101,9 +101,9 @@ static BSTR a2bstr(const char *str) static int strcmp_wa(LPCWSTR strw, const char *stra) { - WCHAR buf[512]; - MultiByteToWideChar(CP_ACP, 0, stra, -1, buf, sizeof(buf)/sizeof(WCHAR)); - return lstrcmpW(strw, buf); + CHAR buf[512]; + WideCharToMultiByte(CP_ACP, 0, strw, -1, buf, sizeof(buf), 0, 0); + return lstrcmpA(buf, stra); } static HRESULT WINAPI DispatchEx_QueryInterface(IDispatchEx *iface, REFIID riid, void **ppv)

1 0

Paul Vriens : setupapi/tests: Fix two failures on win98.
by Alexandre Julliard Sept. 12, 2008

Sept. 12, 2008

Module: wine Branch: master Commit: c55f088198143c50c1d8b416aca200a169c418f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c55f088198143c50c1d8b416a… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu Sep 11 14:43:18 2008 +0200 setupapi/tests: Fix two failures on win98. --- dlls/setupapi/tests/misc.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/setupapi/tests/misc.c b/dlls/setupapi/tests/misc.c index a18fd37..bd3f1ce 100644 --- a/dlls/setupapi/tests/misc.c +++ b/dlls/setupapi/tests/misc.c @@ -166,8 +166,9 @@ static void test_SetupCopyOEMInf(void) SetLastError(0xdeadbeef); res = pSetupCopyOEMInfA("", NULL, 0, SP_COPY_NOOVERWRITE, NULL, 0, NULL, NULL); ok(res == FALSE, "Expected FALSE, got %d\n", res); - ok(GetLastError() == ERROR_FILE_NOT_FOUND, - "Expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); + ok(GetLastError() == ERROR_FILE_NOT_FOUND || + GetLastError() == ERROR_BAD_PATHNAME, /* Win98 */ + "Expected ERROR_FILE_NOT_FOUND or ERROR_BAD_PATHNAME, got %d\n", GetLastError()); /* try a relative nonexistent SourceInfFileName */ SetLastError(0xdeadbeef); @@ -191,8 +192,9 @@ static void test_SetupCopyOEMInf(void) SetLastError(0xdeadbeef); res = pSetupCopyOEMInfA(toolong, NULL, 0, SP_COPY_NOOVERWRITE, NULL, 0, NULL, NULL); ok(res == FALSE, "Expected FALSE, got %d\n", res); - ok(GetLastError() == ERROR_FILE_NOT_FOUND, - "Expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); + ok(GetLastError() == ERROR_FILE_NOT_FOUND || + GetLastError() == ERROR_FILENAME_EXCED_RANGE, /* Win98 */ + "Expected ERROR_FILE_NOT_FOUND or ERROR_FILENAME_EXCED_RANGE, got %d\n", GetLastError()); get_temp_filename(tmpfile); create_inf_file(tmpfile);

1 0

Alexandre Julliard : winex11: Fixed mapping of the move/ resize starting point to X11 root coordinates.
by Alexandre Julliard Sept. 12, 2008

Sept. 12, 2008

Module: wine Branch: master Commit: 9fab7b458ace550bf30d6bae2f4d8b55afb468c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fab7b458ace550bf30d6bae2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 12 11:03:26 2008 +0200 winex11: Fixed mapping of the move/resize starting point to X11 root coordinates. --- dlls/winex11.drv/window.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index e03bbb6..33adff4 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2293,8 +2293,8 @@ LRESULT X11DRV_SysCommand( HWND hwnd, WPARAM wparam, LPARAM lparam ) xev.xclient.display = display; xev.xclient.send_event = True; xev.xclient.format = 32; - xev.xclient.data.l[0] = x; /* x coord */ - xev.xclient.data.l[1] = y; /* y coord */ + xev.xclient.data.l[0] = x - virtual_screen_rect.left; /* x coord */ + xev.xclient.data.l[1] = y - virtual_screen_rect.top; /* y coord */ xev.xclient.data.l[2] = dir; /* direction */ xev.xclient.data.l[3] = 1; /* button */ xev.xclient.data.l[4] = 0; /* unused */

1 0

Alexandre Julliard : winex11: Remove debug hack that slipped into commit a4a5a2ec121eeb2a7cd4ffbb5ba7b298f2a050b1 .
by Alexandre Julliard Sept. 12, 2008

Sept. 12, 2008

Module: wine Branch: master Commit: ec4cc7f76b6e7ad9c111a1e10adfd26d72a8d154 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec4cc7f76b6e7ad9c111a1e10… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 11 20:19:11 2008 +0200 winex11: Remove debug hack that slipped into commit a4a5a2ec121eeb2a7cd4ffbb5ba7b298f2a050b1. --- dlls/winex11.drv/event.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 32befa4..b45cecf 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -552,8 +552,6 @@ static void handle_wm_protocols( HWND hwnd, XClientMessageEvent *event ) hwnd, IsWindowEnabled(hwnd), IsWindowVisible(hwnd), GetWindowLongW(hwnd, GWL_STYLE), GetFocus(), GetActiveWindow(), GetForegroundWindow(), last_focus ); - if (hwnd == GetForegroundWindow()) return; - if (can_activate_window(hwnd)) { /* simulate a mouse click on the caption to find out

1 0

Alexandre Julliard : winetest: For tests run on Wine, enforce that the Wine version is not older than the test build.
by Alexandre Julliard Sept. 11, 2008

Sept. 11, 2008

Module: tools Branch: master Commit: debcd82f5f6947d518ef26b40da508de87e544e8 URL: http://source.winehq.org/git/tools.git/?a=commit;h=debcd82f5f6947d518ef26b4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 11 20:36:38 2008 +0200 winetest: For tests run on Wine, enforce that the Wine version is not older than the test build. --- winetest/dissect | 24 +++++++++++++++++++++++- 1 files changed, 23 insertions(+), 1 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index d3782cb..17a5c4b 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -124,7 +124,7 @@ while (($_ = <IN>) =~ s/^ //) } $box->{data} .= "</div>"; -my ($wine, $version, $major, $minor, $plid, $product); +my ($wine, $wine_build, $version, $major, $minor, $plid, $product); /^Operating system version:\r?$/ or mydie "no OS header: $_"; $box = create_box( "version", "version", "Operating system version" ); $box->{data} .= "<table class=\"output\">\n"; @@ -140,6 +140,8 @@ while (($_ = <IN>) =~ /^\s*([0-9a-zA-Z ]+)=(.*?)\r?$/) { $plid = $2; } elsif ($1 eq "wProductType") { $product = $2; + } elsif ($1 eq "WineBuild") { + $wine_build = $2; } } $box->{data} .= "</table>"; @@ -180,6 +182,26 @@ if ($wine) { $tag = "_$version$tag"; $version = "wine"; } +if ($wine_build) { + my $wine_commit; + if ($wine_build =~ /-g([0-9a-f]+)$/) + { + $wine_commit = `git rev-parse --verify $1^0 2>/dev/null`; + } + elsif ($wine_build =~ /^[-+._0-9A-Za-z]+$/) + { + $wine_commit = `git rev-parse --verify $wine_build^0 2>/dev/null`; + } + else + { + mydie "invalid wine build '$wine_build'\n"; + } + chomp $wine_commit; + mydie "unknown wine build '$wine_build'\n" unless $wine_commit; + my $merge_base = `git merge-base $wine_commit $testbuild 2>/dev/null`; + chomp $merge_base; + $merge_base eq $testbuild or mydie "wine build '$wine_build' not a descendant of build $testbuild\n"; +} my %dllinfo; /^Dll info:\r?$/ or mydie "no Dll info header: $_";

1 0