wine-commits December 2008

wine-commits@winehq.org

2 participants
1225 discussions

Paul Vriens : msi/tests: Skip tests on win9x due to different registry keys .
by Alexandre Julliard 11 Dec '08

11 Dec '08

Module: wine Branch: master Commit: 194c0530211cd581a798a45633904d49a3eb0221 URL: http://source.winehq.org/git/wine.git/?a=commit;h=194c0530211cd581a798a4563… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Dec 10 17:02:12 2008 +0100 msi/tests: Skip tests on win9x due to different registry keys. --- dlls/msi/tests/package.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 6645c06..e3565ef 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -9523,6 +9523,15 @@ static void test_MsiGetProductProperty(void) DWORD size; LONG res; UINT r; + SC_HANDLE scm; + + scm = OpenSCManager(NULL, NULL, SC_MANAGER_CONNECT); + if (!scm && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)) + { + win_skip("Different registry keys on Win9x and WinMe\n"); + return; + } + CloseServiceHandle(scm); GetCurrentDirectoryA(MAX_PATH, path); lstrcatA(path, "\\");

1 0

Aric Stewart : user32: Implement handling of WM_INPUTLANGCHANGE.
by Alexandre Julliard 11 Dec '08

11 Dec '08

Module: wine Branch: master Commit: cb69bd6349dfcdb4822aeadf59f27c1e9d4276bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb69bd6349dfcdb4822aeadf5… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Dec 10 09:37:38 2008 -0600 user32: Implement handling of WM_INPUTLANGCHANGE. --- dlls/user32/defwnd.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index e878adb..8a2d21e 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -758,6 +758,20 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa SendMessageW( hwnd, WM_HELP, 0, (LPARAM)&hi ); break; } + + case WM_INPUTLANGCHANGE: + { + int count = 0; + HWND *win_array = WIN_ListChildren( hwnd ); + + if (!win_array) + break; + while (win_array[count]) + SendMessageW( win_array[count++], WM_INPUTLANGCHANGE, wParam, lParam); + HeapFree(GetProcessHeap(),0,win_array); + break; + } + } return 0;

1 0

Alexandre Julliard : tools: Keep track of requests sizes and alignments in make_requests.
by Alexandre Julliard 11 Dec '08

11 Dec '08

