May 2008 - Wine-commits - list.winehq.org

Alexandre Julliard : winetest: Sort builds by date instead of name. Don' t wrap around at the end of the list.
by Alexandre Julliard 27 May '08

27 May '08

Module: tools Branch: master Commit: e99e9e84565e9cb0b70b362d0c842ac62d746c02 URL: http://source.winehq.org/git/tools.git/?a=commit;h=e99e9e84565e9cb0b70b362d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 27 16:03:30 2008 +0200 winetest: Sort builds by date instead of name. Don't wrap around at the end of the list. --- winetest/site | 45 ++++++++++++++++++++------------------------- 1 files changed, 20 insertions(+), 25 deletions(-) diff --git a/winetest/site b/winetest/site index 3220e74..8373078 100755 --- a/winetest/site +++ b/winetest/site @@ -12,48 +12,43 @@ my $q = new CGI; # change url based on testing vars if ($q->param('testing')) { + my @builds; # read testing dir opendir(DIR, "./data/"); - my @files = readdir(DIR); - closedir(DIR); - splice(@files,0,2); - @files = sort {lc($a) cmp lc($b)} @files; - - # get only dirs - my @newFiles = (); - for (my $c = 0; $c < $#files; $c++) { - if (-d "./data/".$files[$c]) { - push(@newFiles, $files[$c]); - } + foreach my $build (readdir(DIR)) + { + next if $build =~ /^\./; + next unless $build =~ /^[-.0-9a-zA-Z]+$/; + next unless -f "./data/$build/index.html"; + push @builds, { name => $build, date => (stat "./data/$build")[9] }; } - @files = @newFiles; + closedir(DIR); + @builds = sort { $a->{date} <=> $b->{date} } @builds; # get current pos my $curPos = 0; - for (my $c = 0; $c < $#files; $c++) { - if ($q->param('current') eq $files[$c]) { + for (my $c = 0; $c <= $#builds; $c++) { + if ($q->param('current') eq $builds[$c]->{name}) { $curPos = $c; } } # perform redirect based on vars - if ($curPos == 0 and $q->param('testing') eq "prev") { - print "Location: http://test.winehq.org/data/".$files[$#files]."\n\n"; + if ($q->param('testing') eq "prev" and $curPos > 0) { + print $q->redirect("http://test.winehq.org/data/".$builds[$curPos - 1]->{name}); exit(); - } elsif ($curPos == $#files and $q->param('testing') eq "next") { - print "Location: http://test.winehq.org/data/".$files[0]."\n\n"; + } elsif ($q->param('testing') eq "next" and $curPos < $#builds) { + print $q->redirect("http://test.winehq.org/data/".$builds[$curPos + 1]->{name}); exit(); - } elsif ($q->param('testing') eq "prev" and $files[$curPos - 1]) { - print "Location: http://test.winehq.org/data/".$files[$curPos - 1]."\n\n"; - exit(); - } elsif ($q->param('testing') eq "next" and $files[$curPos + 1]) { - print "Location: http://test.winehq.org/data/".$files[$curPos + 1]."\n\n"; + } + } elsif ($q->param('testing') eq "latest") { + print $q->redirect("http://test.winehq.org/data/".$builds[$#builds]->{name}); exit(); } } # redirect to data dir when no vars present -print "Location: http://test.winehq.org/data/?C=M;O=D\n\n"; - +print $q->redirect("http://test.winehq.org/data/"); + # done exit();

1 0

Alexandre Julliard : winetest: Build a proper index page for the test results.
by Alexandre Julliard 27 May '08

27 May '08

