wine-commits March 2011

wine-commits@winehq.org

2 participants
849 discussions

Max TenEyck Woodbury : c2man: Label export list slots.
by Alexandre Julliard 17 Mar '11

17 Mar '11

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

Alexandre Julliard : user32/tests: Fix the GetCursorFrameInfo parameter types.
by Alexandre Julliard 17 Mar '11

17 Mar '11

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 17 Mar '11

17 Mar '11

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

Erich Hoover : user32: Add support for sequence-based animated cursors.
by Alexandre Julliard 17 Mar '11

17 Mar '11

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 17 Mar '11

17 Mar '11

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 17 Mar '11

17 Mar '11

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 17 Mar '11

17 Mar '11

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 : configure: Don' t build winmm drivers when their backend library is missing.
by Alexandre Julliard 17 Mar '11

17 Mar '11

Module: wine Branch: master Commit: 98cb21f74328ac5d893ba8302158eaffbec7836b URL: http://source.winehq.org/git/wine.git/?a=commit;h=98cb21f74328ac5d893ba8302… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 17 11:42:17 2011 +0100 configure: Don't build winmm drivers when their backend library is missing. --- configure | 10 ++++++++++ configure.ac | 11 +++++++++++ 2 files changed, 21 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 8790041..09cc4aa 100755 --- a/configure +++ b/configure @@ -12070,6 +12070,16 @@ _ACEOF fi +test -n "$ALSALIBS" || enable_winealsa_drv=${enable_winealsa_drv:-no} +test -n "$COREAUDIO" || enable_winecoreaudio_drv=${enable_winecoreaudio_drv:-no} +test -n "$NASLIBS" || enable_winenas_drv=${enable_winenas_drv:-no} +test -n "$ESDLIBS" || enable_wineesd_drv=${enable_wineesd_drv:-no} +test -n "$ac_cv_lib_soname_jack" || enable_winejack_drv=${enable_winejack_drv:-no} +test "$ac_cv_header_sys_soundcard_h" = "yes" -o \ + "$ac_cv_header_machine_soundcard_h" = "yes" -o \ + "$ac_cv_header_soundcard_h" = "yes" || enable_wineoss_drv=${enable_wineoss_drv:-no} +test "$ac_cv_header_linux_joystick_h" = "yes" || enable_winejoystick_drv=${enable_winejoystick_drv:-no} + if test "x$ALSALIBS$COREAUDIO$NASLIBS$ESDLIBS$ac_cv_lib_soname_jack" = "x" -a \ "$ac_cv_header_sys_soundcard_h" != "yes" -a \ "$ac_cv_header_machine_soundcard_h" != "yes" -a \ diff --git a/configure.ac b/configure.ac index b16b9e9..448975e 100644 --- a/configure.ac +++ b/configure.ac @@ -1660,6 +1660,17 @@ fi dnl **** Check for libodbc **** WINE_CHECK_SONAME(odbc,SQLConnect,,[AC_DEFINE_UNQUOTED(SONAME_LIBODBC,["libodbc.$LIBEXT"])]) +dnl **** Disable unsupported winmm drivers **** +test -n "$ALSALIBS" || enable_winealsa_drv=${enable_winealsa_drv:-no} +test -n "$COREAUDIO" || enable_winecoreaudio_drv=${enable_winecoreaudio_drv:-no} +test -n "$NASLIBS" || enable_winenas_drv=${enable_winenas_drv:-no} +test -n "$ESDLIBS" || enable_wineesd_drv=${enable_wineesd_drv:-no} +test -n "$ac_cv_lib_soname_jack" || enable_winejack_drv=${enable_winejack_drv:-no} +test "$ac_cv_header_sys_soundcard_h" = "yes" -o \ + "$ac_cv_header_machine_soundcard_h" = "yes" -o \ + "$ac_cv_header_soundcard_h" = "yes" || enable_wineoss_drv=${enable_wineoss_drv:-no} +test "$ac_cv_header_linux_joystick_h" = "yes" || enable_winejoystick_drv=${enable_winejoystick_drv:-no} + dnl **** Check for any sound system **** if test "x$ALSALIBS$COREAUDIO$NASLIBS$ESDLIBS$ac_cv_lib_soname_jack" = "x" -a \ "$ac_cv_header_sys_soundcard_h" != "yes" -a \

