March 2011 - Wine-Commits - list.winehq.org

Alexandre Julliard : user32/tests: Fix the GetCursorFrameInfo parameter types.
by Alexandre Julliard March 17, 2011

March 17, 2011

Module: wine Branch: master Commit: e705f29fd5b571214e15fb93edbb6ae02af44615 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e705f29fd5b571214e15fb93e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 17 12:53:05 2011 +0100 user32/tests: Fix the GetCursorFrameInfo parameter types. --- dlls/user32/tests/cursoricon.c | 104 +++++++++++++++++---------------------- 1 files changed, 45 insertions(+), 59 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e705f29fd5b571214e15f…

1 0

Erich Hoover : user32: Downgrade GetCursorFrameInfo FIXME to a TRACE unless the second parameter is non-zero .
by Alexandre Julliard March 17, 2011

March 17, 2011

Module: wine Branch: master Commit: 8486b2010fb854acc9c1f1eee01e2cf666431ee6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8486b2010fb854acc9c1f1eee… Author: Erich Hoover <ehoover(a)mines.edu> Date: Wed Mar 16 19:42:02 2011 -0600 user32: Downgrade GetCursorFrameInfo FIXME to a TRACE unless the second parameter is non-zero. --- dlls/user32/cursoricon.c | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 131082f..7a9c78a 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1878,8 +1878,23 @@ HICON WINAPI LoadIconA(HINSTANCE hInstance, LPCSTR name) /********************************************************************** * GetCursorFrameInfo (USER32.@) + * + * NOTES + * So far no use has been found for the second parameter, it is currently presumed + * that this parameter is reserved for future use. + * + * PARAMS + * hCursor [I] Handle to cursor for which to retrieve information + * reserved [I] No purpose has been found for this parameter (may be NULL) + * istep [I] The step of the cursor for which to retrieve information + * rate_jiffies [O] Pointer to DWORD that receives the frame-specific delay (cannot be NULL) + * num_steps [O] Pointer to DWORD that receives the number of steps in the cursor (cannot be NULL) + * + * RETURNS + * Success: Handle to a frame of the cursor (specified by istep) + * Failure: NULL cursor (0) */ -HCURSOR WINAPI GetCursorFrameInfo(HCURSOR hCursor, DWORD unk1, DWORD istep, DWORD *rate_jiffies, DWORD *num_steps) +HCURSOR WINAPI GetCursorFrameInfo(HCURSOR hCursor, DWORD reserved, DWORD istep, DWORD *rate_jiffies, DWORD *num_steps) { struct cursoricon_object *ptr; HCURSOR ret = 0; @@ -1889,7 +1904,9 @@ HCURSOR WINAPI GetCursorFrameInfo(HCURSOR hCursor, DWORD unk1, DWORD istep, DWOR if (!(ptr = get_icon_ptr( hCursor ))) return 0; - FIXME("semi-stub! %p => %d %d %p %p\n", hCursor, unk1, istep, rate_jiffies, num_steps); + TRACE("%p => %d %d %p %p\n", hCursor, reserved, istep, rate_jiffies, num_steps); + if (reserved != 0) + FIXME("Second parameter non-zero (%d), please report this!\n", reserved); icon_steps = get_icon_steps(ptr); if (istep < icon_steps || !ptr->is_ani)

1 0

Max TenEyck Woodbury : c2man: Label export list slots.
by Alexandre Julliard March 17, 2011

March 17, 2011

Module: wine Branch: master Commit: 1d79674150d53f124febbb2d35ee09f1e514c3ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d79674150d53f124febbb2d3… Author: Max TenEyck Woodbury <max(a)mtew.isa-geek.net> Date: Thu Mar 17 04:11:57 2011 -0400 c2man: Label export list slots. --- tools/c2man.pl | 95 +++++++++++++++++++++++++++++++------------------------ 1 files changed, 53 insertions(+), 42 deletions(-) diff --git a/tools/c2man.pl b/tools/c2man.pl index 868e4fc..3540911 100755 --- a/tools/c2man.pl +++ b/tools/c2man.pl @@ -38,6 +38,12 @@ my $FLAG_APAIR = 16; # The A version of a matching W function my $FLAG_WPAIR = 32; # The W version of a matching A function my $FLAG_64PAIR = 64; # The 64 bit version of a matching 32 bit function +# Export list slot labels. +my $EXPORT_ORDINAL = 0; # Ordinal. +my $EXPORT_CALL = 1; # Call type. +my $EXPORT_EXPNAME = 2; # Export name. +my $EXPORT_IMPNAME = 3; # Implementation name. +my $EXPORT_FLAGS = 4; # Flags - see above. # Options my $opt_output_directory = "man3w"; # All default options are for nroff (man pages) @@ -595,9 +601,9 @@ sub process_comment($) # Find the name from the .spec file for (@{$spec_details->{EXPORTS}}) { - if (@$_[0] eq $comment->{ORDINAL}) + if (@$_[$EXPORT_ORDINAL] eq $comment->{ORDINAL}) { - $comment->{COMMENT_NAME} = @$_[2]; + $comment->{COMMENT_NAME} = @$_[$EXPORT_EXPNAME]; $found = 1; } } @@ -644,7 +650,7 @@ sub process_comment($) print "Info: Found alternate name '",$1,"\n"; } my $alt_export = @{$spec_details->{EXPORTS}}[$alt_index]; - @$alt_export[4] |= $FLAG_DOCUMENTED; + @$alt_export[$EXPORT_FLAGS] |= $FLAG_DOCUMENTED; $spec_details->{NUM_DOCS}++; ${$comment->{TEXT}}[1] = ""; } @@ -668,12 +674,12 @@ sub process_comment($) # We want our docs generated using the implementation name, so they are unique my $export = @{$spec_details->{EXPORTS}}[$export_index]; - $comment->{COMMENT_NAME} = @$export[3]; - $comment->{ALT_NAME} = @$export[2]; + $comment->{COMMENT_NAME} = @$export[$EXPORT_IMPNAME]; + $comment->{ALT_NAME} = @$export[$EXPORT_EXPNAME]; # Mark the function as documented $spec_details->{NUM_DOCS}++; - @$export[4] |= $FLAG_DOCUMENTED; + @$export[$EXPORT_FLAGS] |= $FLAG_DOCUMENTED; # This file is used by the DLL - Make sure we get our contributors right push (@{$spec_details->{SOURCES}},$comment->{FILE}); @@ -774,11 +780,11 @@ sub process_comment($) else { my $ascii_export = @{$spec_details->{EXPORTS}}[$ascii_export_index]; - if (@$ascii_export[4] & $FLAG_DOCUMENTED) + if (@$ascii_export[$EXPORT_FLAGS] & $FLAG_DOCUMENTED) { # Flag these functions as an A/W pair - @$ascii_export[4] |= $FLAG_APAIR; - @$export[4] |= $FLAG_WPAIR; + @$ascii_export[$EXPORT_FLAGS] |= $FLAG_APAIR; + @$export[$EXPORT_FLAGS] |= $FLAG_WPAIR; } } } @@ -786,12 +792,12 @@ sub process_comment($) } elsif ( /^Unicode version of ([A-Za-z0-9_]+)\.$/ ) { - @$export[4] |= $FLAG_WPAIR; # Explicitly marked as W version + @$export[$EXPORT_FLAGS] |= $FLAG_WPAIR; # Explicitly marked as W version $found_returns = 1; } elsif ( /^64\-bit version of ([A-Za-z0-9_]+)\.$/ ) { - @$export[4] |= $FLAG_64PAIR; # Explicitly marked as 64 bit version + @$export[$EXPORT_FLAGS] |= $FLAG_64PAIR; # Explicitly marked as 64 bit version $found_returns = 1; } $found_description_text = 1; @@ -810,7 +816,7 @@ sub process_comment($) "description and/or RETURNS section, skipping\n"; } $spec_details->{NUM_DOCS}--; - @$export[4] &= ~$FLAG_DOCUMENTED; + @$export[$EXPORT_FLAGS] &= ~$FLAG_DOCUMENTED; return; } } @@ -844,7 +850,7 @@ sub process_comment($) # Find header file my $h_file = ""; - if (@$export[4] & $FLAG_NONAME) + if (@$export[$EXPORT_FLAGS] & $FLAG_NONAME) { $h_file = "Exported by ordinal only. Use GetProcAddress() to obtain a pointer to the function."; } @@ -913,11 +919,11 @@ sub process_comment($) # Add the implementation details push (@{$comment->{TEXT}}, "IMPLEMENTATION","",$h_file,"",$c_file); - if (@$export[4] & $FLAG_I386) + if (@$export[$EXPORT_FLAGS] & $FLAG_I386) { push (@{$comment->{TEXT}}, "", "Available on x86 platforms only."); } - if (@$export[4] & $FLAG_REGISTER) + if (@$export[$EXPORT_FLAGS] & $FLAG_REGISTER) { push (@{$comment->{TEXT}}, "", "This function passes one or more arguments in registers. ", "For more details, please read the source code."); @@ -1209,57 +1215,57 @@ sub output_spec($) my $line = ""; # @$_ => ordinal, call convention, exported name, implementation name, flags; - if (@$_[1] eq "forward") + if (@$_[$EXPORT_CALL] eq "forward") { - my $forward_dll = @$_[3]; + my $forward_dll = @$_[$EXPORT_IMPNAME]; $forward_dll =~ s/\.(.*)//; - $line = @$_[2]." (forward to ".$1."() in ".$forward_dll."())"; + $line = @$_[$EXPORT_EXPNAME]." (forward to ".$1."() in ".$forward_dll."())"; } - elsif (@$_[1] eq "extern") + elsif (@$_[$EXPORT_CALL] eq "extern") { - $line = @$_[2]." (extern)"; + $line = @$_[$EXPORT_EXPNAME]." (extern)"; } - elsif (@$_[1] eq "stub") + elsif (@$_[$EXPORT_CALL] eq "stub") { - $line = @$_[2]." (stub)"; + $line = @$_[$EXPORT_EXPNAME]." (stub)"; } - elsif (@$_[1] eq "fake") + elsif (@$_[$EXPORT_CALL] eq "fake") { # Don't add this function here, it gets listed with the extra documentation - if (!(@$_[4] & $FLAG_WPAIR)) + if (!(@$_[$EXPORT_FLAGS] & $FLAG_WPAIR)) { # This function should be indexed - push (@index_entries_list, @$_[3].",".@$_[3]); + push (@index_entries_list, @$_[$EXPORT_IMPNAME].",".@$_[$EXPORT_IMPNAME]); } } - elsif (@$_[1] eq "equate" || @$_[1] eq "variable") + elsif (@$_[$EXPORT_CALL] eq "equate" || @$_[$EXPORT_CALL] eq "variable") { - $line = @$_[2]." (data)"; + $line = @$_[$EXPORT_EXPNAME]." (data)"; } else { # A function - if (@$_[4] & $FLAG_DOCUMENTED) + if (@$_[$EXPORT_FLAGS] & $FLAG_DOCUMENTED) { # Documented - $line = @$_[2]." (implemented as ".@$_[3]."())"; - if (@$_[2] ne @$_[3]) + $line = @$_[$EXPORT_EXPNAME]." (implemented as ".@$_[$EXPORT_IMPNAME]."())"; + if (@$_[$EXPORT_EXPNAME] ne @$_[$EXPORT_IMPNAME]) { - $line = @$_[2]." (implemented as ".@$_[3]."())"; + $line = @$_[$EXPORT_EXPNAME]." (implemented as ".@$_[$EXPORT_IMPNAME]."())"; } else { - $line = @$_[2]."()"; + $line = @$_[$EXPORT_EXPNAME]."()"; } - if (!(@$_[4] & $FLAG_WPAIR)) + if (!(@$_[$EXPORT_FLAGS] & $FLAG_WPAIR)) { # This function should be indexed - push (@index_entries_list, @$_[2].",".@$_[3]); + push (@index_entries_list, @$_[$EXPORT_EXPNAME].",".@$_[$EXPORT_IMPNAME]); } } else { - $line = @$_[2]." (not documented)"; + $line = @$_[$EXPORT_EXPNAME]." (not documented)"; } } if ($line ne "") @@ -1981,11 +1987,13 @@ sub output_sgml_dll_file($) for (@$exports) { # @$_ => ordinal, call convention, exported name, implementation name, documented; - if (@$_[1] ne "forward" && @$_[1] ne "extern" && @$_[1] ne "stub" && @$_[1] ne "equate" && - @$_[1] ne "variable" && @$_[1] ne "fake" && @$_[4] & 1) + if (@$_[$EXPORT_CALL] ne "forward" && @$_[$EXPORT_CALL] ne "extern" && + @$_[$EXPORT_CALL] ne "stub" && @$_[$EXPORT_CALL] ne "equate" && + @$_[$EXPORT_CALL] ne "variable" && @$_[$EXPORT_CALL] ne "fake" && + @$_[$EXPORT_FLAGS] & $FLAGS_DOCUMENTED) { # A documented function - push (@source_files,@$_[3]); + push (@source_files,@$_[$EXPORT_IMPNAME]); } } @@ -2025,11 +2033,13 @@ sub output_xml_dll_file($) for (@$exports) { # @$_ => ordinal, call convention, exported name, implementation name, documented; - if (@$_[1] ne "forward" && @$_[1] ne "extern" && @$_[1] ne "stub" && @$_[1] ne "equate" && - @$_[1] ne "variable" && @$_[1] ne "fake" && @$_[4] & 1) + if (@$_[$EXPORT_CALL] ne "forward" && @$_[$EXPORT_CALL] ne "extern" && + @$_[$EXPORT_CALL] ne "stub" && @$_[$EXPORT_CALL] ne "equate" && + @$_[$EXPORT_CALL] ne "variable" && @$_[$EXPORT_CALL] ne "fake" && + @$_[$EXPORT_FLAGS] & $FLAG_DOCUMENTED) { # A documented function - push (@source_files,@$_[3]); + push (@source_files,@$_[$EXPORT_IMPNAME]); } } @@ -2341,7 +2351,8 @@ if ($opt_verbose > 3) my $exports = $spec_details->{EXPORTS}; for (@$exports) { - print @$_[0].",".@$_[1].",".@$_[2].",".@$_[3]."\n"; + print @$_[$EXPORT_ORDINAL].",".@$_[$EXPORT_CALL].", ". + @$_[$EXPORT_EXPNAME].",".@$_[$EXPORT_IMPNAME]."\n"; } } }

1 0

Erich Hoover : user32: Add support for sequence-based animated cursors.
by Alexandre Julliard March 17, 2011

March 17, 2011

Module: wine Branch: master Commit: 274e5db7e79b2cc42a48ef5deadc4fda46a6718c URL: http://source.winehq.org/git/wine.git/?a=commit;h=274e5db7e79b2cc42a48ef5de… Author: Erich Hoover <ehoover(a)mines.edu> Date: Wed Mar 16 19:25:04 2011 -0600 user32: Add support for sequence-based animated cursors. --- dlls/user32/cursoricon.c | 107 +++++++++++++++++++++++++++------------- dlls/user32/tests/cursoricon.c | 64 ++++++++++++++--------- 2 files changed, 112 insertions(+), 59 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=274e5db7e79b2cc42a48e…

1 0

Erich Hoover : user32: Merge create_icon_bitmaps with CURSORICON_CreateIconFromBMI.
by Alexandre Julliard March 17, 2011

March 17, 2011

Module: wine Branch: master Commit: 7b333de8678cb13d5dc01a3c0178966e809beaa4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b333de8678cb13d5dc01a3c0… Author: Erich Hoover <ehoover(a)mines.edu> Date: Wed Mar 16 19:18:26 2011 -0600 user32: Merge create_icon_bitmaps with CURSORICON_CreateIconFromBMI. --- dlls/user32/cursoricon.c | 175 ++++++++++++++++++++++------------------------ 1 files changed, 84 insertions(+), 91 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7b333de8678cb13d5dc01…

1 0

Erich Hoover : user32: Add support for retrieving individual animated frames.
by Alexandre Julliard March 17, 2011

March 17, 2011

Module: wine Branch: master Commit: 28e9b99728db1d13e4a6c65faf5ff457c0c89e40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28e9b99728db1d13e4a6c65fa… Author: Erich Hoover <ehoover(a)mines.edu> Date: Wed Mar 16 19:15:45 2011 -0600 user32: Add support for retrieving individual animated frames. --- dlls/user32/cursoricon.c | 30 +++++++++++++------- dlls/user32/tests/cursoricon.c | 59 +++++++++++++++++++++++++++++++++++++-- 2 files changed, 75 insertions(+), 14 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 34d7cf8..96027d5 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1848,8 +1848,8 @@ HICON WINAPI LoadIconA(HINSTANCE hInstance, LPCSTR name) HCURSOR WINAPI GetCursorFrameInfo(HCURSOR hCursor, DWORD unk1, DWORD istep, DWORD *rate_jiffies, DWORD *num_steps) { struct cursoricon_object *ptr; - UINT icon_frames = 1; HCURSOR ret = 0; + UINT icon_steps; if (rate_jiffies == NULL || num_steps == NULL) return 0; @@ -1857,27 +1857,35 @@ HCURSOR WINAPI GetCursorFrameInfo(HCURSOR hCursor, DWORD unk1, DWORD istep, DWOR FIXME("semi-stub! %p => %d %d %p %p\n", hCursor, unk1, istep, rate_jiffies, num_steps); - if (ptr->is_ani) - { - struct animated_cursoricon_object *ani_icon_data; - - ani_icon_data = (struct animated_cursoricon_object *) ptr; - icon_frames = ani_icon_data->num_frames; - } + icon_steps = get_icon_steps(ptr); /* Important Note: Sequences are not currently supported, so this implementation * will not properly handle all cases. */ - if (istep < get_icon_steps(ptr) || icon_frames == 1) + if (istep < icon_steps || !ptr->is_ani) { - ret = hCursor; + struct animated_cursoricon_object *ani_icon_data = (struct animated_cursoricon_object *) ptr; + UINT icon_frames = 1; + + if (ptr->is_ani) + icon_frames = ani_icon_data->num_frames; + if (ptr->is_ani && icon_frames > 1) + ret = ani_icon_data->frames[istep]; + else + ret = hCursor; if (icon_frames == 1) { *rate_jiffies = 0; *num_steps = 1; } - else + else if (icon_steps == 1) + { + *num_steps = ~0; + *rate_jiffies = ptr->delay; + } + else if (istep < icon_steps) { struct cursoricon_frame *frame; + *num_steps = icon_steps; frame = get_icon_frame( ptr, istep ); if (get_icon_steps(ptr) == 1) *num_steps = ~0; diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 0fc3cb7..527e4d2 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -1387,9 +1387,51 @@ static void test_CreateIconFromResource(void) ok(error == 0xdeadbeef, "Last error: %u\n", error); } +static int check_cursor_data( HDC hdc, HCURSOR hCursor, void *data, int length) +{ + char *image = NULL; + BITMAPINFO *info; + ICONINFO iinfo; + DWORD ret; + + ret = GetIconInfo( hCursor, &iinfo ); + ok(ret, "GetIconInfo() failed\n"); + if (!ret) return 0; + ret = 0; + info = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )); + ok(info != NULL, "HeapAlloc() failed\n"); + if (!info) return 0; + + info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + info->bmiHeader.biWidth = 32; + info->bmiHeader.biHeight = 32; + info->bmiHeader.biPlanes = 1; + info->bmiHeader.biBitCount = 32; + info->bmiHeader.biCompression = BI_RGB; + info->bmiHeader.biSizeImage = 32 * 32 * 4; + info->bmiHeader.biXPelsPerMeter = 0; + info->bmiHeader.biYPelsPerMeter = 0; + info->bmiHeader.biClrUsed = 0; + info->bmiHeader.biClrImportant = 0; + image = HeapAlloc( GetProcessHeap(), 0, info->bmiHeader.biSizeImage ); + ok(image != NULL, "HeapAlloc() failed\n"); + if (!image) goto cleanup; + ret = GetDIBits( hdc, iinfo.hbmColor, 0, 32, image, info, DIB_RGB_COLORS ); + ok(ret, "GetDIBits() failed\n"); + if (!ret) goto cleanup; + ret = (memcmp(image, data, length) == 0); + ok(ret, "Expected 0x%x, actually 0x%x (first 4 bytes only)\n", *(DWORD *)data, *(DWORD *)image); + +cleanup: + HeapFree( GetProcessHeap(), 0, image ); + HeapFree( GetProcessHeap(), 0, info ); + return ret; +} + static HCURSOR WINAPI (*pGetCursorFrameInfo)(HCURSOR hCursor, VOID *unk1, VOID *unk2, VOID *unk3, VOID *unk4); static void test_GetCursorFrameInfo(void) { + DWORD frame_identifier[] = { 0x10Ad, 0xc001, 0x1c05 }; HBITMAP bmp = NULL, bmpOld = NULL; DWORD unk1, unk2, unk3, unk4; BITMAPINFOHEADER *icon_header; @@ -1472,6 +1514,7 @@ static void test_GetCursorFrameInfo(void) empty_anicursor.frames[0].data.icon_info.idType = 2; /* type: cursor */ empty_anicursor.frames[0].data.icon_info.idEntries[0].xHotspot = 3; empty_anicursor.frames[0].data.icon_info.idEntries[0].yHotspot = 3; + memcpy( &empty_anicursor.frames[0].data.bmi_data.data[0], &frame_identifier[0], sizeof(DWORD) ); SetLastError(0xdeadbeef); h1 = CreateIconFromResource((PBYTE) &empty_anicursor, sizeof(empty_anicursor), FALSE, 0x00030000); ok(h1 != NULL, "Create cursor failed (error = %d).\n", GetLastError()); @@ -1480,6 +1523,8 @@ static void test_GetCursorFrameInfo(void) unk1 = unk2 = unk3 = unk4 = 0xdead; h2 = pGetCursorFrameInfo(h1, &unk1, NULL, &unk3, &unk4); ok(h1 == h2, "GetCursorFrameInfo() failed: (%p != %p).\n", h1, h2); + ret = check_cursor_data( hdc, h2, &frame_identifier[0], sizeof(DWORD) ); + ok(ret, "GetCursorFrameInfo() returned wrong cursor data for frame 0.\n"); ok(unk1 == 0xdead, "GetCursorFrameInfo() unexpected param 2 value (0x%x != 0xdead).\n", unk1); ok(unk2 == 0xdead, "GetCursorFrameInfo() unexpected param 3 value (0x%x != 0xdead).\n", unk2); ok(unk3 == 0x0, "GetCursorFrameInfo() unexpected param 4 value (0x%x != 0x0).\n", unk3); @@ -1497,6 +1542,7 @@ static void test_GetCursorFrameInfo(void) empty_anicursor3.frames[i].data.icon_info.idType = 2; /* type: cursor */ empty_anicursor3.frames[i].data.icon_info.idEntries[0].xHotspot = 3; empty_anicursor3.frames[i].data.icon_info.idEntries[0].yHotspot = 3; + memcpy( &empty_anicursor3.frames[i].data.bmi_data.data[0], &frame_identifier[i], sizeof(DWORD) ); } SetLastError(0xdeadbeef); h1 = CreateIconFromResource((PBYTE) &empty_anicursor3, sizeof(empty_anicursor3), FALSE, 0x00030000); @@ -1515,7 +1561,9 @@ static void test_GetCursorFrameInfo(void) { unk1 = unk2 = unk3 = unk4 = 0xdead; h2 = pGetCursorFrameInfo(h1, &unk1, (VOID*)i, &unk3, &unk4); - ok(h2 != 0, "GetCursorFrameInfo() failed for cursor %p: (%p == 0).\n", h1, h2); + ok(h1 != h2 && h2 != 0, "GetCursorFrameInfo() failed for cursor %p: (%p, %p).\n", h1, h1, h2); + ret = check_cursor_data( hdc, h2, &frame_identifier[i], sizeof(DWORD) ); + ok(ret, "GetCursorFrameInfo() returned wrong cursor data for frame %d.\n", i); ok(unk1 == 0xdead, "GetCursorFrameInfo() unexpected param 2 value (0x%x != 0xdead).\n", unk1); ok(unk2 == 0xdead, "GetCursorFrameInfo() unexpected param 3 value (0x%x != 0xdead).\n", unk2); ok(unk3 == empty_anicursor3.header.header.display_rate, @@ -1561,7 +1609,9 @@ static void test_GetCursorFrameInfo(void) /* Check GetCursorFrameInfo behavior on rate 0 for a multi-frame animated cursor (with num_steps == 1) */ unk1 = unk2 = unk3 = unk4 = 0xdead; h2 = pGetCursorFrameInfo(h1, &unk1, NULL, &unk3, &unk4); - ok(h2 != 0, "GetCursorFrameInfo() failed for cursor %p: (%p == 0).\n", h1, h2); + ok(h1 != h2 && h2 != 0, "GetCursorFrameInfo() failed for cursor %p: (%p, %p).\n", h1, h1, h2); + ret = check_cursor_data( hdc, h2, &frame_identifier[0], sizeof(DWORD) ); + ok(ret, "GetCursorFrameInfo() returned wrong cursor data for frame 0.\n"); ok(unk1 == 0xdead, "GetCursorFrameInfo() unexpected param 2 value (0x%x != 0xdead).\n", unk1); ok(unk2 == 0xdead, "GetCursorFrameInfo() unexpected param 3 value (0x%x != 0xdead).\n", unk2); ok(unk3 == empty_anicursor3.header.header.display_rate, @@ -1594,6 +1644,7 @@ static void test_GetCursorFrameInfo(void) empty_anicursor3_rate.frames[i].data.icon_info.idType = 2; /* type: cursor */ empty_anicursor3_rate.frames[i].data.icon_info.idEntries[0].xHotspot = 3; empty_anicursor3_rate.frames[i].data.icon_info.idEntries[0].yHotspot = 3; + memcpy( &empty_anicursor3_rate.frames[i].data.bmi_data.data[0], &frame_identifier[i], sizeof(DWORD) ); } SetLastError(0xdeadbeef); h1 = CreateIconFromResource((PBYTE) &empty_anicursor3_rate, sizeof(empty_anicursor3_rate), FALSE, 0x00030000); @@ -1612,7 +1663,9 @@ static void test_GetCursorFrameInfo(void) { unk1 = unk2 = unk3 = unk4 = 0xdead; h2 = pGetCursorFrameInfo(h1, &unk1, (VOID*)i, &unk3, &unk4); - ok(h2 != 0, "GetCursorFrameInfo() failed for cursor %p: (%p != 0).\n", h1, h2); + ok(h1 != h2 && h2 != 0, "GetCursorFrameInfo() failed for cursor %p: (%p, %p).\n", h1, h1, h2); + ret = check_cursor_data( hdc, h2, &frame_identifier[i], sizeof(DWORD) ); + ok(ret, "GetCursorFrameInfo() returned wrong cursor data for frame %d.\n", i); ok(unk1 == 0xdead, "GetCursorFrameInfo() unexpected param 2 value (0x%x != 0xdead).\n", unk1); ok(unk2 == 0xdead, "GetCursorFrameInfo() unexpected param 3 value (0x%x != 0xdead).\n", unk2); ok(unk3 == empty_anicursor3_rate.rates.rate[i],

1 0

Erich Hoover : user32: Handle static and animated cursors as separate objects.
by Alexandre Julliard March 17, 2011

March 17, 2011

Module: wine Branch: master Commit: fa4f9c43bcc06619fcf3e71f9e0a767981f2a750 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa4f9c43bcc06619fcf3e71f9… Author: Erich Hoover <ehoover(a)mines.edu> Date: Wed Mar 16 18:58:37 2011 -0600 user32: Handle static and animated cursors as separate objects. --- dlls/user32/cursoricon.c | 141 ++++++++++++++++++++++++++++++++++------------ 1 files changed, 104 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fa4f9c43bcc06619fcf3e…

1 0

Alexandre Julliard : gdi32: Always call the PatBlt entry point for blits that don't use a source.
by Alexandre Julliard March 17, 2011

March 17, 2011

Module: wine Branch: master Commit: 5eb105f6e19f7583d660d4fc67b43c9e63529f69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5eb105f6e19f7583d660d4fc6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 17 14:30:45 2011 +0100 gdi32: Always call the PatBlt entry point for blits that don't use a source. --- dlls/gdi32/bitblt.c | 29 ++++++++--- dlls/gdi32/enhmfdrv/bitblt.c | 109 ++++++++++++++--------------------------- 2 files changed, 59 insertions(+), 79 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index f638a73..f32ae98 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -35,6 +35,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(bitblt); +static inline BOOL rop_uses_src( DWORD rop ) +{ + return ((rop >> 2) & 0x330000) != (rop & 0x330000); +} /*********************************************************************** * PatBlt (GDI32.@) @@ -42,10 +46,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(bitblt); BOOL WINAPI PatBlt( HDC hdc, INT left, INT top, INT width, INT height, DWORD rop) { - DC * dc = get_dc_ptr( hdc ); + DC * dc; BOOL bRet = FALSE; - if (!dc) return FALSE; + if (rop_uses_src( rop )) return FALSE; + if (!(dc = get_dc_ptr( hdc ))) return FALSE; TRACE("%p %d,%d %dx%d %06x\n", hdc, left, top, width, height, rop ); @@ -77,10 +82,15 @@ BOOL WINAPI BitBlt( HDC hdcDst, INT xDst, INT yDst, INT width, hdcSrc, xSrc, ySrc, hdcDst, xDst, yDst, width, height, rop); if (!(dcDst = get_dc_ptr( hdcDst ))) return FALSE; + update_dc( dcDst ); - if (dcDst->funcs->pBitBlt || dcDst->funcs->pStretchBlt) + if (!rop_uses_src( rop ) && dcDst->funcs->pPatBlt) + { + ret = dcDst->funcs->pPatBlt( dcDst->physDev, xDst, yDst, width, height, rop ); + release_dc_ptr( dcDst ); + } + else if (dcDst->funcs->pBitBlt || dcDst->funcs->pStretchBlt) { - update_dc( dcDst ); dcSrc = get_dc_ptr( hdcSrc ); if (dcSrc) update_dc( dcSrc ); @@ -163,20 +173,25 @@ BOOL WINAPI StretchBlt( HDC hdcDst, INT xDst, INT yDst, if (!(dcDst = get_dc_ptr( hdcDst ))) return FALSE; + update_dc( dcDst ); - if (dcDst->funcs->pStretchBlt) + if (!rop_uses_src( rop ) && dcDst->funcs->pPatBlt) + { + ret = dcDst->funcs->pPatBlt( dcDst->physDev, xDst, yDst, widthDst, heightDst, rop ); + release_dc_ptr( dcDst ); + } + else if (dcDst->funcs->pStretchBlt) { if ((dcSrc = get_dc_ptr( hdcSrc ))) { - update_dc( dcDst ); update_dc( dcSrc ); ret = dcDst->funcs->pStretchBlt( dcDst->physDev, xDst, yDst, widthDst, heightDst, dcSrc->physDev, xSrc, ySrc, widthSrc, heightSrc, rop ); - release_dc_ptr( dcDst ); release_dc_ptr( dcSrc ); } + release_dc_ptr( dcDst ); } else if (dcDst->funcs->pStretchDIBits) { diff --git a/dlls/gdi32/enhmfdrv/bitblt.c b/dlls/gdi32/enhmfdrv/bitblt.c index e5c80f6..f56e8ac 100644 --- a/dlls/gdi32/enhmfdrv/bitblt.c +++ b/dlls/gdi32/enhmfdrv/bitblt.c @@ -81,13 +81,9 @@ static BOOL EMFDRV_BitBlockTransfer( BITMAP BM; WORD nBPP = 0; LPBITMAPINFOHEADER lpBmiH; - BOOL useSrc; EMFDRV_PDEVICE* physDevSrc = (EMFDRV_PDEVICE*)devSrc; HBITMAP hBitmap = NULL; - useSrc = (((rop >> 2) & 0x330000) != (rop & 0x330000)); - if (!physDevSrc && useSrc) return FALSE; - if (emrType == EMR_BITBLT) emrSize = sizeof(EMRBITBLT); else if (emrType == EMR_STRETCHBLT) @@ -95,23 +91,16 @@ static BOOL EMFDRV_BitBlockTransfer( else return FALSE; - if(useSrc) - { - hBitmap = GetCurrentObject(physDevSrc->hdc, OBJ_BITMAP); + hBitmap = GetCurrentObject(physDevSrc->hdc, OBJ_BITMAP); - if(sizeof(BITMAP) != GetObjectW(hBitmap, sizeof(BITMAP), &BM)) - return FALSE; + if(sizeof(BITMAP) != GetObjectW(hBitmap, sizeof(BITMAP), &BM)) + return FALSE; - nBPP = BM.bmPlanes * BM.bmBitsPixel; - if(nBPP > 8) nBPP = 24; /* FIXME Can't get 16bpp to work for some reason */ - bitsSize = DIB_GetDIBWidthBytes(BM.bmWidth, nBPP) * BM.bmHeight; - bmiSize = sizeof(BITMAPINFOHEADER) + - (nBPP <= 8 ? 1 << nBPP : 0) * sizeof(RGBQUAD); - } - else - { - bitsSize = bmiSize = 0; - } + nBPP = BM.bmPlanes * BM.bmBitsPixel; + if(nBPP > 8) nBPP = 24; /* FIXME Can't get 16bpp to work for some reason */ + bitsSize = DIB_GetDIBWidthBytes(BM.bmWidth, nBPP) * BM.bmHeight; + bmiSize = sizeof(BITMAPINFOHEADER) + + (nBPP <= 8 ? 1 << nBPP : 0) * sizeof(RGBQUAD); size = emrSize + bmiSize + bitsSize; @@ -132,27 +121,11 @@ static BOOL EMFDRV_BitBlockTransfer( pEMR->dwRop = rop; pEMR->xSrc = xSrc; pEMR->ySrc = ySrc; - if (useSrc) - { - GetWorldTransform(physDevSrc->hdc, &pEMR->xformSrc); - pEMR->crBkColorSrc = GetBkColor(physDevSrc->hdc); - pEMR->iUsageSrc = DIB_RGB_COLORS; - pEMR->offBmiSrc = emrSize; - pEMR->offBitsSrc = emrSize + bmiSize; - } - else - { - pEMR->xformSrc.eM11 = 1.0; /** FIXME: */ - pEMR->xformSrc.eM12 = 0.0; /** Setting default */ - pEMR->xformSrc.eM21 = 0.0; /** value. */ - pEMR->xformSrc.eM22 = 1.0; /** Where should we */ - pEMR->xformSrc.eDx = 0.0; /** get that info */ - pEMR->xformSrc.eDy = 0.0; /** ???? */ - pEMR->crBkColorSrc = 0; - pEMR->iUsageSrc = 0; - pEMR->offBmiSrc = 0; - pEMR->offBitsSrc = 0; - } + GetWorldTransform(physDevSrc->hdc, &pEMR->xformSrc); + pEMR->crBkColorSrc = GetBkColor(physDevSrc->hdc); + pEMR->iUsageSrc = DIB_RGB_COLORS; + pEMR->offBmiSrc = emrSize; + pEMR->offBitsSrc = emrSize + bmiSize; pEMR->cbBmiSrc = bmiSize; pEMR->cbBitsSrc = bitsSize; if (emrType == EMR_STRETCHBLT) @@ -162,42 +135,34 @@ static BOOL EMFDRV_BitBlockTransfer( pEMRStretch->cySrc = heightSrc; } - if (useSrc) - { - /* Initialize BITMAPINFO structure */ - lpBmiH = (LPBITMAPINFOHEADER)((BYTE*)pEMR + pEMR->offBmiSrc); - - lpBmiH->biSize = sizeof(BITMAPINFOHEADER); - lpBmiH->biWidth = BM.bmWidth; - lpBmiH->biHeight = BM.bmHeight; - lpBmiH->biPlanes = BM.bmPlanes; - lpBmiH->biBitCount = nBPP; - /* Assume the bitmap isn't compressed and set the BI_RGB flag. */ - lpBmiH->biCompression = BI_RGB; - lpBmiH->biSizeImage = bitsSize; - lpBmiH->biYPelsPerMeter = 0; - lpBmiH->biXPelsPerMeter = 0; - lpBmiH->biClrUsed = nBPP <= 8 ? 1 << nBPP : 0; - /* Set biClrImportant to 0, indicating that all of the - device colors are important. */ - lpBmiH->biClrImportant = 0; - - /* Initialize bitmap bits */ - if (GetDIBits(physDevSrc->hdc, hBitmap, 0, (UINT)lpBmiH->biHeight, - (BYTE*)pEMR + pEMR->offBitsSrc, - (LPBITMAPINFO)lpBmiH, DIB_RGB_COLORS)) - { - ret = EMFDRV_WriteRecord(devDst, (EMR*)pEMR); - if (ret) EMFDRV_UpdateBBox(devDst, &(pEMR->rclBounds)); - } - else - ret = FALSE; - } - else + /* Initialize BITMAPINFO structure */ + lpBmiH = (LPBITMAPINFOHEADER)((BYTE*)pEMR + pEMR->offBmiSrc); + + lpBmiH->biSize = sizeof(BITMAPINFOHEADER); + lpBmiH->biWidth = BM.bmWidth; + lpBmiH->biHeight = BM.bmHeight; + lpBmiH->biPlanes = BM.bmPlanes; + lpBmiH->biBitCount = nBPP; + /* Assume the bitmap isn't compressed and set the BI_RGB flag. */ + lpBmiH->biCompression = BI_RGB; + lpBmiH->biSizeImage = bitsSize; + lpBmiH->biYPelsPerMeter = 0; + lpBmiH->biXPelsPerMeter = 0; + lpBmiH->biClrUsed = nBPP <= 8 ? 1 << nBPP : 0; + /* Set biClrImportant to 0, indicating that all of the + device colors are important. */ + lpBmiH->biClrImportant = 0; + + /* Initialize bitmap bits */ + if (GetDIBits(physDevSrc->hdc, hBitmap, 0, (UINT)lpBmiH->biHeight, + (BYTE*)pEMR + pEMR->offBitsSrc, + (LPBITMAPINFO)lpBmiH, DIB_RGB_COLORS)) { ret = EMFDRV_WriteRecord(devDst, (EMR*)pEMR); if (ret) EMFDRV_UpdateBBox(devDst, &(pEMR->rclBounds)); } + else + ret = FALSE; HeapFree( GetProcessHeap(), 0, pEMR); return ret;

1 0

Vincent Povirk : gdiplus: Use GdipFillPath to implement GdipFillPolygon.
by Alexandre Julliard March 17, 2011

March 17, 2011

Module: wine Branch: master Commit: 86d55d43c5f49ac5e87196cb1d4153626e292e18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86d55d43c5f49ac5e87196cb1… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Mar 10 16:42:30 2011 -0600 gdiplus: Use GdipFillPath to implement GdipFillPolygon. --- dlls/gdiplus/graphics.c | 46 +++++++++++----------------------------------- 1 files changed, 11 insertions(+), 35 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 262828b..f2ebfba 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3511,10 +3511,8 @@ GpStatus WINGDIPAPI GdipFillPieI(GpGraphics *graphics, GpBrush *brush, INT x, GpStatus WINGDIPAPI GdipFillPolygon(GpGraphics *graphics, GpBrush *brush, GDIPCONST GpPointF *points, INT count, GpFillMode fillMode) { - INT save_state; - GpPointF *ptf = NULL; - POINT *pti = NULL; - GpStatus retval = Ok; + GpStatus stat; + GpPath *path; TRACE("(%p, %p, %p, %d, %d)\n", graphics, brush, points, count, fillMode); @@ -3524,41 +3522,19 @@ GpStatus WINGDIPAPI GdipFillPolygon(GpGraphics *graphics, GpBrush *brush, if(graphics->busy) return ObjectBusy; - if(!graphics->hdc) - { - FIXME("graphics object has no HDC\n"); - return Ok; - } - - ptf = GdipAlloc(count * sizeof(GpPointF)); - pti = GdipAlloc(count * sizeof(POINT)); - if(!ptf || !pti){ - retval = OutOfMemory; - goto end; - } - - memcpy(ptf, points, count * sizeof(GpPointF)); + stat = GdipCreatePath(fillMode, &path); - save_state = SaveDC(graphics->hdc); - EndPath(graphics->hdc); - SetPolyFillMode(graphics->hdc, (fillMode == FillModeAlternate ? ALTERNATE - : WINDING)); - - transform_and_round_points(graphics, pti, ptf, count); - - BeginPath(graphics->hdc); - Polygon(graphics->hdc, pti, count); - EndPath(graphics->hdc); - - brush_fill_path(graphics, brush); + if (stat == Ok) + { + stat = GdipAddPathPolygon(path, points, count); - RestoreDC(graphics->hdc, save_state); + if (stat == Ok) + stat = GdipFillPath(graphics, brush, path); -end: - GdipFree(ptf); - GdipFree(pti); + GdipDeletePath(path); + } - return retval; + return stat; } GpStatus WINGDIPAPI GdipFillPolygonI(GpGraphics *graphics, GpBrush *brush,

1 0

Vincent Povirk : gdiplus: Implement GdipFillRectangle based on GdipFillPath .
by Alexandre Julliard March 17, 2011

March 17, 2011

Module: wine Branch: master Commit: 71eb248c3050a89c9e6291cabbaca1ae15142928 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71eb248c3050a89c9e6291cab… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Mar 10 16:51:48 2011 -0600 gdiplus: Implement GdipFillRectangle based on GdipFillPath. --- dlls/gdiplus/graphics.c | 79 ++++++---------------------------------- dlls/gdiplus/tests/graphics.c | 2 +- 2 files changed, 13 insertions(+), 68 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index b0b4d08..a9f4cf3 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3585,9 +3585,8 @@ GpStatus WINGDIPAPI GdipFillPolygon2I(GpGraphics *graphics, GpBrush *brush, GpStatus WINGDIPAPI GdipFillRectangle(GpGraphics *graphics, GpBrush *brush, REAL x, REAL y, REAL width, REAL height) { - INT save_state; - GpPointF ptf[4]; - POINT pti[4]; + GpStatus stat; + GpPath *path; TRACE("(%p, %p, %.2f, %.2f, %.2f, %.2f)\n", graphics, brush, x, y, width, height); @@ -3597,81 +3596,27 @@ GpStatus WINGDIPAPI GdipFillRectangle(GpGraphics *graphics, GpBrush *brush, if(graphics->busy) return ObjectBusy; - if(!graphics->hdc) - { - FIXME("graphics object has no HDC\n"); - return Ok; - } - - ptf[0].X = x; - ptf[0].Y = y; - ptf[1].X = x + width; - ptf[1].Y = y; - ptf[2].X = x + width; - ptf[2].Y = y + height; - ptf[3].X = x; - ptf[3].Y = y + height; - - save_state = SaveDC(graphics->hdc); - EndPath(graphics->hdc); - - transform_and_round_points(graphics, pti, ptf, 4); + stat = GdipCreatePath(FillModeAlternate, &path); - BeginPath(graphics->hdc); - Polygon(graphics->hdc, pti, 4); - EndPath(graphics->hdc); + if (stat == Ok) + { + stat = GdipAddPathRectangle(path, x, y, width, height); - brush_fill_path(graphics, brush); + if (stat == Ok) + stat = GdipFillPath(graphics, brush, path); - RestoreDC(graphics->hdc, save_state); + GdipDeletePath(path); + } - return Ok; + return stat; } GpStatus WINGDIPAPI GdipFillRectangleI(GpGraphics *graphics, GpBrush *brush, INT x, INT y, INT width, INT height) { - INT save_state; - GpPointF ptf[4]; - POINT pti[4]; - TRACE("(%p, %p, %d, %d, %d, %d)\n", graphics, brush, x, y, width, height); - if(!graphics || !brush) - return InvalidParameter; - - if(graphics->busy) - return ObjectBusy; - - if(!graphics->hdc) - { - FIXME("graphics object has no HDC\n"); - return Ok; - } - - ptf[0].X = x; - ptf[0].Y = y; - ptf[1].X = x + width; - ptf[1].Y = y; - ptf[2].X = x + width; - ptf[2].Y = y + height; - ptf[3].X = x; - ptf[3].Y = y + height; - - save_state = SaveDC(graphics->hdc); - EndPath(graphics->hdc); - - transform_and_round_points(graphics, pti, ptf, 4); - - BeginPath(graphics->hdc); - Polygon(graphics->hdc, pti, 4); - EndPath(graphics->hdc); - - brush_fill_path(graphics, brush); - - RestoreDC(graphics->hdc, save_state); - - return Ok; + return GdipFillRectangle(graphics, brush, x, y, width, height); } GpStatus WINGDIPAPI GdipFillRectangles(GpGraphics *graphics, GpBrush *brush, GDIPCONST GpRectF *rects, diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index ecdbe93..bd14ab6 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -2231,7 +2231,7 @@ static void test_fromMemoryBitmap(void) GdipDeleteGraphics(graphics); /* drawing writes to the memory provided */ - todo_wine expect(0x68, bits[10]); + expect(0x68, bits[10]); status = GdipGetImageGraphicsContext((GpImage*)bitmap, &graphics); expect(Ok, status);

1 0