Module: tools Branch: master Commit: 6d94eb8e800c602f9e3b11002e2268b8b8f2e99f URL: http://source.winehq.org/git/tools.git/?a=commit;h=6d94eb8e800c602f9e3b1100… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 27 15:59:58 2008 +0200 winetest: Build a proper index page for the test results. --- winetest/build-index | 155 ++++++++++++++++++++++++++++++++++++++++++++++++ winetest/index.css | 54 +++++++++++++++++ winetest/winetest.conf | 5 +- winetest/winetest.cron | 7 +-- 4 files changed, 214 insertions(+), 7 deletions(-) diff --git a/winetest/build-index b/winetest/build-index new file mode 100755 index 0000000..7b708f9 --- /dev/null +++ b/winetest/build-index @@ -0,0 +1,155 @@ +#!/usr/bin/perl -w +# +# Build the global index for winetest result data +# +# Copyright 2008 Alexandre Julliard <julliard(a)winehq.org> +# + +use strict; +use open ':utf8'; +use CGI qw(:standard); + +use vars qw/$gitdir $gitweb/; +require "winetest.conf"; + +binmode STDIN, ':utf8'; +binmode STDOUT, ':utf8'; + +$ENV{GIT_DIR} = $gitdir; + +my %w95 = (name => "Win95"); +my %w98 = (name => "Win98"); +my %me = (name => "Me"); +my %nt3 = (name => "NT3"); +my %nt4 = (name => "NT4"); +my %w2k = (name => "2000"); +my %xp = (name => "XP"); +my %w2k3 = (name => "2003"); +my %vista = (name => "Vista"); +my %wine = (name => "Wine"); + +# Map dissect's IDs to the above hashes +my %idmap = (95=>\%w95, 98=>\%w98, me=>\%me, nt3=>\%nt3, nt4=>\%nt4, + 2000=>\%w2k, xp=>\%xp, 2003=>\%w2k3, vista=>\%vista, wine=>\%wine); + +# Define the order of version groups in the summary +my @groups = (\%w95, \%w98, \%me, \%nt3, \%nt4, \%w2k, \%xp, \%w2k3, \%vista, \%wine); + +my @months = ("Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"); + +# read the test data dir + +my @builds; +my @too_old; + +opendir(DIR, "./data/") or die "cannot open ./data"; +foreach my $build (readdir(DIR)) +{ + next if $build =~ /^\./; + next unless $build =~ /^[-.0-9a-zA-Z]+$/; + next unless -f "./data/$build/index.html"; + + my ($commit, $date, $subject); + $commit = `git log --max-count=1 --pretty="format:%ct %s" "$build^0" 2>/dev/null` if ($build =~ /^[0-9a-f]{40}$/); + if ($commit && $commit =~ /^(\d+) (.*)$/) + { + $date = $1; + $subject = $2; + # make sure the file mtime matches the commit time + utime $date, $date, "data/$build"; + } + else + { + $date = (stat "./data/$build")[9]; + $subject = ""; + } + # archive builds older than 2 months + if (time() - $date > 60 * 24 * 60 * 60) { push @too_old, $build; } + else { push @builds, { name => $build, date => $date, subj => $subject }; } +} + +closedir(DIR); +(a)builds = sort { $b->{date} <=> $a->{date} } @builds; + +# remove the too old results +foreach my $build (@too_old) { rename "data/$build", "old-data/$build"; } + +# count how many test runs we have for each version + +my %versions = (); + +foreach my $build (@builds) +{ + my %build_ver = (); + if (opendir( DIR, "./data/$build->{name}" )) + { + foreach my $run (readdir(DIR)) + { + next unless -d "./data/$build->{name}/$run"; + next unless $run =~ /^([0-9a-z]*)_.*/; + next unless defined $idmap{$1}; + my $ver = $idmap{$1}->{name}; + $versions{$ver}++; + $build_ver{$ver}++; + } + closedir(DIR); + } + $build->{versions} = \%build_ver; +} + +open OUT, ">data/index.html.new" or die "cannot create data/index.html.new"; + +print OUT <<"EOF"; +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" + "http://www.w3.org/TR/html4/strict.dtd"> +<html> +<head> + <title>Wine test runs</title> + <link rel="stylesheet" href="/index.css" type="text/css"> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> +</head> +<body> +EOF + +print OUT "<table class=\"builds\"><tr><th class=\"build\">Build</th><th class=\"date\">Date</th>\n"; +foreach my $ver (@groups) +{ + next unless defined($versions{$ver->{name}}); + printf OUT "<th class=\"version\">%s</th>", $ver->{name}; +} +print OUT "<th class=\"commit\">Head commit</th></tr>\n"; + +my $odd = 0; +foreach my $build (@builds) +{ + printf OUT "<tr class=\"%s\">\n", $odd ? "dark" : "light"; + $odd = !$odd; + printf OUT " <td class=\"build\"><a href=\"%s\" title=\"%s\">%s</a></td>\n", $build->{name}, $build->{name}, substr($build->{name},0,12); + my @date = gmtime($build->{date}); + printf OUT " <td class=\"date\">%02d-%s-%04d %02d:%02d</td>", $date[3], $months[$date[4]], $date[5] + 1900, $date[2], $date[1], $date[0]; + foreach my $ver (@groups) + { + next unless defined($versions{$ver->{name}}); + my $count = $build->{versions}->{$ver->{name}}; + if (!$count) + { + printf OUT "<td class=\"version\">.</td>"; + } + elsif ($count > 1) + { + printf OUT "<td class=\"version\"><a href=\"%s/#group_%s\">%u</a></td>", $build->{name}, $ver->{name}, $count; + } + else + { + printf OUT "<td class=\"version\"><a href=\"%s\">%u</a></td>", $build->{name}, $count; + } + } + print OUT "\n <td class=\"commit\">"; + if ($build->{subj}) { printf OUT "<a href=\"$gitweb?a=shortlog;h=%s\">%s</a>", $build->{name}, escapeHTML($build->{subj}); } + print OUT "</td></tr>\n"; +} +print OUT "</table>\n</body></html>\n"; +close OUT; + +rename "data/index.html.new", "data/index.html" or unlink "data/index.html.new"; +exit 0; diff --git a/winetest/index.css b/winetest/index.css new file mode 100644 index 0000000..f90b133 --- /dev/null +++ b/winetest/index.css @@ -0,0 +1,54 @@ +/* give a WineHQ-ish look to the test list */ + +body { + background-color: #E2E2E2; + color: #000000; + font-family: "bitstream vera sans", "verdana", "arial", "helvetica", sans-serif; + margin: 10px; + font-size: 12px; +} + +a { color: #A50D0D; text-decoration: none; } +a:visited { color: #FF0000; } +a:hover { color: #FF6666; text-decoration: underline; } +a:active { color: #FF0000; } +a.hidden { text-decoration: none; color: #000000; } + +ol,ul,p { font-size: 12px; } +td,tr,th { font-size: 12px; } + +table.builds { + margin-right: auto; + text-spacing: 0; + border-spacing: 0; + white-space: nowrap; +} + +table.builds th { + line-height: 0.9; + vertical-align: text-top; + border-width: thin; + background-color: #601919; + color: #ffffff; + padding: 5px; +} + +table.builds td { + padding: 1px 5px; +} + +tr.light { background-color: #ffffff; } +tr.dark { background-color: #fff8f8; } +tr.light:hover { background-color: #f8e8e8; } +tr.dark:hover { background-color: #f8e8e8; } + +td.build, td.date { + font-family: monospace; +} +td.version { + text-align: center; +} +.commit { + width: 100%; + text-align: left; +} diff --git a/winetest/winetest.conf b/winetest/winetest.conf index a7ddf3f..e1b0297 100644 --- a/winetest/winetest.conf +++ b/winetest/winetest.conf @@ -1,11 +1,14 @@ # Hey Emacs! This is a -*-cperl-*- file! -$root = "/wine/winetest"; +$root = "/home/winehq/opt/winetest"; $builds = "$root/winetest.builds"; # These two below should be on the same filesystem $queuedir = "$root/queue"; $datadir = "$root/data"; +$gitdir = "/home/winehq/opt/source/git/wine.git"; +$gitweb = "http://source.winehq.org/git/wine.git"; + # Maximum number of reports for one version and tag $maxmult = 10; diff --git a/winetest/winetest.cron b/winetest/winetest.cron index e4129db..da41a7c 100755 --- a/winetest/winetest.cron +++ b/winetest/winetest.cron @@ -8,12 +8,7 @@ if [ ! -f $lock ]; then touch $lock while perl dissect; [ $? -eq 0 -o $? -eq 1 ]; do true; done while perl gather; do true; done - - # move 2-month old results out of the way - for i in `find ./data -maxdepth 1 -mtime +60 -type d -print` - do - mv $i old-data - done + perl build-index # and archive 6-month old results (cd old-data && for i in `find . -maxdepth 1 -mtime +180 -type d -print`