1 0

Maarten Lankhorst : kernel32: CreateProcessA should not call CreateProcessW directly.
by Alexandre Julliard 17 Mar '11

17 Mar '11

Module: wine Branch: master Commit: 8b163d6fb600b62c4995b0c92f48316d9821b7ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b163d6fb600b62c4995b0c92… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Mar 16 19:38:08 2011 +0100 kernel32: CreateProcessA should not call CreateProcessW directly. --- dlls/kernel32/process.c | 109 ++++++++++++++++++++++++++--------------------- 1 files changed, 60 insertions(+), 49 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 4ef8f2a..1956649 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -2166,55 +2166,11 @@ static LPWSTR get_file_name( LPCWSTR appname, LPWSTR cmdline, LPWSTR buffer, } -/********************************************************************** - * CreateProcessA (KERNEL32.@) - */ -BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessA( LPCSTR app_name, LPSTR cmd_line, LPSECURITY_ATTRIBUTES process_attr, - LPSECURITY_ATTRIBUTES thread_attr, BOOL inherit, - DWORD flags, LPVOID env, LPCSTR cur_dir, - LPSTARTUPINFOA startup_info, LPPROCESS_INFORMATION info ) -{ - BOOL ret = FALSE; - WCHAR *app_nameW = NULL, *cmd_lineW = NULL, *cur_dirW = NULL; - UNICODE_STRING desktopW, titleW; - STARTUPINFOW infoW; - - desktopW.Buffer = NULL; - titleW.Buffer = NULL; - if (app_name && !(app_nameW = FILE_name_AtoW( app_name, TRUE ))) goto done; - if (cmd_line && !(cmd_lineW = FILE_name_AtoW( cmd_line, TRUE ))) goto done; - if (cur_dir && !(cur_dirW = FILE_name_AtoW( cur_dir, TRUE ))) goto done; - - if (startup_info->lpDesktop) RtlCreateUnicodeStringFromAsciiz( &desktopW, startup_info->lpDesktop ); - if (startup_info->lpTitle) RtlCreateUnicodeStringFromAsciiz( &titleW, startup_info->lpTitle ); - - memcpy( &infoW, startup_info, sizeof(infoW) ); - infoW.lpDesktop = desktopW.Buffer; - infoW.lpTitle = titleW.Buffer; - - if (startup_info->lpReserved) - FIXME("StartupInfo.lpReserved is used, please report (%s)\n", - debugstr_a(startup_info->lpReserved)); - - ret = CreateProcessW( app_nameW, cmd_lineW, process_attr, thread_attr, - inherit, flags, env, cur_dirW, &infoW, info ); -done: - HeapFree( GetProcessHeap(), 0, app_nameW ); - HeapFree( GetProcessHeap(), 0, cmd_lineW ); - HeapFree( GetProcessHeap(), 0, cur_dirW ); - RtlFreeUnicodeString( &desktopW ); - RtlFreeUnicodeString( &titleW ); - return ret; -} - - -/********************************************************************** - * CreateProcessW (KERNEL32.@) - */ -BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessW( LPCWSTR app_name, LPWSTR cmd_line, LPSECURITY_ATTRIBUTES process_attr, - LPSECURITY_ATTRIBUTES thread_attr, BOOL inherit, DWORD flags, - LPVOID env, LPCWSTR cur_dir, LPSTARTUPINFOW startup_info, - LPPROCESS_INFORMATION info ) +/* Steam hotpatches CreateProcessA and W, so to prevent it from crashing use an internal function */ +static BOOL create_process_impl( LPCWSTR app_name, LPWSTR cmd_line, LPSECURITY_ATTRIBUTES process_attr, + LPSECURITY_ATTRIBUTES thread_attr, BOOL inherit, DWORD flags, + LPVOID env, LPCWSTR cur_dir, LPSTARTUPINFOW startup_info, + LPPROCESS_INFORMATION info ) { BOOL retv = FALSE; HANDLE hFile = 0; @@ -2346,6 +2302,61 @@ BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessW( LPCWSTR app_name, LPWSTR cmd_line, /********************************************************************** + * CreateProcessA (KERNEL32.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessA( LPCSTR app_name, LPSTR cmd_line, LPSECURITY_ATTRIBUTES process_attr, + LPSECURITY_ATTRIBUTES thread_attr, BOOL inherit, + DWORD flags, LPVOID env, LPCSTR cur_dir, + LPSTARTUPINFOA startup_info, LPPROCESS_INFORMATION info ) +{ + BOOL ret = FALSE; + WCHAR *app_nameW = NULL, *cmd_lineW = NULL, *cur_dirW = NULL; + UNICODE_STRING desktopW, titleW; + STARTUPINFOW infoW; + + desktopW.Buffer = NULL; + titleW.Buffer = NULL; + if (app_name && !(app_nameW = FILE_name_AtoW( app_name, TRUE ))) goto done; + if (cmd_line && !(cmd_lineW = FILE_name_AtoW( cmd_line, TRUE ))) goto done; + if (cur_dir && !(cur_dirW = FILE_name_AtoW( cur_dir, TRUE ))) goto done; + + if (startup_info->lpDesktop) RtlCreateUnicodeStringFromAsciiz( &desktopW, startup_info->lpDesktop ); + if (startup_info->lpTitle) RtlCreateUnicodeStringFromAsciiz( &titleW, startup_info->lpTitle ); + + memcpy( &infoW, startup_info, sizeof(infoW) ); + infoW.lpDesktop = desktopW.Buffer; + infoW.lpTitle = titleW.Buffer; + + if (startup_info->lpReserved) + FIXME("StartupInfo.lpReserved is used, please report (%s)\n", + debugstr_a(startup_info->lpReserved)); + + ret = create_process_impl( app_nameW, cmd_lineW, process_attr, thread_attr, + inherit, flags, env, cur_dirW, &infoW, info ); +done: + HeapFree( GetProcessHeap(), 0, app_nameW ); + HeapFree( GetProcessHeap(), 0, cmd_lineW ); + HeapFree( GetProcessHeap(), 0, cur_dirW ); + RtlFreeUnicodeString( &desktopW ); + RtlFreeUnicodeString( &titleW ); + return ret; +} + + +/********************************************************************** + * CreateProcessW (KERNEL32.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessW( LPCWSTR app_name, LPWSTR cmd_line, LPSECURITY_ATTRIBUTES process_attr, + LPSECURITY_ATTRIBUTES thread_attr, BOOL inherit, DWORD flags, + LPVOID env, LPCWSTR cur_dir, LPSTARTUPINFOW startup_info, + LPPROCESS_INFORMATION info ) +{ + return create_process_impl( app_name, cmd_line, process_attr, thread_attr, + inherit, flags, env, cur_dir, startup_info, info); +} + + +/********************************************************************** * exec_process */ static void exec_process( LPCWSTR name )

1 0

Dmitry Timoshkov : advapi32: Add more file access permissions tests.
by Alexandre Julliard 17 Mar '11

17 Mar '11

Module: wine Branch: master Commit: 2dfae4a73328b3e4b582f78ef199af4993f37445 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2dfae4a73328b3e4b582f78ef… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Mar 17 17:22:31 2011 +0800 advapi32: Add more file access permissions tests. --- dlls/advapi32/tests/security.c | 136 +++++++++++++++++++++++++++++++++++++++- 1 files changed, 133 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 43406eb..5409c35 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -813,7 +813,7 @@ cleanup: DeleteFileA(file); RemoveDirectoryA(path); - + /* Test file access permissions for a file with FILE_ATTRIBUTE_ARCHIVE */ SetLastError(0xdeadbeef); rc = GetTempPath(sizeof(wintmpdir), wintmpdir); ok(rc, "GetTempPath error %d\n", GetLastError()); @@ -840,6 +840,7 @@ cleanup: rc = GetFileSecurity(file, OWNER_SECURITY_INFORMATION|GROUP_SECURITY_INFORMATION|DACL_SECURITY_INFORMATION, sd, sdSize, &retSize); ok(rc, "GetFileSecurity error %d\n", GetLastError()); + ok(retSize == sdSize || broken(retSize == 0) /* NT4 */, "expected %d, got %d\n", sdSize, retSize); SetLastError(0xdeadbeef); rc = OpenThreadToken(GetCurrentThread(), TOKEN_QUERY, TRUE, &token); @@ -887,6 +888,14 @@ todo_wine { granted = 0xdeadbeef; status = 0xdeadbeef; SetLastError(0xdeadbeef); + rc = AccessCheck(sd, token, DELETE, &mapping, &priv_set, &priv_set_len, &granted, &status); + ok(rc, "AccessCheck error %d\n", GetLastError()); + ok(status == 1, "expected 1, got %d\n", status); + ok(granted == DELETE, "expected DELETE, got %#x\n", granted); + + granted = 0xdeadbeef; + status = 0xdeadbeef; + SetLastError(0xdeadbeef); rc = AccessCheck(sd, token, FILE_DELETE_CHILD, &mapping, &priv_set, &priv_set_len, &granted, &status); ok(rc, "AccessCheck error %d\n", GetLastError()); ok(status == 1, "expected 1, got %d\n", status); @@ -915,9 +924,130 @@ todo_wine { ok(!rc, "AccessCheck should fail\n"); ok(GetLastError() == ERROR_GENERIC_NOT_MAPPED, "expected ERROR_GENERIC_NOT_MAPPED, got %d\n", GetLastError()); + /* Test file access permissions for a file with FILE_ATTRIBUTE_READONLY */ + SetLastError(0xdeadbeef); + fh = CreateFile(file, FILE_READ_DATA, FILE_SHARE_READ, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_READONLY, 0); + ok(fh != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError()); + retSize = 0xdeadbeef; + SetLastError(0xdeadbeef); + rc = WriteFile(fh, "1", 1, &retSize, NULL); + ok(!rc, "WriteFile should fail\n"); + ok(GetLastError() == ERROR_ACCESS_DENIED, "expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); + ok(retSize == 0, "expected 0, got %d\n", retSize); + CloseHandle(fh); + + rc = GetFileAttributes(file); + rc &= ~FILE_ATTRIBUTE_NOT_CONTENT_INDEXED; +todo_wine + ok(rc == (FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_READONLY), + "expected FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_READONLY got %#x\n", rc); + + SetLastError(0xdeadbeef); + rc = SetFileAttributes(file, FILE_ATTRIBUTE_ARCHIVE); + ok(rc, "SetFileAttributes error %d\n", GetLastError()); + SetLastError(0xdeadbeef); + rc = DeleteFile(file); + ok(rc, "DeleteFile error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + fh = CreateFile(file, FILE_READ_DATA, FILE_SHARE_READ, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_READONLY, 0); + ok(fh != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError()); + retSize = 0xdeadbeef; + SetLastError(0xdeadbeef); + rc = WriteFile(fh, "1", 1, &retSize, NULL); + ok(!rc, "WriteFile should fail\n"); + ok(GetLastError() == ERROR_ACCESS_DENIED, "expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); + ok(retSize == 0, "expected 0, got %d\n", retSize); + CloseHandle(fh); + + rc = GetFileAttributes(file); + rc &= ~FILE_ATTRIBUTE_NOT_CONTENT_INDEXED; + ok(rc == (FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_READONLY), + "expected FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_READONLY got %#x\n", rc); + + retSize = 0xdeadbeef; + SetLastError(0xdeadbeef); + rc = GetFileSecurity(file, OWNER_SECURITY_INFORMATION|GROUP_SECURITY_INFORMATION|DACL_SECURITY_INFORMATION, + sd, sdSize, &retSize); + ok(rc, "GetFileSecurity error %d\n", GetLastError()); + ok(retSize == sdSize || broken(retSize == 0) /* NT4 */, "expected %d, got %d\n", sdSize, retSize); + + priv_set_len = sizeof(priv_set); + granted = 0xdeadbeef; + status = 0xdeadbeef; + SetLastError(0xdeadbeef); + rc = AccessCheck(sd, token, FILE_READ_DATA, &mapping, &priv_set, &priv_set_len, &granted, &status); + ok(rc, "AccessCheck error %d\n", GetLastError()); + ok(status == 1, "expected 1, got %d\n", status); + ok(granted == FILE_READ_DATA, "expected FILE_READ_DATA, got %#x\n", granted); + + granted = 0xdeadbeef; + status = 0xdeadbeef; + SetLastError(0xdeadbeef); + rc = AccessCheck(sd, token, FILE_WRITE_DATA, &mapping, &priv_set, &priv_set_len, &granted, &status); + ok(rc, "AccessCheck error %d\n", GetLastError()); +todo_wine { + ok(status == 1, "expected 1, got %d\n", status); + ok(granted == FILE_WRITE_DATA, "expected FILE_WRITE_DATA, got %#x\n", granted); +} + granted = 0xdeadbeef; + status = 0xdeadbeef; + SetLastError(0xdeadbeef); + rc = AccessCheck(sd, token, FILE_EXECUTE, &mapping, &priv_set, &priv_set_len, &granted, &status); + ok(rc, "AccessCheck error %d\n", GetLastError()); +todo_wine { + ok(status == 1, "expected 1, got %d\n", status); + ok(granted == FILE_EXECUTE, "expected FILE_EXECUTE, got %#x\n", granted); +} + granted = 0xdeadbeef; + status = 0xdeadbeef; + SetLastError(0xdeadbeef); + rc = AccessCheck(sd, token, DELETE, &mapping, &priv_set, &priv_set_len, &granted, &status); + ok(rc, "AccessCheck error %d\n", GetLastError()); +todo_wine { + ok(status == 1, "expected 1, got %d\n", status); + ok(granted == DELETE, "expected DELETE, got %#x\n", granted); +} + granted = 0xdeadbeef; + status = 0xdeadbeef; + SetLastError(0xdeadbeef); + rc = AccessCheck(sd, token, FILE_DELETE_CHILD, &mapping, &priv_set, &priv_set_len, &granted, &status); + ok(rc, "AccessCheck error %d\n", GetLastError()); +todo_wine { + ok(status == 1, "expected 1, got %d\n", status); + ok(granted == FILE_DELETE_CHILD, "expected FILE_DELETE_CHILD, got %#x\n", granted); +} + granted = 0xdeadbeef; + status = 0xdeadbeef; + SetLastError(0xdeadbeef); + rc = AccessCheck(sd, token, 0x1ff, &mapping, &priv_set, &priv_set_len, &granted, &status); + ok(rc, "AccessCheck error %d\n", GetLastError()); +todo_wine { + ok(status == 1, "expected 1, got %d\n", status); + ok(granted == 0x1ff, "expected 0x1ff, got %#x\n", granted); +} + granted = 0xdeadbeef; + status = 0xdeadbeef; + SetLastError(0xdeadbeef); + rc = AccessCheck(sd, token, FILE_ALL_ACCESS, &mapping, &priv_set, &priv_set_len, &granted, &status); + ok(rc, "AccessCheck error %d\n", GetLastError()); +todo_wine { + ok(status == 1, "expected 1, got %d\n", status); + ok(granted == FILE_ALL_ACCESS, "expected FILE_ALL_ACCESS, got %#x\n", granted); +} + SetLastError(0xdeadbeef); + rc = DeleteFile(file); + ok(!rc, "DeleteFile should fail\n"); + ok(GetLastError() == ERROR_ACCESS_DENIED, "expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); + SetLastError(0xdeadbeef); + rc = SetFileAttributes(file, FILE_ATTRIBUTE_ARCHIVE); + ok(rc, "SetFileAttributes error %d\n", GetLastError()); + SetLastError(0xdeadbeef); + rc = DeleteFile(file); + ok(rc, "DeleteFile error %d\n", GetLastError()); + CloseHandle(token); - HeapFree(GetProcessHeap (), 0, sd); - DeleteFile(file); + HeapFree(GetProcessHeap(), 0, sd); } static void test_AccessCheck(void)

1 0

← Newer
1
...
27
28
29
30
31
32
33
...
85
Older →

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 March 2011