August 2006 - Wine-commits - list.winehq.org

Tag wine-0.9.19 : Alexandre Julliard : Release 0.9.19
by Alexandre Julliard 10 Aug '06

10 Aug '06

Module: wine Branch: refs/tags/wine-0.9.19 Tag: 9db90833b4968f0d0221d32d28d523a6c932c21c URL: http://source.winehq.org/git/?p=wine.git;a=tag;h=9db90833b4968f0d0221d32d28… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 10 15:15:12 2006 +0200 Release 0.9.19

1 0

Alexandre Julliard : Release 0.9.19.
by Alexandre Julliard 10 Aug '06

10 Aug '06

Module: wine Branch: refs/heads/master Commit: 50906e81397d9a94c9086a0597b06c1631c7026b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=50906e81397d9a94c9086a0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 10 15:15:12 2006 +0200 Release 0.9.19. --- ANNOUNCE | 16 - ChangeLog | 1911 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ VERSION | 2 configure | 18 - 4 files changed, 1929 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=50906e81397d9a94c90…

1 0

Colin Pitrat : tools: Check for open return code in Perl scripts.
by Alexandre Julliard 10 Aug '06

10 Aug '06

Module: wine Branch: refs/heads/master Commit: ab2cdead77c0aa9c93462c4813c209a7f72a12fc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ab2cdead77c0aa9c93462c4… Author: Colin Pitrat <colin.pitrat(a)bull.net> Date: Tue Aug 8 12:19:31 2006 +0200 tools: Check for open return code in Perl scripts. --- tools/bug_report.pl | 6 +++--- tools/make_authors | 2 +- tools/winapi/config.pm | 2 +- tools/winapi/make_filter | 2 +- tools/winapi/msvcmaker | 4 ++-- tools/winapi/nativeapi.pm | 6 +++--- tools/winapi/winapi_check | 2 +- tools/winapi/winapi_extract | 8 ++++---- tools/winapi/winapi_fixup | 2 +- tools/winapi/winapi_module_user.pm | 2 +- tools/winapi/winapi_test | 4 ++-- tools/winedump/function_grep.pl | 2 +- 12 files changed, 21 insertions(+), 21 deletions(-) diff --git a/tools/bug_report.pl b/tools/bug_report.pl index 48afda7..18f180c 100755 --- a/tools/bug_report.pl +++ b/tools/bug_report.pl @@ -45,7 +45,7 @@ sub do_var($) { $var =~ s/\t//g; return $var; } -open STDERR, ">&SAVEERR"; open STDERR, ">&STDOUT"; +open(STDERR, ">&SAVEERR"); open(STDERR, ">&STDOUT"); $ENV{'SHELL'}="/bin/bash"; my $var0 = qq{ What is your level of Wine expertise? 1-newbie 2-intermediate 3-advanced @@ -530,7 +530,7 @@ elsif ($outfile ne "no file" and $dbgout } } unlink($tmpoutfile); - open(OUTFILE, "$outfile"); + open(OUTFILE, "$outfile") || die "Error: Can't open $outfile: $!\n"; while (<OUTFILE>) { $lastlines .= $_; } @@ -550,7 +550,7 @@ else { system("$wineloc WINEDEBUG=$debugopts $extraops \"$program\""); } sub generate_outfile() { -open(OUTFILE,">$outfile"); +open(OUTFILE,">$outfile") || die "Error: Can't open $outfile: $!\n"; print OUTFILE <<EOM; Auto-generated debug report by Wine Quick Debug Report Maker Tool: WINE Version: $winever diff --git a/tools/make_authors b/tools/make_authors index 806b207..eeaba02 100755 --- a/tools/make_authors +++ b/tools/make_authors @@ -22,7 +22,7 @@ use strict; my @authors; open(AUTHORS,"<AUTHORS") or die "Can't open AUTHORS"; -open(NEWAUTHORS,">AUTHORS.new"); +open(NEWAUTHORS,">AUTHORS.new") or die "Can't open AUTHORS.new"; while(<AUTHORS>) { print NEWAUTHORS; diff --git a/tools/winapi/config.pm b/tools/winapi/config.pm index 58636df..b652e49 100644 --- a/tools/winapi/config.pm +++ b/tools/winapi/config.pm @@ -155,7 +155,7 @@ sub _get_files($$;$) { my @dirs = ($dir); while(defined(my $dir = shift @dirs)) { - opendir(DIR, $dir); + opendir(DIR, $dir) || die "Can't open directory $dir: $!\n"; my @entries= readdir(DIR); closedir(DIR); foreach (@entries) { diff --git a/tools/winapi/make_filter b/tools/winapi/make_filter index e427f8d..45665de 100755 --- a/tools/winapi/make_filter +++ b/tools/winapi/make_filter @@ -44,7 +44,7 @@ # main ######################################################################## my $command = $options->make . " " . join(" ", $options->arguments); -open(IN, "($command) 2>&1 |"); +open(IN, "($command) 2>&1 |") || die "Cannot execute command $command: $!"; while(<IN>) { chomp; diff --git a/tools/winapi/msvcmaker b/tools/winapi/msvcmaker index 53c37fb..31bdc93 100755 --- a/tools/winapi/msvcmaker +++ b/tools/winapi/msvcmaker @@ -45,7 +45,7 @@ sub read_spec_file($) { my $type = "win32"; - open(IN, "< $wine_dir/$spec_file"); + open(IN, "< $wine_dir/$spec_file") || die "Error: Can't open $wine_dir/$spec_file: $!\n"; my $header = 1; my $lookahead = 0; @@ -115,7 +115,7 @@ sub filter_files($$) { my %wine_test_dsp_files; MAKEFILE_IN: foreach my $makefile_in_file (@makefile_in_files) { - open(IN, "< $wine_dir/$makefile_in_file"); + open(IN, "< $wine_dir/$makefile_in_file") || die "Error: Can't open $wine_dir/$makefile_in_file: $!\n"; my $topobjdir; my $module; diff --git a/tools/winapi/nativeapi.pm b/tools/winapi/nativeapi.pm index 9f6a354..78b6ec9 100644 --- a/tools/winapi/nativeapi.pm +++ b/tools/winapi/nativeapi.pm @@ -59,7 +59,7 @@ sub new($) { $output->progress("$api_file"); - open(IN, "< $api_file"); + open(IN, "< $api_file") || die "Error: Can't open $api_file: $!\n"; local $/ = "\n"; while(<IN>) { s/^\s*(.*?)\s*$/$1/; # remove whitespace at begin and end of line @@ -73,7 +73,7 @@ sub new($) { $output->progress("$configure_ac_file"); my $again = 0; - open(IN, "< $configure_ac_file"); + open(IN, "< $configure_ac_file") || die "Error: Can't open $configure_ac_file: $!\n"; local $/ = "\n"; while($again || (defined($_ = <IN>))) { $again = 0; @@ -141,7 +141,7 @@ sub new($) { $output->progress("$config_h_in_file"); - open(IN, "< $config_h_in_file"); + open(IN, "< $config_h_in_file") || die "Error: Can't open $config_h_in_file: $!\n"; local $/ = "\n"; while(<IN>) { # remove leading and trailing whitespace diff --git a/tools/winapi/winapi_check b/tools/winapi/winapi_check index 89534d1..61a0635 100755 --- a/tools/winapi/winapi_check +++ b/tools/winapi/winapi_check @@ -82,7 +82,7 @@ if ($options->global) { $include2info{$file} = { name => $file }; - open(IN, "< $wine_dir/$file"); + open(IN, "< $wine_dir/$file") || die "Error: Can't open $wine_dir/$file: $!\n"; while(<IN>) { if(/^\s*\#\s*include\s*\"(.*?)\"/) { my $header = $1; diff --git a/tools/winapi/winapi_extract b/tools/winapi/winapi_extract index a11a91b..7c4a394 100755 --- a/tools/winapi/winapi_extract +++ b/tools/winapi/winapi_extract @@ -63,7 +63,7 @@ if($options->spec_files || $options->win my $type = "win32"; - open(IN, "< $wine_dir/$spec_file"); + open(IN, "< $wine_dir/$spec_file") || die "Error: Can't open $wine_dir/$spec_file: $!\n"; my $header = 1; my $lookahead = 0; @@ -210,7 +210,7 @@ foreach my $file (@h_files, @c_files) { $progress_current++; { - open(IN, "< $file"); + open(IN, "< $file") || die "Error: Can't open $file: $!\n"; local $/ = undef; $_ = <IN>; close(IN); @@ -463,7 +463,7 @@ if($options->spec_files) { $spec_file .= "2"; $output->progress("$spec_file"); - open(OUT, "> $wine_dir/$spec_file"); + open(OUT, "> $wine_dir/$spec_file") || die "Error: Can't open $wine_dir/$spec_file: $!\n"; if(exists($specifications{$module}{init})) { my $function = $specifications{$module}{init}{function}; @@ -666,7 +666,7 @@ if($options->winetest) { next if $external_name eq "\@"; if($n == 0) { - open(OUT, "> $wine_dir/programs/winetest/include/${package}.pm"); + open(OUT, "> $wine_dir/programs/winetest/include/${package}.pm") || die "Error: Can't open $wine_dir/programs/winetest/include/${package}.pm: $!\n"; print OUT "package ${package};\n"; print OUT "\n"; diff --git a/tools/winapi/winapi_fixup b/tools/winapi/winapi_fixup index 2354723..334aa52 100755 --- a/tools/winapi/winapi_fixup +++ b/tools/winapi/winapi_fixup @@ -61,7 +61,7 @@ foreach my $file (@c_files) { $output->prefix("$file:"); { - open(IN, "< $file"); + open(IN, "< $file") || die "Error: Can't open $file: $!\n"; local $/ = undef; $_ = <IN>; close(IN); diff --git a/tools/winapi/winapi_module_user.pm b/tools/winapi/winapi_module_user.pm index 0980085..ef14453 100644 --- a/tools/winapi/winapi_module_user.pm +++ b/tools/winapi/winapi_module_user.pm @@ -626,7 +626,7 @@ sub _parse_file($$$) { my $found_comment = shift; { - open(IN, "< $file"); + open(IN, "< $file") || die "Error: Can't open $file: $!\n"; local $/ = undef; $_ = <IN>; close(IN); diff --git a/tools/winapi/winapi_test b/tools/winapi/winapi_test index 3e4b97e..db95c36 100755 --- a/tools/winapi/winapi_test +++ b/tools/winapi/winapi_test @@ -81,7 +81,7 @@ if (0) { $file .= "2"; # FIXME: For tests - open(OUT, "> $winapi_dir/$file") || die "$winapi_dir/$file: $!\n"; + open(OUT, "> $winapi_dir/$file") || die "Error: Can't open $winapi_dir/$file: $!\n"; my $x = 0; my @test_dirs = $tests->get_test_dirs(); @@ -337,7 +337,7 @@ foreach my $file (@files) { $progress_current++; { - open(IN, "< $wine_dir/$file"); + open(IN, "< $wine_dir/$file") || die "Error: Can't open $wine_dir/$file: $!\n"; local $/ = undef; $_ = <IN>; close(IN); diff --git a/tools/winedump/function_grep.pl b/tools/winedump/function_grep.pl index 5a34526..60e5677 100755 --- a/tools/winedump/function_grep.pl +++ b/tools/winedump/function_grep.pl @@ -54,7 +54,7 @@ if (defined $usage) } foreach my $file (@files) { - open(IN, "< $file"); + open(IN, "< $file") || die "Error: Can't open $file: $!\n"; my $level = 0; my $extern_c = 0;

1 0

Ken Myers : riched20: Implement EM_EXLIMITTEXT, EM_GETLIMITTEXT and tests.
by Alexandre Julliard 10 Aug '06

10 Aug '06

Module: wine Branch: refs/heads/master Commit: 13e4ddd2df498f1acf54d16f320712a08ad0df3a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=13e4ddd2df498f1acf54d16… Author: Ken Myers <kmyers(a)ucla.edu> Date: Wed Aug 9 15:33:42 2006 -0400 riched20: Implement EM_EXLIMITTEXT, EM_GETLIMITTEXT and tests. --- dlls/riched20/caret.c | 4 ++ dlls/riched20/editor.c | 23 +++++++++-- dlls/riched20/editstr.h | 1 dlls/riched20/tests/editor.c | 92 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 116 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index ff6ff00..bdab179 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -383,6 +383,9 @@ void ME_InsertTextFromCursor(ME_TextEdit { const WCHAR *pos; ME_Cursor *p = NULL; + /* FIXME: is this too slow? */ + /* Didn't affect performance for WM_SETTEXT (around 50sec/30K) */ + int freeSpace = editor->nTextLimit - ME_GetTextLength(editor); assert(style); @@ -393,6 +396,7 @@ void ME_InsertTextFromCursor(ME_TextEdit assert(nCursor>=0 && nCursor<editor->nCursors); if (len == -1) len = lstrlenW(str); + len = min(len, freeSpace); while (len) { pos = str; diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 28f371a..1098618 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -32,7 +32,7 @@ - EM_DISPLAYBAND + EM_EMPTYUNDOBUFFER + EM_EXGETSEL - - EM_EXLIMITTEXT + + EM_EXLIMITTEXT + EM_EXLINEFROMCHAR + EM_EXSETSEL + EM_FINDTEXT (only FR_DOWN flag implemented) @@ -51,7 +51,7 @@ - EM_GETIMEOPTIONS 1.0asian - EM_GETIMESTATUS - EM_GETLANGOPTIONS 2.0 - - EM_GETLIMITTEXT + + EM_GETLIMITTEXT + EM_GETLINE + EM_GETLINECOUNT returns number of rows, not of paragraphs + EM_GETMODIFY @@ -232,6 +232,8 @@ #include "rtf.h" #define STACK_SIZE_DEFAULT 100 #define STACK_SIZE_MAX 1000 + +#define TEXT_LIMIT_DEFAULT 32767 WINE_DEFAULT_DEBUG_CHANNEL(richedit); @@ -1124,6 +1126,7 @@ ME_TextEditor *ME_MakeEditor(HWND hWnd) ed->bCaretAtEnd = FALSE; ed->nEventMask = 0; ed->nModifyStep = 0; + ed->nTextLimit = TEXT_LIMIT_DEFAULT; ed->pUndoStack = ed->pRedoStack = ed->pUndoStackBottom = NULL; ed->nUndoStackSize = 0; ed->nUndoLimit = STACK_SIZE_DEFAULT; @@ -1420,7 +1423,6 @@ LRESULT WINAPI RichEditANSIWndProc(HWND switch(msg) { UNSUPPORTED_MSG(EM_DISPLAYBAND) - UNSUPPORTED_MSG(EM_EXLIMITTEXT) UNSUPPORTED_MSG(EM_FINDWORDBREAK) UNSUPPORTED_MSG(EM_FMTLINES) UNSUPPORTED_MSG(EM_FORMATRANGE) @@ -1429,7 +1431,6 @@ LRESULT WINAPI RichEditANSIWndProc(HWND UNSUPPORTED_MSG(EM_GETIMECOMPMODE) /* UNSUPPORTED_MSG(EM_GETIMESTATUS) missing in Wine headers */ UNSUPPORTED_MSG(EM_GETLANGOPTIONS) - UNSUPPORTED_MSG(EM_GETLIMITTEXT) /* UNSUPPORTED_MSG(EM_GETOLEINTERFACE) separate stub */ UNSUPPORTED_MSG(EM_GETREDONAME) UNSUPPORTED_MSG(EM_GETTEXTMODE) @@ -2194,6 +2195,20 @@ LRESULT WINAPI RichEditANSIWndProc(HWND TRACE("EM_LINELENGTH(%d)==%d\n",wParam, nChars); return nChars; } + case EM_EXLIMITTEXT: + { + if (wParam != 0 || lParam < 0) + return 0; + if (lParam == 0) + editor->nTextLimit = 65536; + else + editor->nTextLimit = (int) lParam; + return 0; + } + case EM_GETLIMITTEXT: + { + return editor->nTextLimit; + } case EM_FINDTEXT: { FINDTEXTA *ft = (FINDTEXTA *)lParam; diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index 1109175..f22717f 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -312,6 +312,7 @@ typedef struct tagME_TextEditor RECT rcFormat; BOOL bRedraw; int nInvalidOfs; + int nTextLimit; EDITWORDBREAKPROCW pfnWordBreak; LPRICHEDITOLECALLBACK lpOleCallback; /*TEXTMODE variable; contains only one of each of the following options: diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 5c1f7c1..7812f7d 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -972,6 +972,96 @@ #define MAX_BUF_LEN 1024 } +static void test_EM_EXLIMITTEXT(void) +{ + int i, selBegin, selEnd, len1, len2; + int BUFSIZE = 1024; + char text[BUFSIZE+1]; + int textlimit = 0; /* multiple of 100 */ + HWND hwndRichEdit = new_richedit(NULL); + + i = SendMessage(hwndRichEdit, EM_GETLIMITTEXT, 0, 0); + ok(32767 == i, "EM_EXLIMITTEXT: expected: %d, actual: %d\n", 32767, i); /* default */ + + textlimit = 256000; + SendMessage(hwndRichEdit, EM_EXLIMITTEXT, 0, textlimit); + i = SendMessage(hwndRichEdit, EM_GETLIMITTEXT, 0, 0); + /* set higher */ + ok(textlimit == i, "EM_EXLIMITTEXT: expected: %d, actual: %d\n", textlimit, i); + + textlimit = 1000; + SendMessage(hwndRichEdit, EM_EXLIMITTEXT, 0, textlimit); + i = SendMessage(hwndRichEdit, EM_GETLIMITTEXT, 0, 0); + /* set lower */ + ok(textlimit == i, "EM_EXLIMITTEXT: expected: %d, actual: %d\n", textlimit, i); + + SendMessage(hwndRichEdit, EM_EXLIMITTEXT, 0, 0); + i = SendMessage(hwndRichEdit, EM_GETLIMITTEXT, 0, 0); + /* default for WParam = 0 */ + ok(65536 == i, "EM_EXLIMITTEXT: expected: %d, actual: %d\n", 65536, i); + + textlimit = BUFSIZE; + memset(text, 'W', textlimit); + text[BUFSIZE] = 0; + SendMessage(hwndRichEdit, EM_EXLIMITTEXT, 0, textlimit); + /* maxed out text */ + SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) text); + + SendMessage(hwndRichEdit, EM_SETSEL, 0, -1); /* select everything */ + SendMessage(hwndRichEdit, EM_GETSEL, (WPARAM)&selBegin, (LPARAM)&selEnd); + len1 = selEnd - selBegin; + + SendMessage(hwndRichEdit, WM_KEYDOWN, VK_BACK, 1); + SendMessage(hwndRichEdit, WM_CHAR, VK_BACK, 1); + SendMessage(hwndRichEdit, WM_KEYUP, VK_BACK, 1); + SendMessage(hwndRichEdit, EM_SETSEL, 0, -1); + SendMessage(hwndRichEdit, EM_GETSEL, (WPARAM)&selBegin, (LPARAM)&selEnd); + len2 = selEnd - selBegin; + + ok(len1 != len2, + "EM_EXLIMITTEXT: Change Expected\nOld Length: %d, New Length: %d, Limit: %d\n", + len1,len2,i); + + SendMessage(hwndRichEdit, WM_KEYDOWN, 'A', 1); + SendMessage(hwndRichEdit, WM_CHAR, 'A', 1); + SendMessage(hwndRichEdit, WM_KEYUP, 'A', 1); + SendMessage(hwndRichEdit, EM_SETSEL, 0, -1); + SendMessage(hwndRichEdit, EM_GETSEL, (WPARAM)&selBegin, (LPARAM)&selEnd); + len1 = selEnd - selBegin; + + ok(len1 != len2, + "EM_EXLIMITTEXT: Change Expected\nOld Length: %d, New Length: %d, Limit: %d\n", + len1,len2,i); + + SendMessage(hwndRichEdit, WM_KEYDOWN, 'A', 1); + SendMessage(hwndRichEdit, WM_CHAR, 'A', 1); + SendMessage(hwndRichEdit, WM_KEYUP, 'A', 1); /* full; should be no effect */ + SendMessage(hwndRichEdit, EM_SETSEL, 0, -1); + SendMessage(hwndRichEdit, EM_GETSEL, (WPARAM)&selBegin, (LPARAM)&selEnd); + len2 = selEnd - selBegin; + + ok(len1 == len2, + "EM_EXLIMITTEXT: No Change Expected\nOld Length: %d, New Length: %d, Limit: %d\n", + len1,len2,i); + + DestroyWindow(hwndRichEdit); +} + +static void test_EM_GETLIMITTEXT(void) +{ + int i; + HWND hwndRichEdit = new_richedit(NULL); + + i = SendMessage(hwndRichEdit, EM_GETLIMITTEXT, 0, 0); + ok(32767 == i, "expected: %d, actual: %d\n", 32767, i); /* default value */ + + SendMessage(hwndRichEdit, EM_EXLIMITTEXT, 0, 50000); + i = SendMessage(hwndRichEdit, EM_GETLIMITTEXT, 0, 0); + ok(50000 == i, "expected: %d, actual: %d\n", 50000, i); + + DestroyWindow(hwndRichEdit); +} + START_TEST( editor ) { MSG msg; @@ -993,6 +1083,8 @@ START_TEST( editor ) test_EM_SETUNDOLIMIT(); test_ES_PASSWORD(); test_EM_SETTEXTEX(); + test_EM_EXLIMITTEXT(); + test_EM_GETLIMITTEXT(); /* Set the environment variable WINETEST_RICHED20 to keep windows * responsive and open for 30 seconds. This is useful for debugging.

1 0

Matt Finnicum : riched20: Add conformance tests for WM_SETFONT.
by Alexandre Julliard 10 Aug '06

10 Aug '06

Module: wine Branch: refs/heads/master Commit: 22bc001c08687eb0654debf27c57e49f3782c3db URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=22bc001c08687eb0654debf… Author: Matt Finnicum <mattfinn(a)gmail.com> Date: Wed Aug 9 16:01:47 2006 -0400 riched20: Add conformance tests for WM_SETFONT. --- dlls/riched20/editor.c | 2 + dlls/riched20/tests/editor.c | 62 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 1098618..bf406bf 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1875,7 +1875,7 @@ LRESULT WINAPI RichEditANSIWndProc(HWND BOOL bRepaint = LOWORD(lParam); if (!wParam) - wParam = (WPARAM)GetStockObject(DEFAULT_GUI_FONT); + wParam = (WPARAM)GetStockObject(SYSTEM_FONT); GetObjectW((HGDIOBJ)wParam, sizeof(LOGFONTW), &lf); hDC = GetDC(hWnd); ME_CharFormatFromLogFont(hDC, &lf, &fmt); diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 7812f7d..1e378dd 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -1062,6 +1062,67 @@ static void test_EM_GETLIMITTEXT(void) DestroyWindow(hwndRichEdit); } +static void test_WM_SETFONT() +{ + /* There is no invalid input or error conditions for this function. + * NULL wParam and lParam just fall back to their default values + * It should be noted that even if you use a gibberish name for your fonts + * here, it will still work because the name is stored. They will display as + * System, but will report their name to be whatever they were created as */ + + HWND hwndRichEdit = new_richedit(NULL); + HFONT testFont1 = CreateFontA (0,0,0,0,FW_LIGHT, 0, 0, 0, ANSI_CHARSET, + OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH | + FF_DONTCARE, "Marlett"); + HFONT testFont2 = CreateFontA (0,0,0,0,FW_LIGHT, 0, 0, 0, ANSI_CHARSET, + OUT_TT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH | + FF_DONTCARE, "MS Sans Serif"); + HFONT testFont3 = CreateFontA (0,0,0,0,FW_LIGHT, 0, 0, 0, ANSI_CHARSET, + OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH | + FF_DONTCARE, "Courier"); + LOGFONTA sentLogFont; + CHARFORMAT2A returnedCF2A; + + returnedCF2A.cbSize = sizeof(returnedCF2A); + + SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) "x"); + SendMessage(hwndRichEdit, WM_SETFONT, (WPARAM)testFont1,(LPARAM) MAKELONG((WORD) TRUE, 0)); + SendMessage(hwndRichEdit, EM_GETCHARFORMAT, SCF_DEFAULT, (LPARAM) &returnedCF2A); + + GetObjectA(testFont1, sizeof(LOGFONTA), &sentLogFont); + ok (!strcmp(sentLogFont.lfFaceName,returnedCF2A.szFaceName), + "EM_GETCHARFOMAT: Returned wrong font on test 1. Sent: %s, Returned: %s\n", + sentLogFont.lfFaceName,returnedCF2A.szFaceName); + + SendMessage(hwndRichEdit, WM_SETFONT, (WPARAM)testFont2,(LPARAM) MAKELONG((WORD) TRUE, 0)); + SendMessage(hwndRichEdit, EM_GETCHARFORMAT, SCF_DEFAULT, (LPARAM) &returnedCF2A); + GetObjectA(testFont2, sizeof(LOGFONTA), &sentLogFont); + ok (!strcmp(sentLogFont.lfFaceName,returnedCF2A.szFaceName), + "EM_GETCHARFOMAT: Returned wrong font on test 2. Sent: %s, Returned: %s\n", + sentLogFont.lfFaceName,returnedCF2A.szFaceName); + + SendMessage(hwndRichEdit, WM_SETFONT, (WPARAM)testFont3,(LPARAM) MAKELONG((WORD) TRUE, 0)); + SendMessage(hwndRichEdit, EM_GETCHARFORMAT, SCF_DEFAULT, (LPARAM) &returnedCF2A); + GetObjectA(testFont3, sizeof(LOGFONTA), &sentLogFont); + ok (!strcmp(sentLogFont.lfFaceName,returnedCF2A.szFaceName), + "EM_GETCHARFOMAT: Returned wrong font on test 3. Sent: %s, Returned: %s\n", + sentLogFont.lfFaceName,returnedCF2A.szFaceName); + + /* This last test is special since we send in NULL. We clear the variables + * and just compare to "System" instead of the sent in font name. */ + ZeroMemory(&returnedCF2A,sizeof(returnedCF2A)); + ZeroMemory(&sentLogFont,sizeof(sentLogFont)); + returnedCF2A.cbSize = sizeof(returnedCF2A); + + SendMessage(hwndRichEdit, WM_SETFONT, (WPARAM)NULL,(LPARAM) MAKELONG((WORD) TRUE, 0)); + SendMessage(hwndRichEdit, EM_GETCHARFORMAT, SCF_DEFAULT, (LPARAM) &returnedCF2A); + GetObjectA(NULL, sizeof(LOGFONTA), &sentLogFont); + ok (!strcmp("System",returnedCF2A.szFaceName), + "EM_GETCHARFOMAT: Returned wrong font on test 4. Sent: NULL, Returned: %s. Expected \"System\".\n",returnedCF2A.szFaceName); + + DestroyWindow(hwndRichEdit); +} + START_TEST( editor ) { MSG msg; @@ -1085,6 +1146,7 @@ START_TEST( editor ) test_EM_SETTEXTEX(); test_EM_EXLIMITTEXT(); test_EM_GETLIMITTEXT(); + test_WM_SETFONT(); /* Set the environment variable WINETEST_RICHED20 to keep windows * responsive and open for 30 seconds. This is useful for debugging.

1 0

Juan Lang : crypt32: Implement CryptRegisterDefaultOIDFunction and CryptUnregisterDefaultOIDFunction .
by Alexandre Julliard 10 Aug '06

10 Aug '06

Module: wine Branch: refs/heads/master Commit: 15f47b227e001cd9c03687ff815870b1e335905e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=15f47b227e001cd9c03687f… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Wed Aug 9 12:17:10 2006 -0700 crypt32: Implement CryptRegisterDefaultOIDFunction and CryptUnregisterDefaultOIDFunction. --- dlls/crypt32/oid.c | 244 +++++++++++++++++++++++++++++++++++++++++++--- dlls/crypt32/tests/oid.c | 88 +++++++++++++++++ 2 files changed, 316 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=15f47b227e001cd9c03…

1 0

Dan Hipschman : widl: Add ref_type (dereference typedefs) and use it.
by Alexandre Julliard 10 Aug '06

10 Aug '06

Module: wine Branch: refs/heads/master Commit: 216171fe523c053d4aa28f3e242f029d7632849d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=216171fe523c053d4aa28f3… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Wed Aug 9 14:20:35 2006 -0700 widl: Add ref_type (dereference typedefs) and use it. --- tools/widl/typegen.c | 62 ++++++++++++++++++++++++++++++-------------------- 1 files changed, 37 insertions(+), 25 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 190fae2..badf124 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -165,6 +165,14 @@ static inline int is_base_type(unsigned } } +static unsigned char ref_type(const type_t *type) +{ + while (type_has_ref(type)) + type = type->ref; + + return type->type; +} + static size_t write_procformatstring_var(FILE *file, int indent, const var_t *var, int is_return, unsigned int *type_offset) { @@ -374,6 +382,7 @@ static size_t write_conf_or_var_desc(FIL if (subexpr->type == EXPR_IDENTIFIER) { const type_t *correlation_variable = NULL; + unsigned char correlation_variable_type; unsigned char param_type = 0; const char *param_type_string = NULL; size_t offset; @@ -418,10 +427,9 @@ static size_t write_conf_or_var_desc(FIL correlation_type = RPC_FC_TOP_LEVEL_CONFORMANCE; } - while (type_has_ref(correlation_variable)) - correlation_variable = correlation_variable->ref; + correlation_variable_type = ref_type(correlation_variable); - switch (correlation_variable->type) + switch (correlation_variable_type) { case RPC_FC_CHAR: case RPC_FC_SMALL: @@ -452,7 +460,7 @@ static size_t write_conf_or_var_desc(FIL break; default: error("write_conf_or_var_desc: conformance variable type not supported 0x%x\n", - correlation_variable->type); + correlation_variable_type); } print_file(file, 2, "0x%x, /* Corr desc: %s%s */\n", @@ -710,18 +718,19 @@ static size_t write_string_tfs(FILE *fil size_t start_offset = *typestring_offset; unsigned char flags = 0; int pointer_type = get_attrv(attrs, ATTR_POINTERTYPE); + unsigned char rtype; + if (!pointer_type) pointer_type = RPC_FC_RP; if (!get_attrp(attrs, ATTR_SIZEIS)) flags |= RPC_FC_P_SIMPLEPOINTER; - while (type_has_ref(type)) - type = type->ref; + rtype = ref_type(type); - if ((type->type != RPC_FC_BYTE) && (type->type != RPC_FC_CHAR) && (type->type != RPC_FC_WCHAR)) + if ((rtype != RPC_FC_BYTE) && (rtype != RPC_FC_CHAR) && (rtype != RPC_FC_WCHAR)) { - error("write_string_tfs: Unimplemented for type 0x%x of name: %s\n", type->type, name); + error("write_string_tfs: Unimplemented for type 0x%x of name: %s\n", rtype, name); return start_offset; } @@ -743,7 +752,7 @@ static size_t write_string_tfs(FILE *fil error("array size for parameter %s exceeds %d bytes by %ld bytes\n", name, USHRT_MAX, array->cval - USHRT_MAX); - if (type->type == RPC_FC_CHAR) + if (rtype == RPC_FC_CHAR) WRITE_FCTYPE(file, FC_CSTRING, *typestring_offset); else WRITE_FCTYPE(file, FC_WSTRING, *typestring_offset); @@ -757,7 +766,7 @@ static size_t write_string_tfs(FILE *fil } else if (has_size) { - if (type->type == RPC_FC_CHAR) + if (rtype == RPC_FC_CHAR) WRITE_FCTYPE(file, FC_C_CSTRING, *typestring_offset); else WRITE_FCTYPE(file, FC_C_WSTRING, *typestring_offset); @@ -770,7 +779,7 @@ static size_t write_string_tfs(FILE *fil } else { - if (type->type == RPC_FC_CHAR) + if (rtype == RPC_FC_CHAR) WRITE_FCTYPE(file, FC_C_CSTRING, *typestring_offset); else WRITE_FCTYPE(file, FC_C_WSTRING, *typestring_offset); @@ -1004,9 +1013,11 @@ static size_t write_struct_members(FILE while (NEXT_LINK(field)) field = NEXT_LINK(field); for (; field; field = PREV_LINK(field)) { - if (is_base_type(field->type->type)) + unsigned char rtype = ref_type(field->type); + + if (is_base_type(rtype)) { - switch (field->type->type) + switch (rtype) { #define CASE_BASETYPE(fctype) \ case RPC_##fctype: \ @@ -1035,7 +1046,7 @@ #undef CASE_BASETYPE } } else - error("Unsupported member type 0x%x\n", field->type->type); + error("Unsupported member type 0x%x\n", rtype); } if (typestring_size % 1) @@ -1576,15 +1587,15 @@ void print_phase_basetype(FILE *file, in const type_t *type = var->type; unsigned int size; unsigned int alignment = 0; + unsigned char rtype; /* no work to do for other phases, buffer sizing is done elsewhere */ if (phase != PHASE_MARSHAL && phase != PHASE_UNMARSHAL) return; - while (type_has_ref(type)) - type = type->ref; + rtype = ref_type(type); - switch (type->type) + switch (rtype) { case RPC_FC_BYTE: case RPC_FC_CHAR: @@ -1621,7 +1632,7 @@ void print_phase_basetype(FILE *file, in return; default: - error("print_phase_basetype: Unsupported type: %s (0x%02x, ptr_level: 0)\n", var->name, type->type); + error("print_phase_basetype: Unsupported type: %s (0x%02x, ptr_level: 0)\n", var->name, rtype); size = 0; } @@ -1683,6 +1694,8 @@ void write_remoting_arguments(FILE *file for (; var; *type_offset += get_size_typeformatstring_var(var), var = PREV_LINK(var)) { const type_t *type = var->type; + unsigned char rtype; + length_is = get_attrp(var->attrs, ATTR_LENGTHIS); size_is = get_attrp(var->attrs, ATTR_SIZEIS); has_length = length_is && (length_is->type != EXPR_VOID); @@ -1711,8 +1724,7 @@ void write_remoting_arguments(FILE *file break; } - while (type_has_ref(type)) - type = type->ref; + rtype = ref_type(type); if (is_string_type(var->attrs, var->ptr_level, var->array)) { @@ -1795,7 +1807,7 @@ void write_remoting_arguments(FILE *file print_phase_function(file, indent, array_type, phase, var->name, *type_offset + 4); } } - else if (var->ptr_level == 0 && is_base_type(type->type)) + else if (var->ptr_level == 0 && is_base_type(rtype)) { print_phase_basetype(file, indent, phase, pass, var, var->name); } @@ -1803,7 +1815,7 @@ void write_remoting_arguments(FILE *file { const char *ndrtype; - switch (type->type) + switch (rtype) { case RPC_FC_STRUCT: ndrtype = "SimpleStruct"; @@ -1820,7 +1832,7 @@ void write_remoting_arguments(FILE *file break; default: error("write_remoting_arguments: Unsupported type: %s (0x%02x, ptr_level: %d)\n", - var->name, type->type, var->ptr_level); + var->name, rtype, var->ptr_level); ndrtype = NULL; } @@ -1828,11 +1840,11 @@ void write_remoting_arguments(FILE *file } else { - if ((var->ptr_level == 1) && (pointer_type == RPC_FC_RP) && is_base_type(type->type)) + if ((var->ptr_level == 1) && (pointer_type == RPC_FC_RP) && is_base_type(rtype)) { print_phase_basetype(file, indent, phase, pass, var, var->name); } - else if ((var->ptr_level == 1) && (pointer_type == RPC_FC_RP) && (type->type == RPC_FC_STRUCT)) + else if ((var->ptr_level == 1) && (pointer_type == RPC_FC_RP) && (rtype == RPC_FC_STRUCT)) { if (phase != PHASE_BUFFERSIZE && phase != PHASE_FREE) print_phase_function(file, indent, "SimpleStruct", phase, var->name, *type_offset + 4);

1 0

Francois Gouget : setupapi: Fix handling of inf paths that are quoted ( due to spaces, typically).
by Alexandre Julliard 10 Aug '06

10 Aug '06

Module: wine Branch: refs/heads/master Commit: 3b7fb551ce211210abd5877b41207f6194fb3700 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3b7fb551ce211210abd5877… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Aug 9 19:20:48 2006 +0200 setupapi: Fix handling of inf paths that are quoted (due to spaces, typically). --- dlls/setupapi/install.c | 66 +++++++++++++++++++++++++++++++++++++---------- 1 files changed, 52 insertions(+), 14 deletions(-) diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c index 591e9e6..876a9b2 100644 --- a/dlls/setupapi/install.c +++ b/dlls/setupapi/install.c @@ -1001,23 +1001,61 @@ #else /* FIXME: other platforms */ #endif static const WCHAR nt_genericW[] = {'.','n','t',0}; - WCHAR *p, *path, section[MAX_PATH + sizeof(nt_platformW)/sizeof(WCHAR)]; + WCHAR *s, *d, *path, section[MAX_PATH + sizeof(nt_platformW)/sizeof(WCHAR)]; void *callback_context; - UINT mode; + UINT mode, in_quotes, bcount; HINF hinf; TRACE("hwnd %p, handle %p, cmdline %s\n", hwnd, handle, debugstr_w(cmdline)); lstrcpynW( section, cmdline, MAX_PATH ); - if (!(p = strchrW( section, ' ' ))) return; - *p++ = 0; - while (*p == ' ') p++; - mode = atoiW( p ); + if (!(s = strchrW( section, ' ' ))) return; + *s++ = 0; + while (*s == ' ') s++; + mode = atoiW( s ); - if (!(p = strchrW( p, ' ' ))) return; - path = p + 1; - while (*path == ' ') path++; + if (!(s = strchrW( s, ' ' ))) return; + while (*s == ' ') s++; + + /* The inf path may be quoted. Code adapted from CommandLineToArgvW() */ + bcount=0; + in_quotes=0; + path=d=s; + while (*s) + { + if (*s==0 || ((*s=='\t' || *s==' ') && !in_quotes)) { + /* end of this command line argument */ + break; + } else if (*s=='\\') { + /* '\\' */ + *d++=*s++; + bcount++; + } else if (*s=='"') { + /* '"' */ + if ((bcount & 1)==0) { + /* Preceded by an even number of '\', this is half that + * number of '\', plus a quote which we erase. + */ + d-=bcount/2; + in_quotes=!in_quotes; + s++; + } else { + /* Preceded by an odd number of '\', this is half that + * number of '\' followed by a '"' + */ + d=d-bcount/2-1; + *d++='"'; + s++; + } + bcount=0; + } else { + /* a regular character */ + *d++=*s++; + bcount=0; + } + } + *d=0; hinf = SetupOpenInfFileW( path, NULL, INF_STYLE_WIN4, NULL ); if (hinf == INVALID_HANDLE_VALUE) return; @@ -1028,14 +1066,14 @@ #endif /* check for <section>.ntx86 (or corresponding name for the current platform) * and then <section>.nt */ - p = section + strlenW(section); - memcpy( p, nt_platformW, sizeof(nt_platformW) ); + s = section + strlenW(section); + memcpy( s, nt_platformW, sizeof(nt_platformW) ); if (!(SetupFindFirstLineW( hinf, section, NULL, &context ))) { - memcpy( p, nt_genericW, sizeof(nt_genericW) ); - if (!(SetupFindFirstLineW( hinf, section, NULL, &context ))) *p = 0; + memcpy( s, nt_genericW, sizeof(nt_genericW) ); + if (!(SetupFindFirstLineW( hinf, section, NULL, &context ))) *s = 0; } - if (*p) TRACE( "using section %s instead\n", debugstr_w(section) ); + if (*s) TRACE( "using section %s instead\n", debugstr_w(section) ); } callback_context = SetupInitDefaultQueueCallback( hwnd );

1 0

Andrew Talbot : wineps.drv: Write-strings warnings fix.
by Alexandre Julliard 10 Aug '06

10 Aug '06

Module: wine Branch: refs/heads/master Commit: c50fe5609617f63eed2edebf2b1fb6cb78454793 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c50fe5609617f63eed2edeb… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed Aug 9 23:06:50 2006 +0100 wineps.drv: Write-strings warnings fix. --- dlls/wineps.drv/init.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index f50d4f5..0ec109a 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -531,6 +531,7 @@ PRINTERINFO *PSDRV_FindPrinterInfo(LPCST char* ppdFileName = NULL; HKEY hkey; BOOL using_default_devmode = FALSE; + static CHAR paper_size[] = "Paper Size"; TRACE("'%s'\n", name); @@ -598,10 +599,12 @@ #ifdef HAVE_CUPS_CUPS_H } #endif if (!ppdFileName) { - res = GetPrinterDataA(hPrinter, "PPD File", NULL, NULL, 0, &needed); + static CHAR ppd_file[] = "PPD File"; + + res = GetPrinterDataA(hPrinter, ppd_file, NULL, NULL, 0, &needed); if ((res==ERROR_SUCCESS) || (res==ERROR_MORE_DATA)) { ppdFileName=HeapAlloc(PSDRV_Heap, 0, needed); - res = GetPrinterDataA(hPrinter, "PPD File", &ppdType, (LPBYTE)ppdFileName, needed, &needed); + res = GetPrinterDataA(hPrinter, ppd_file, &ppdType, (LPBYTE)ppdFileName, needed, &needed); } } /* Look for a ppd file for this printer in the config file. @@ -695,7 +698,7 @@ #endif * the Devmode structure, but Wine doesn't currently provide a convenient * way to configure printers. */ - res = GetPrinterDataA (hPrinter, "Paper Size", NULL, (LPBYTE) &dwPaperSize, + res = GetPrinterDataA (hPrinter, paper_size, NULL, (LPBYTE) &dwPaperSize, sizeof (DWORD), &needed); if (res == ERROR_SUCCESS) pi->Devmode->dmPublic.u1.s1.dmPaperSize = (SHORT) dwPaperSize;

1 0

Andrew Talbot : version/tests: Write-strings warnings fix.
by Alexandre Julliard 10 Aug '06

10 Aug '06

Module: wine Branch: refs/heads/master Commit: b40f4c0b177e1f94e55c80a6443d3c5dfbcce2d4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b40f4c0b177e1f94e55c80a… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed Aug 9 22:12:44 2006 +0100 version/tests: Write-strings warnings fix. --- dlls/version/tests/info.c | 3 ++- dlls/version/tests/install.c | 9 ++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/version/tests/info.c b/dlls/version/tests/info.c index b857b1d..8d60b0a 100644 --- a/dlls/version/tests/info.c +++ b/dlls/version/tests/info.c @@ -176,6 +176,7 @@ static void test_info(void) VS_FIXEDFILEINFO *pFixedVersionInfo; UINT uiLength; char VersionString[MAX_PATH]; + static CHAR backslash[] = "\\"; DWORDLONG dwlVersion; hdl = 0x55555555; @@ -215,7 +216,7 @@ #endif if (!boolret) return; - boolret = VerQueryValueA( pVersionInfo, "\\", (LPVOID *)&pFixedVersionInfo, &uiLength ); + boolret = VerQueryValueA( pVersionInfo, backslash, (LPVOID *)&pFixedVersionInfo, &uiLength ); ok (boolret, "VerQueryValueA failed: GetLastError = 0x%08lx\n", GetLastError()); if (!boolret) return; diff --git a/dlls/version/tests/install.c b/dlls/version/tests/install.c index 310ef4c..fd1e91c 100644 --- a/dlls/version/tests/install.c +++ b/dlls/version/tests/install.c @@ -34,6 +34,9 @@ static void test_find_file(void) char filename[MAX_PATH]; char outBuf[MAX_PATH]; char windir[MAX_PATH]; + static CHAR empty[] = "", + regedit[] = "regedit", + regedit_exe[] = "regedit.exe"; memset(appdir, 0, MAX_PATH); memset(windir, 0, MAX_PATH); @@ -42,7 +45,7 @@ static void test_find_file(void) dwOut=MAX_PATH; memset(curdir, 0, MAX_PATH); memset(outBuf, 0, MAX_PATH); - ret = VerFindFileA(0, "regedit", "", "", curdir, &dwCur, outBuf, &dwOut); + ret = VerFindFileA(0, regedit, empty, empty, curdir, &dwCur, outBuf, &dwOut); switch(ret) { case 0L: ok(dwCur == 1, "Wrong length of buffer for current location: " @@ -71,7 +74,7 @@ static void test_find_file(void) dwOut=MAX_PATH; memset(curdir, 0, MAX_PATH); memset(outBuf, 0, MAX_PATH); - ret = VerFindFileA(0, "regedit.exe", "", "", curdir, &dwCur, outBuf, &dwOut); + ret = VerFindFileA(0, regedit_exe, empty, empty, curdir, &dwCur, outBuf, &dwOut); switch(ret) { case VFF_CURNEDEST: ok(dwCur == 1 + strlen(windir), "Wrong length of buffer for current location: " @@ -93,7 +96,7 @@ static void test_find_file(void) dwOut=MAX_PATH; memset(curdir, 0, MAX_PATH); memset(outBuf, 0, MAX_PATH); - ret = VerFindFileA(0, "regedit.exe", NULL, NULL, curdir, &dwCur, outBuf, &dwOut); + ret = VerFindFileA(0, regedit_exe, NULL, NULL, curdir, &dwCur, outBuf, &dwOut); switch(ret) { case VFF_CURNEDEST: ok(dwCur == 1 + strlen(windir), "Wrong length of buffer for current location: "

1 0