1 0

Paul Vriens : setupapi/tests: Cleanup after testCreateDeviceInterface.
by Alexandre Julliard 27 May '08

27 May '08

Module: wine Branch: master Commit: 8253824669c98162ae7894f9fda1da4ead80a738 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8253824669c98162ae7894f9f… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon May 26 20:03:00 2008 +0200 setupapi/tests: Cleanup after testCreateDeviceInterface. --- dlls/setupapi/tests/devinst.c | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 07497d4..6bf82f7 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -572,6 +572,17 @@ static void testCreateDeviceInterface(void) { BOOL ret; HDEVINFO set; + HKEY key; + static const WCHAR bogus[] = {'S','y','s','t','e','m','\\', + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', + 'E','n','u','m','\\','R','o','o','t','\\', + 'L','E','G','A','C','Y','_','B','O','G','U','S',0}; + static const WCHAR devclass[] = {'S','y','s','t','e','m','\\', + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', + 'C','o','n','t','r','o','l','\\','D','e','v','i','c','e','C','l','a','s','s','e','s','\\', + '{','6','a','5','5','b','5','a','4','-','3','f','6','5','-', + '1','1','d','b','-','b','7','0','4','-', + '0','0','1','1','9','5','5','c','2','b','d','b','}',0}; if (!pSetupDiCreateDeviceInfoList || !pSetupDiDestroyDeviceInfoList || !pSetupDiCreateDeviceInfoA || !pSetupDiCreateDeviceInterfaceA || @@ -636,6 +647,24 @@ static void testCreateDeviceInterface(void) ok(GetLastError() == ERROR_NO_MORE_ITEMS, "SetupDiEnumDeviceInterfaces failed: %08x\n", GetLastError()); pSetupDiDestroyDeviceInfoList(set); + + /* Cleanup */ + /* FIXME: On Wine we still have the bogus entry in Enum\Root and + * subkeys, as well as the deviceclass key with subkeys. + * Only do the RegDeleteKey, once Wine is fixed. + */ + if (!RegOpenKeyW(HKEY_LOCAL_MACHINE, bogus, &key)) + { + /* Wine doesn't delete the information currently */ + trace("We are most likely on Wine\n"); + devinst_RegDeleteTreeW(HKEY_LOCAL_MACHINE, bogus); + devinst_RegDeleteTreeW(HKEY_LOCAL_MACHINE, devclass); + } + else + { + ok(!RegDeleteKeyW(HKEY_LOCAL_MACHINE, devclass), + "Couldn't delete deviceclass key\n"); + } } }