Module: wine Branch: master Commit: f4ec583d0a9584f136c4eb3426813182950e95bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4ec583d0a9584f136c4eb342… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 10 17:15:51 2008 +0100 tools: Keep track of requests sizes and alignments in make_requests. --- tools/make_requests | 76 +++++++++++++++++++++++++++++++------------------- 1 files changed, 47 insertions(+), 29 deletions(-) diff --git a/tools/make_requests b/tools/make_requests index 2c06813..214ade4 100755 --- a/tools/make_requests +++ b/tools/make_requests @@ -22,31 +22,31 @@ use strict; my %formats = -( - "int" => "%d", - "short int" => "%d", - "char" => "%c", - "unsigned char" => "%02x", - "unsigned short"=> "%04x", - "unsigned int" => "%08x", - "unsigned long" => "%lx", - "void*" => "%p", - "data_size_t" => "%u", - "obj_handle_t" => "%04x", - "atom_t" => "%04x", - "user_handle_t" => "%08x", - "process_id_t" => "%04x", - "thread_id_t" => "%04x", - "lparam_t" => "%lx", - "timeout_t" => "&dump_timeout", - "rectangle_t" => "&dump_rectangle", - "char_info_t" => "&dump_char_info", - "apc_call_t" => "&dump_apc_call", - "apc_result_t" => "&dump_apc_result", - "async_data_t" => "&dump_async_data", - "luid_t" => "&dump_luid", - "ioctl_code_t" => "&dump_ioctl_code", - "file_pos_t" => "&dump_file_pos", +( # size align format + "int" => [ 4, 4, "%d" ], + "short int" => [ 2, 2, "%d" ], + "char" => [ 1, 1, "%c" ], + "unsigned char" => [ 1, 1, "%02x" ], + "unsigned short"=> [ 2, 2, "%04x" ], + "unsigned int" => [ 4, 4, "%08x" ], + "unsigned long" => [ 4, 4, "%lx" ], + "void*" => [ 4, 4, "%p" ], + "data_size_t" => [ 4, 4, "%u" ], + "obj_handle_t" => [ 4, 4, "%04x" ], + "atom_t" => [ 2, 2, "%04x" ], + "user_handle_t" => [ 4, 4, "%08x" ], + "process_id_t" => [ 4, 4, "%04x" ], + "thread_id_t" => [ 4, 4, "%04x" ], + "lparam_t" => [ 4, 4, "%lx" ], + "timeout_t" => [ 8, 8, "&dump_timeout" ], + "rectangle_t" => [ 16, 4, "&dump_rectangle" ], + "char_info_t" => [ 4, 2, "&dump_char_info" ], + "apc_call_t" => [ 32, 4, "&dump_apc_call" ], + "apc_result_t" => [ 28, 4, "&dump_apc_result" ], + "async_data_t" => [ 28, 4, "&dump_async_data" ], + "luid_t" => [ 8, 4, "&dump_luid" ], + "ioctl_code_t" => [ 4, 4, "&dump_ioctl_code" ], + "file_pos_t" => [ 8, 8, "&dump_file_pos" ], ); my @requests = (); @@ -54,7 +54,9 @@ my %replies = (); my @trace_lines = (); +my $max_req_size = 64; +my $warnings = scalar(@ARGV) && $ARGV[0] eq "-w"; ### Generate a dumping function @@ -69,14 +71,15 @@ sub DO_DUMP_FUNC($$@) my $var = shift; if (defined($formats{$type})) { - if ($formats{$type} =~ /^&(.*)/) + my $fmt = ${$formats{$type}}[2]; + if ($fmt =~ /^&(.*)/) { my $func = $1; push @trace_lines, " fprintf( stderr, \" $var=\" );\n"; push @trace_lines, " $func( &req->$var );\n"; push @trace_lines, " fprintf( stderr, \",\" );\n" if ($#_ > 0); } - elsif ($formats{$type} =~ /^(%.*)\s+$(.*)$/) + elsif ($fmt =~ /^(%.*)\s+$(.*)$/) { my ($format, $cast) = ($1, $2); push @trace_lines, " fprintf( stderr, \" $var=$format"; @@ -85,7 +88,7 @@ sub DO_DUMP_FUNC($$@) } else { - push @trace_lines, " fprintf( stderr, \" $var=$formats{$type}"; + push @trace_lines, " fprintf( stderr, \" $var=$fmt"; push @trace_lines, "," if ($#_ > 0); push @trace_lines, "\", req->$var );\n"; } @@ -107,6 +110,7 @@ sub PARSE_REQUESTS() { # states: 0 = header 1 = declarations 2 = inside @REQ 3 = inside @REPLY my $state = 0; + my $offset = 0; my $name = ""; my @in_struct = (); my @out_struct = (); @@ -138,6 +142,7 @@ sub PARSE_REQUESTS() # start a new request @in_struct = (); @out_struct = (); + $offset = 12; print SERVER_PROT "struct ${name}_request\n{\n"; print SERVER_PROT " struct request_header __header;\n"; $state++; @@ -150,6 +155,8 @@ sub PARSE_REQUESTS() print SERVER_PROT "};\n"; print SERVER_PROT "struct ${name}_reply\n{\n"; print SERVER_PROT " struct reply_header __header;\n"; + die "request $name too large ($offset)" if ($offset > $max_req_size); + $offset = 8; $state++; next; } @@ -161,11 +168,15 @@ sub PARSE_REQUESTS() if ($state == 2) # build dummy reply struct { + die "request $name too large ($offset)" if ($offset > $max_req_size); print SERVER_PROT "struct ${name}_reply\n{\n"; print SERVER_PROT " struct reply_header __header;\n"; print SERVER_PROT "};\n"; } - + else + { + die "reply $name too large ($offset)" if ($offset > $max_req_size); + } # got a complete request push @requests, $name; DO_DUMP_FUNC( $name, "request", @in_struct); @@ -204,6 +215,13 @@ sub PARSE_REQUESTS() $type = $1; $var = $3; die "Unrecognized type $type" unless defined($formats{$type}); + my @fmt = @{$formats{$type}}; + if ($offset & ($fmt[1] - 1)) + { + print "protocol.def:$.: warning: $name $offset $type $var needs padding\n" if $warnings; + } + $offset = ($offset + $fmt[1] - 1) & ~($fmt[1] - 1); + $offset += $fmt[0]; } else {

1 0

Alexandre Julliard : tools: Re-use the file updating routines from make_makefiles in make_requests.
by Alexandre Julliard 11 Dec '08

11 Dec '08

Module: wine Branch: master Commit: 37f3691f7f10d89f1185f55c8ff04c8e46a92986 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37f3691f7f10d89f1185f55c8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 10 17:13:30 2008 +0100 tools: Re-use the file updating routines from make_makefiles in make_requests. --- tools/make_requests | 74 +++++++++++++++++++++++++++++++++++++------------- 1 files changed, 55 insertions(+), 19 deletions(-) diff --git a/tools/make_requests b/tools/make_requests index 227ac27..2c06813 100755 --- a/tools/make_requests +++ b/tools/make_requests @@ -258,28 +258,57 @@ sub GET_ERROR_NAMES() return %errors; } -### Replace the contents of a file between ### make_requests ### marks +# update a file if changed +sub update_file($) +{ + my $file = shift; + my $ret = !(-f $file) || system "cmp $file $file.new >/dev/null"; + if (!$ret) + { + unlink "$file.new"; + } + else + { + rename "$file.new", "$file"; + print "$file updated\n"; + } + return $ret; +} -sub REPLACE_IN_FILE($@) +# replace some lines in a file between two markers +sub replace_in_file($$$@) { - my $name = shift; - my @data = @_; - my @lines = (); - open(FILE,$name) or die "Can't open $name"; - while (<FILE>) + my $file = shift; + my $start = shift; + my $end = shift; + + open NEW_FILE, ">$file.new" or die "cannot create $file.new"; + + if (defined($start)) { - push @lines, $_; - last if /\#\#\# make_requests begin \#\#\#/; + open OLD_FILE, "$file" or die "cannot open $file"; + while (<OLD_FILE>) + { + print NEW_FILE $_; + last if /$start/; + } } - push @lines, "\n", @data; - while (<FILE>) + + print NEW_FILE "\n", @_, "\n"; + + if (defined($end)) { - if (/\#\#\# make_requests end \#\#\#/) { push @lines, "\n", $_; last; } + my $skip=1; + while (<OLD_FILE>) + { + $skip = 0 if /$end/; + print NEW_FILE $_ unless $skip; + } } - push @lines, <FILE>; - open(FILE,">$name") or die "Can't modify $name"; - print FILE @lines; - close(FILE); + + close OLD_FILE if defined($start); + close NEW_FILE; + return update_file($file); } ### Main @@ -291,7 +320,7 @@ my %errors = GET_ERROR_NAMES(); ### Create server_protocol.h and print header -open SERVER_PROT, ">include/wine/server_protocol.h" or die "Cannot create include/wine/server_protocol.h"; +open SERVER_PROT, ">include/wine/server_protocol.h.new" or die "Cannot create include/wine/server_protocol.h.new"; print SERVER_PROT "/*\n * Wine server protocol definitions\n *\n"; print SERVER_PROT " * This file is automatically generated; DO NO EDIT!\n"; print SERVER_PROT " * Edit server/protocol.def instead and re-run tools/make_requests\n"; @@ -324,6 +353,7 @@ print SERVER_PROT "};\n\n"; printf SERVER_PROT "#define SERVER_PROTOCOL_VERSION %d\n\n", $protocol + 1; print SERVER_PROT "#endif /* __WINE_WINE_SERVER_PROTOCOL_H */\n"; close SERVER_PROT; +update_file( "include/wine/server_protocol.h" ); ### Output the dumping function tables @@ -360,7 +390,10 @@ foreach my $err (sort keys %errors) push @trace_lines, " { NULL, 0 }\n"; push @trace_lines, "};\n"; -REPLACE_IN_FILE( "server/trace.c", @trace_lines ); +replace_in_file( "server/trace.c", + "### make_requests begin ###", + "### make_requests end ###", + @trace_lines ); ### Output the request handlers list @@ -376,4 +409,7 @@ foreach my $req (@requests) } push @request_lines, "};\n#endif /* WANT_REQUEST_HANDLERS */\n"; -REPLACE_IN_FILE( "server/request.h", @request_lines ); +replace_in_file( "server/request.h", + "### make_requests begin ###", + "### make_requests end ###", + @request_lines );

1 0

Alexandre Julliard : server: Windows properties are actually generic params , not handles.
by Alexandre Julliard 11 Dec '08

11 Dec '08

Module: wine Branch: master Commit: 517b2f624d2f10d737b1365c76692f3e2e9ca59c URL: http://source.winehq.org/git/wine.git/?a=commit;h=517b2f624d2f10d737b1365c7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 10 16:21:32 2008 +0100 server: Windows properties are actually generic params, not handles. --- dlls/user32/property.c | 22 +++++++++++----------- include/wine/server_protocol.h | 8 ++++---- server/protocol.def | 8 ++++---- server/trace.c | 10 +++++----- server/window.c | 30 +++++++++++++++--------------- 5 files changed, 39 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=517b2f624d2f10d737b13…

1 0

Alexandre Julliard : server: Define an lparam_t type for message parameters that can hold all sorts of data .
by Alexandre Julliard 11 Dec '08

11 Dec '08

Module: wine Branch: master Commit: 31282b3f63077a319e8a520a814b2ada172bcddb URL: http://source.winehq.org/git/wine.git/?a=commit;h=31282b3f63077a319e8a520a8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 10 16:01:50 2008 +0100 server: Define an lparam_t type for message parameters that can hold all sorts of data. --- include/wine/server_protocol.h | 45 ++++++++++++++++++++------------------- server/protocol.def | 45 ++++++++++++++++++++------------------- server/queue.c | 26 ++++++++++------------ server/sock.c | 4 +- server/user.h | 2 +- server/window.c | 2 +- tools/make_requests | 1 + 7 files changed, 63 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=31282b3f63077a319e8a5…

1 0

Alexandre Julliard : Get rid of the 1.0.1 task list.
by Alexandre Julliard 11 Dec '08

11 Dec '08

Module: bugzilla Branch: master Commit: b3ecd5793b73fabadea3fbbb926fea979117d8f4 URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=b3ecd5793b73fabadea3f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 11 11:45:28 2008 +0100 Get rid of the 1.0.1 task list. --- template/en/default/global/sidebar.html.tmpl | 1 - template/en/default/index.html.tmpl | 4 ---- 2 files changed, 0 insertions(+), 5 deletions(-) diff --git a/template/en/default/global/sidebar.html.tmpl b/template/en/default/global/sidebar.html.tmpl index 5e46559..4c19f78 100644 --- a/template/en/default/global/sidebar.html.tmpl +++ b/template/en/default/global/sidebar.html.tmpl @@ -23,7 +23,6 @@ [% INCLUDE global/menu_start.html.tmpl bt = 'Task Lists' %] - <li><a href="buglist.cgi?product=Wine&target_milestone=1.0.1&order=bugs.bug_severity">Wine 1.0.1</a></li> <li><a href="buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=Wine&target_milestone=1.2.0&order=bugs.bug_severity">Wine 1.2</a></li> <li><a href="buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=Wine&keywords=regression&keywords_type=anywords">Regressions</a></li> <li><a href="buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=Wine&keywords=tasklist&keywords_type=anywords">Tasklist</a></li> diff --git a/template/en/default/index.html.tmpl b/template/en/default/index.html.tmpl index f4fac45..6a44c03 100644 --- a/template/en/default/index.html.tmpl +++ b/template/en/default/index.html.tmpl @@ -168,10 +168,6 @@ function addSidebar() { The bugs we are currently working on are organized into Task lists. <ol class="wine_index_list"> - <li><a href="http://bugs.winehq.org/buglist.cgi?product=Wine&target_milestone=1.0.1&…">Wine 1.0.1</a> - These bugs are scheduled to be backported to the stable Wine 1.0 Tree, before Wine 1.0.1 is released. - </li> - <li><a href="http://bugs.winehq.org/buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&a…">Wine 1.2</a> These bugs are scheduled to be fixed before Wine 1.2 is released. </li>

1 0

Marcus Meissner : download: updated opensuse version list
by Jeremy Newman 10 Dec '08

10 Dec '08

Module: website Branch: master Commit: dcbcca9380438438874da1c3360dea19d59fcf73 URL: http://source.winehq.org/git/website.git/?a=commit;h=dcbcca9380438438874da1… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Dec 9 23:58:56 2008 +0100 download: updated opensuse version list --- templates/en/download.template | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/en/download.template b/templates/en/download.template index eb8cd18..066d0ff 100644 --- a/templates/en/download.template +++ b/templates/en/download.template @@ -110,8 +110,8 @@ for post-installation instructions. <img src="{$root}/images/distro/suse.png" width="50" height="50" alt="SUSE Linux" border="0"></a> </td> <td> <a href="http://en.opensuse.org/Wine#Repositories">SUSE</a> - release binary and source .rpms and daily snapshot RPMs for SUSE Linux 10.1, openSUSE 10.2, 10.3 and 11.0. - Old versions available on <a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=7…">SourceForge</a> + release binary and source .rpms and daily snapshot RPMs for openSUSE 10.3, 11.0, 11.1 and SLES 9 and SLE 10. + Old package versions available on <a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=7…">SourceForge</a> </td> <td><a href="mailto:meissner@suse.de">Marcus Meissner</a></td> </tr>

1 0

Jeremy Newman : moving documentation downloads to the FTP site
by Jeremy Newman 10 Dec '08

10 Dec '08

Module: website Branch: master Commit: d2025afefdb413871a1a6c86924eba4e60bf1270 URL: http://source.winehq.org/git/website.git/?a=commit;h=d2025afefdb413871a1a6c… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed Dec 10 10:32:45 2008 -0600 moving documentation downloads to the FTP site --- templates/en/documentation.template | 60 +++++++++++++++++----------------- 1 files changed, 30 insertions(+), 30 deletions(-) diff --git a/templates/en/documentation.template b/templates/en/documentation.template index fc81638..01e35d0 100644 --- a/templates/en/documentation.template +++ b/templates/en/documentation.template @@ -6,46 +6,46 @@ <h2>Guides</h2> <ul> <li> - <a href="{$root}/site/docs/wineusr-guide/index">Wine User Guide</a> + <a href="{$root}/docs/wineusr-guide/index">Wine User Guide</a> How to use and configure Wine for running Windows applications.    formats: - <a href="{$root}/site/docs/wineusr-guide/index">Online</a> | - <a href="/docs/en/wineusr-guide.html">HTML</a> | - <a href="/docs/en/wineusr-guide.pdf">PDF</a> | - <a href="/docs/en/wineusr-guide.ps">PostScript</a> - + <a href="{$root}/docs/wineusr-guide/index">Online</a> | + <a href="http://ftp.winehq.org/pub/wine/docs/en/wineusr-guide.html">HTML</a> | + <a href="http://ftp.winehq.org/pub/wine/docs/en/wineusr-guide.pdf">PDF</a> | + <a href="http://ftp.winehq.org/pub/wine/docs/en/wineusr-guide.ps">PostScript</a> + </li> <li> - <a href="{$root}/site/docs/winelib-guide/index">Winelib User Guide</a> + <a href="{$root}/docs/winelib-guide/index">Winelib User Guide</a> How to use Wine to port Windows applications to Linux.    formats: - <a href="{$root}/site/docs/winelib-guide/index">Online</a> | - <a href="/docs/en/winelib-guide.html">HTML</a> | - <a href="/docs/en/winelib-guide.pdf">PDF</a> | - <a href="/docs/en/winelib-guide.ps">PostScript</a> - + <a href="{$root}/docs/winelib-guide/index">Online</a> | + <a href="http://ftp.winehq.org/pub/wine/docs/en/winelib-guide.html">HTML</a> | + <a href="http://ftp.winehq.org/pub/wine/docs/en/winelib-guide.pdf">PDF</a> | + <a href="http://ftp.winehq.org/pub/wine/docs/en/winelib-guide.ps">PostScript</a> + </li> <li> - <a href="{$root}/site/docs/winedev-guide/index">Wine Developers Guide</a> + <a href="{$root}/docs/winedev-guide/index">Wine Developers Guide</a> How to hack on Wine.    formats: - <a href="{$root}/site/docs/winedev-guide/index">Online</a> | - <a href="/docs/en/winedev-guide.html">HTML</a> | - <a href="/docs/en/winedev-guide.pdf">PDF</a> | - <a href="/docs/en/winedev-guide.ps">PostScript</a> - + <a href="{$root}/docs/winedev-guide/index">Online</a> | + <a href="http://ftp.winehq.org/pub/wine/docs/en/winedev-guide.html">HTML</a> | + <a href="http://ftp.winehq.org/pub/wine/docs/en/winedev-guide.pdf">PDF</a> | + <a href="http://ftp.winehq.org/pub/wine/docs/en/winedev-guide.ps">PostScript</a> + </li> <li> - <a href="{$root}/site/howto">How to help get applications + <a href="{$root}/howto">How to help get applications working in Wine</a> A short guide for those who want to help us make things work. </li> <li> - <a href="{$root}/site/developer-cheatsheet">Getting started with Wine + <a href="{$root}/developer-cheatsheet">Getting started with Wine development</a> A crash course in Wine development and debugging. </li> @@ -54,34 +54,34 @@ <h2>Man Pages</h2> <ul> - <li><a href="{$root}/site/docs/wine">wine man page</a> + <li><a href="{$root}/docs/wine">wine man page</a> Command line options for the wine binary.</li> - <li><a href="{$root}/site/docs/wineserver">wineserver man page</a> + <li><a href="{$root}/docs/wineserver">wineserver man page</a> Command line options for the wineserver binary.</li> - <li><a href="{$root}/site/docs/wineprefixcreate">wineprefixcreate man page</a> + <li><a href="{$root}/docs/wineprefixcreate">wineprefixcreate man page</a> Command line options for the wineprefixcreate tool.</li> - <li><a href="{$root}/site/docs/winebuild">winebuild man page</a> + <li><a href="{$root}/docs/winebuild">winebuild man page</a> Command line options for the winebuild binary.</li> - <li><a href="{$root}/site/docs/winedump">winedump man page</a> + <li><a href="{$root}/docs/winedump">winedump man page</a> Command line options for the winedump binary.</li> - <li><a href="{$root}/site/docs/winemaker">winemaker man page</a> + <li><a href="{$root}/docs/winemaker">winemaker man page</a> Command line options for the winemaker binary.</li> - <li><a href="{$root}/site/docs/widl">widl man page</a> + <li><a href="{$root}/docs/widl">widl man page</a> Command line options for the IDL compiler.</li> - <li><a href="{$root}/site/docs/wmc">wmc man page</a> + <li><a href="{$root}/docs/wmc">wmc man page</a> Command line options for the message compiler.</li> - <li><a href="{$root}/site/docs/wrc">wrc man page</a> + <li><a href="{$root}/docs/wrc">wrc man page</a> Command line options for the resource compiler.</li> - <li><a href="{$root}/site/docs/winegcc">winegcc man page</a> + <li><a href="{$root}/docs/winegcc">winegcc man page</a> Command line options for the winegcc compiler.</li> </ul>

1 0

Paul Vriens : riched20/tests: Remove the todo_wine logic where appropriate.
by Alexandre Julliard 10 Dec '08

10 Dec '08

Module: wine Branch: master Commit: 696512b6cb7912b555a64245f3a3b44b98ad6268 URL: http://source.winehq.org/git/wine.git/?a=commit;h=696512b6cb7912b555a64245f… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Dec 10 11:30:36 2008 +0100 riched20/tests: Remove the todo_wine logic where appropriate. --- dlls/riched20/tests/editor.c | 100 +++++++++++++++++++---------------------- 1 files changed, 46 insertions(+), 54 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index bc93899..f4f5f1b 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -148,80 +148,79 @@ struct find_s { const char *needle; int flags; int expected_loc; - int _todo_wine; }; struct find_s find_tests[] = { /* Find in empty text */ - {0, -1, "foo", FR_DOWN, -1, 0}, - {0, -1, "foo", 0, -1, 0}, - {0, -1, "", FR_DOWN, -1, 0}, - {20, 5, "foo", FR_DOWN, -1, 0}, - {5, 20, "foo", FR_DOWN, -1, 0} + {0, -1, "foo", FR_DOWN, -1}, + {0, -1, "foo", 0, -1}, + {0, -1, "", FR_DOWN, -1}, + {20, 5, "foo", FR_DOWN, -1}, + {5, 20, "foo", FR_DOWN, -1} }; struct find_s find_tests2[] = { /* No-result find */ - {0, -1, "foo", FR_DOWN | FR_MATCHCASE, -1, 0}, - {5, 20, "WINE", FR_DOWN | FR_MATCHCASE, -1, 0}, + {0, -1, "foo", FR_DOWN | FR_MATCHCASE, -1}, + {5, 20, "WINE", FR_DOWN | FR_MATCHCASE, -1}, /* Subsequent finds */ - {0, -1, "Wine", FR_DOWN | FR_MATCHCASE, 4, 0}, - {5, 31, "Wine", FR_DOWN | FR_MATCHCASE, 13, 0}, - {14, 31, "Wine", FR_DOWN | FR_MATCHCASE, 23, 0}, - {24, 31, "Wine", FR_DOWN | FR_MATCHCASE, 27, 0}, + {0, -1, "Wine", FR_DOWN | FR_MATCHCASE, 4}, + {5, 31, "Wine", FR_DOWN | FR_MATCHCASE, 13}, + {14, 31, "Wine", FR_DOWN | FR_MATCHCASE, 23}, + {24, 31, "Wine", FR_DOWN | FR_MATCHCASE, 27}, /* Find backwards */ - {19, 20, "Wine", FR_MATCHCASE, 13, 0}, - {10, 20, "Wine", FR_MATCHCASE, 4, 0}, - {20, 10, "Wine", FR_MATCHCASE, 13, 0}, + {19, 20, "Wine", FR_MATCHCASE, 13}, + {10, 20, "Wine", FR_MATCHCASE, 4}, + {20, 10, "Wine", FR_MATCHCASE, 13}, /* Case-insensitive */ - {1, 31, "wInE", FR_DOWN, 4, 0}, - {1, 31, "Wine", FR_DOWN, 4, 0}, + {1, 31, "wInE", FR_DOWN, 4}, + {1, 31, "Wine", FR_DOWN, 4}, /* High-to-low ranges */ - {20, 5, "Wine", FR_DOWN, -1, 0}, - {2, 1, "Wine", FR_DOWN, -1, 0}, - {30, 29, "Wine", FR_DOWN, -1, 0}, - {20, 5, "Wine", 0, 13, 0}, + {20, 5, "Wine", FR_DOWN, -1}, + {2, 1, "Wine", FR_DOWN, -1}, + {30, 29, "Wine", FR_DOWN, -1}, + {20, 5, "Wine", 0, 13}, /* Find nothing */ - {5, 10, "", FR_DOWN, -1, 0}, - {10, 5, "", FR_DOWN, -1, 0}, - {0, -1, "", FR_DOWN, -1, 0}, - {10, 5, "", 0, -1, 0}, + {5, 10, "", FR_DOWN, -1}, + {10, 5, "", FR_DOWN, -1}, + {0, -1, "", FR_DOWN, -1}, + {10, 5, "", 0, -1}, /* Whole-word search */ - {0, -1, "wine", FR_DOWN | FR_WHOLEWORD, 18, 0}, - {0, -1, "win", FR_DOWN | FR_WHOLEWORD, -1, 0}, - {13, -1, "wine", FR_DOWN | FR_WHOLEWORD, 18, 0}, - {0, -1, "winewine", FR_DOWN | FR_WHOLEWORD, 0, 0}, - {10, -1, "winewine", FR_DOWN | FR_WHOLEWORD, 23, 0}, - {11, -1, "winewine", FR_WHOLEWORD, 0, 0}, - {31, -1, "winewine", FR_WHOLEWORD, 23, 0}, + {0, -1, "wine", FR_DOWN | FR_WHOLEWORD, 18}, + {0, -1, "win", FR_DOWN | FR_WHOLEWORD, -1}, + {13, -1, "wine", FR_DOWN | FR_WHOLEWORD, 18}, + {0, -1, "winewine", FR_DOWN | FR_WHOLEWORD, 0}, + {10, -1, "winewine", FR_DOWN | FR_WHOLEWORD, 23}, + {11, -1, "winewine", FR_WHOLEWORD, 0}, + {31, -1, "winewine", FR_WHOLEWORD, 23}, /* Bad ranges */ - {5, 200, "XXX", FR_DOWN, -1, 0}, - {-20, 20, "Wine", FR_DOWN, -1, 0}, - {-20, 20, "Wine", FR_DOWN, -1, 0}, - {-15, -20, "Wine", FR_DOWN, -1, 0}, - {1<<12, 1<<13, "Wine", FR_DOWN, -1, 0}, + {5, 200, "XXX", FR_DOWN, -1}, + {-20, 20, "Wine", FR_DOWN, -1}, + {-20, 20, "Wine", FR_DOWN, -1}, + {-15, -20, "Wine", FR_DOWN, -1}, + {1<<12, 1<<13, "Wine", FR_DOWN, -1}, /* Check the case noted in bug 4479 where matches at end aren't recognized */ - {23, 31, "Wine", FR_DOWN | FR_MATCHCASE, 23, 0}, - {27, 31, "Wine", FR_DOWN | FR_MATCHCASE, 27, 0}, - {27, 32, "Wine", FR_DOWN | FR_MATCHCASE, 27, 0}, - {13, 31, "WineWine", FR_DOWN | FR_MATCHCASE, 23, 0}, - {13, 32, "WineWine", FR_DOWN | FR_MATCHCASE, 23, 0}, + {23, 31, "Wine", FR_DOWN | FR_MATCHCASE, 23}, + {27, 31, "Wine", FR_DOWN | FR_MATCHCASE, 27}, + {27, 32, "Wine", FR_DOWN | FR_MATCHCASE, 27}, + {13, 31, "WineWine", FR_DOWN | FR_MATCHCASE, 23}, + {13, 32, "WineWine", FR_DOWN | FR_MATCHCASE, 23}, /* The backwards case of bug 4479; bounds look right * Fails because backward find is wrong */ - {19, 20, "WINE", FR_MATCHCASE, 0, 0}, - {0, 20, "WINE", FR_MATCHCASE, -1, 0}, + {19, 20, "WINE", FR_MATCHCASE, 0}, + {0, 20, "WINE", FR_MATCHCASE, -1}, - {0, -1, "wineWine wine", 0, -1, 0}, + {0, -1, "wineWine wine", 0, -1}, }; static void check_EM_FINDTEXT(HWND hwnd, const char *name, struct find_s *f, int id) { @@ -267,15 +266,8 @@ static void run_tests_EM_FINDTEXT(HWND hwnd, const char *name, struct find_s *fi int i; for (i = 0; i < num_tests; i++) { - if (find[i]._todo_wine) { - todo_wine { - check_EM_FINDTEXT(hwnd, name, &find[i], i); - check_EM_FINDTEXTEX(hwnd, name, &find[i], i); - } - } else { - check_EM_FINDTEXT(hwnd, name, &find[i], i); - check_EM_FINDTEXTEX(hwnd, name, &find[i], i); - } + check_EM_FINDTEXT(hwnd, name, &find[i], i); + check_EM_FINDTEXTEX(hwnd, name, &find[i], i); } }

1 0

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 December 2008