1 0

Dmitry Timoshkov : user32: Implement GetWindowModuleFileName.
by Alexandre Julliard 27 May '08

27 May '08

Module: wine Branch: master Commit: 90f07959718061b27fe219c1ecf6eea1d5ae9a51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90f07959718061b27fe219c1e… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue May 13 15:49:35 2008 +0900 user32: Implement GetWindowModuleFileName. --- dlls/user32/user32.spec | 2 +- dlls/user32/win.c | 40 ++++++++++++++++++++++++++++++++-------- 2 files changed, 33 insertions(+), 9 deletions(-) diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 73af8aa..1c3b538 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -378,7 +378,7 @@ @ stdcall GetWindowLongPtrA(long long) @ stdcall GetWindowLongPtrW(long long) @ stdcall GetWindowLongW(long long) -# @ stub GetWindowModuleFileName +@ stdcall GetWindowModuleFileName(long ptr long) GetWindowModuleFileNameA @ stdcall GetWindowModuleFileNameA(long ptr long) @ stdcall GetWindowModuleFileNameW(long ptr long) @ stdcall GetWindowPlacement(long ptr) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 8214fd5..71f6b55 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -3162,21 +3162,45 @@ BOOL WINAPI DragDetect( HWND hWnd, POINT pt ) /****************************************************************************** * GetWindowModuleFileNameA (USER32.@) */ -UINT WINAPI GetWindowModuleFileNameA( HWND hwnd, LPSTR lpszFileName, UINT cchFileNameMax) +UINT WINAPI GetWindowModuleFileNameA( HWND hwnd, LPSTR module, UINT size ) { - FIXME("GetWindowModuleFileNameA(hwnd %p, lpszFileName %p, cchFileNameMax %u) stub!\n", - hwnd, lpszFileName, cchFileNameMax); - return 0; + WND *win; + HINSTANCE hinst; + + TRACE( "%p, %p, %u\n", hwnd, module, size ); + + win = WIN_GetPtr( hwnd ); + if (!win || win == WND_OTHER_PROCESS || win == WND_DESKTOP) + { + SetLastError( ERROR_INVALID_WINDOW_HANDLE ); + return 0; + } + hinst = win->hInstance; + WIN_ReleasePtr( win ); + + return GetModuleFileNameA( hinst, module, size ); } /****************************************************************************** * GetWindowModuleFileNameW (USER32.@) */ -UINT WINAPI GetWindowModuleFileNameW( HWND hwnd, LPWSTR lpszFileName, UINT cchFileNameMax) +UINT WINAPI GetWindowModuleFileNameW( HWND hwnd, LPWSTR module, UINT size ) { - FIXME("GetWindowModuleFileNameW(hwnd %p, lpszFileName %p, cchFileNameMax %u) stub!\n", - hwnd, lpszFileName, cchFileNameMax); - return 0; + WND *win; + HINSTANCE hinst; + + TRACE( "%p, %p, %u\n", hwnd, module, size ); + + win = WIN_GetPtr( hwnd ); + if (!win || win == WND_OTHER_PROCESS || win == WND_DESKTOP) + { + SetLastError( ERROR_INVALID_WINDOW_HANDLE ); + return 0; + } + hinst = win->hInstance; + WIN_ReleasePtr( win ); + + return GetModuleFileNameW( hinst, module, size ); } /******************************************************************************

1 0

Dmitry Timoshkov : user32: Add the tests for GetWindowModuleFileName.
by Alexandre Julliard 27 May '08

27 May '08

Module: wine Branch: master Commit: 914cb228685b8878be72148330a1b2e8e10d521d URL: http://source.winehq.org/git/wine.git/?a=commit;h=914cb228685b8878be7214833… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon May 26 15:29:44 2008 +0900 user32: Add the tests for GetWindowModuleFileName. --- dlls/user32/tests/win.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 72 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 21119d5..aebf781 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -4631,6 +4631,77 @@ static void test_Expose(void) DestroyWindow(mw); } +static void test_GetWindowModuleFileName(void) +{ + HWND hwnd; + HINSTANCE hinst; + UINT ret1, ret2; + char buf1[MAX_PATH], buf2[MAX_PATH]; + + hwnd = CreateWindowExA(0, "static", NULL, WS_POPUP, 0,0,0,0, 0, 0, 0, NULL); + assert(hwnd); + + hinst = (HINSTANCE)GetWindowLongPtr(hwnd, GWLP_HINSTANCE); + ok(hinst == 0, "expected 0, got %p\n", hinst); + + buf1[0] = 0; + SetLastError(0xdeadbeef); + ret1 = GetModuleFileName(hinst, buf1, sizeof(buf1)); + ok(ret1, "GetModuleFileName error %u\n", GetLastError()); + + buf2[0] = 0; + SetLastError(0xdeadbeef); + ret2 = GetWindowModuleFileName(hwnd, buf2, sizeof(buf2)); + ok(ret2, "GetWindowModuleFileName error %u\n", GetLastError()); + + ok(ret1 == ret2, "%u != %u\n", ret1, ret2); + ok(!strcmp(buf1, buf2), "%s != %s\n", buf1, buf2); + + hinst = GetModuleHandle(0); + + /* MSDN mentions ERROR_INSUFFICIENT_BUFFER, but XP doesn't do it */ + SetLastError(0xdeadbeef); + ret2 = GetModuleFileName(hinst, buf2, ret1 - 2); + ok(ret2 == ret1 - 2, "expected %u, got %u\n", ret1 - 2, ret2); + ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret2 = GetModuleFileName(hinst, buf2, 0); + ok(!ret2, "GetModuleFileName should return 0\n"); + ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret2 = GetWindowModuleFileName(hwnd, buf2, ret1 - 2); + ok(ret2 == ret1 - 2, "expected %u, got %u\n", ret1 - 2, ret2); + ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret2 = GetWindowModuleFileName(hwnd, buf2, 0); + ok(!ret2, "expected 0, got %u\n", ret2); + ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %u\n", GetLastError()); + + DestroyWindow(hwnd); + + buf2[0] = 0; + hwnd = (HWND)0xdeadbeef; + SetLastError(0xdeadbeef); + ret1 = GetWindowModuleFileName(hwnd, buf1, sizeof(buf1)); + ok(!ret1, "expected 0, got %u\n", ret1); + ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE, "expected ERROR_INVALID_WINDOW_HANDLE, got %u\n", GetLastError()); + + hwnd = GetDesktopWindow(); + ok(IsWindow(hwnd), "got invalid desktop window %p\n", hwnd); + SetLastError(0xdeadbeef); + ret1 = GetWindowModuleFileName(hwnd, buf1, sizeof(buf1)); + ok(!ret1, "expected 0, got %u\n", ret1); + + hwnd = FindWindow("Shell_TrayWnd", NULL); + ok(IsWindow(hwnd), "got invalid tray window %p\n", hwnd); + SetLastError(0xdeadbeef); + ret1 = GetWindowModuleFileName(hwnd, buf1, sizeof(buf1)); + ok(!ret1, "expected 0, got %u\n", ret1); +} + START_TEST(win) { pGetAncestor = (void *)GetProcAddress( GetModuleHandleA("user32.dll"), "GetAncestor" ); @@ -4675,7 +4746,7 @@ START_TEST(win) /* Add the tests below this line */ test_params(); - + test_GetWindowModuleFileName(); test_capture_1(); test_capture_2(); test_capture_3(hwndMain, hwndMain2);

1 0

John Klehm : winex11: Support detection of tablet devices from XExtensionKeyboard type.
by Alexandre Julliard 27 May '08

27 May '08

Module: wine Branch: master Commit: 189c13daa336ef609d812635f7f9b6e3b138416d URL: http://source.winehq.org/git/wine.git/?a=commit;h=189c13daa336ef609d812635f… Author: John Klehm <xixsimplicityxix(a)gmail.com> Date: Tue May 27 00:22:09 2008 -0500 winex11: Support detection of tablet devices from XExtensionKeyboard type. --- dlls/winex11.drv/wintab.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index ab9b5a3..5eecd26 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -536,7 +536,10 @@ void X11DRV_LoadTabletInfo(HWND hwnddefault) #ifdef IsXExtensionPointer case IsXExtensionPointer: #endif - TRACE("Is XExtension%s\n", (devices[loop].use == IsXExtensionDevice)? "Device":"Pointer"); +#ifdef IsXExtensionKeyboard + case IsXExtensionKeyboard: +#endif + TRACE("Is XExtension: Device, Keyboard, or Pointer\n"); cursor_target++; target = &devices[loop]; cursor = &gSysCursor[cursor_target];

1 0

Vitaliy Margolen : shell32: Don't print not initialized value.
by Alexandre Julliard 27 May '08

27 May '08

Module: wine Branch: master Commit: dca07aa856fee2d5f8eb81f23e469c1aaf4f1af8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dca07aa856fee2d5f8eb81f23… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Mon May 26 23:53:36 2008 -0600 shell32: Don't print not initialized value. --- dlls/shell32/classes.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/classes.c b/dlls/shell32/classes.c index e5fab4d..d6e9864 100644 --- a/dlls/shell32/classes.c +++ b/dlls/shell32/classes.c @@ -54,7 +54,7 @@ BOOL HCR_MapTypeToValueW(LPCWSTR szExtension, LPWSTR szFileType, LONG len, BOOL HKEY hkey; WCHAR szTemp[MAX_EXTENSION_LENGTH + 2]; - TRACE("%s %p\n", debugstr_w(szExtension), debugstr_w(szFileType)); + TRACE("%s %p\n", debugstr_w(szExtension), szFileType); /* added because we do not want to have double dots */ if (szExtension[0] == '.')

1 0

Vitaliy Margolen : winex11: Use memmove for possibly overlapping memory areas.
by Alexandre Julliard 27 May '08

27 May '08

Module: wine Branch: master Commit: ba5f205584ccdef2364c6b608198fd03ac6d0d99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba5f205584ccdef2364c6b608… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Mon May 26 23:53:45 2008 -0600 winex11: Use memmove for possibly overlapping memory areas. --- dlls/winex11.drv/ime.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c index f478a86..ab94864 100644 --- a/dlls/winex11.drv/ime.c +++ b/dlls/winex11.drv/ime.c @@ -535,7 +535,7 @@ static BOOL IME_RemoveFromSelected(HIMC hIMC) if (hSelectedFrom[i] == hIMC) { if (i < hSelectedCount - 1) - memcpy(&hSelectedFrom[i], &hSelectedFrom[i+1], (hSelectedCount - i - 1)*sizeof(HIMC)); + memmove(&hSelectedFrom[i], &hSelectedFrom[i+1], (hSelectedCount - i - 1)*sizeof(HIMC)); hSelectedCount --; return TRUE; }

1 0

Michael Stefaniuc : shell32: Fix the Catalan translation.
by Alexandre Julliard 27 May '08

27 May '08

Module: wine Branch: master Commit: 0a561c8bdc02d0c4469ea585b24dab613b3c5c7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a561c8bdc02d0c4469ea585b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue May 27 01:07:46 2008 +0200 shell32: Fix the Catalan translation. --- dlls/shell32/shell32_Ca.rc | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shell32_Ca.rc b/dlls/shell32/shell32_Ca.rc index 2fca978..c332c0e 100644 --- a/dlls/shell32/shell32_Ca.rc +++ b/dlls/shell32/shell32_Ca.rc @@ -40,17 +40,19 @@ BEGIN END END -SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152 +SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 220, 152 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Quant a %s" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "D'Acord", IDOK, 153, 133, 50, 12, WS_TABSTOP + DEFPUSHBUTTON "D'Acord", IDOK, 153, 133, 60, 12, WS_TABSTOP + PUSHBUTTON "Wine &license...", IDC_ABOUT_LICENSE, 153, 113, 60, 12, WS_TABSTOP LISTBOX IDC_ABOUT_LISTBOX, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER ICON "", stc1, 10, 10, 30, 30 LTEXT "", IDC_ABOUT_STATIC_TEXT1, 40, 10, 137, 10 LTEXT "", IDC_ABOUT_STATIC_TEXT2, 40, 22, 137, 10 - LTEXT "Wine ha estat construit per:", IDC_ABOUT_WINE_TEXT, 8, 55, 137, 10 + LTEXT "Running on %s", IDC_ABOUT_STATIC_TEXT3, 42, 34, 170, 10 + LTEXT "Wine ha estat construit per:", IDC_ABOUT_WINE_TEXT, 8, 54, 204, 10 } SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95

1 0

John Klehm : winex11: Detect acecad tablet as stylus device.
by Alexandre Julliard 27 May '08

27 May '08

Module: wine Branch: master Commit: f39f7525fd570ef906f29ab491e69976b164f37c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f39f7525fd570ef906f29ab49… Author: John Klehm <xixsimplicityxix(a)gmail.com> Date: Mon May 26 12:09:17 2008 -0500 winex11: Detect acecad tablet as stylus device. --- dlls/winex11.drv/wintab.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index 333e0b8..ab9b5a3 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -418,6 +418,7 @@ static BOOL is_stylus(const char *name, const char *type) static const char* tablet_stylus_whitelist[] = { "stylus", "wizardpen", + "acecad", NULL };

1 0