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

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 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: 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

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

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

Nikolay Sivov : msxml3: Clean formatting chars before passing to base64 decoder.
by Alexandre Julliard 17 Mar '11

17 Mar '11

Module: wine Branch: master Commit: ae2057cbb8cf5f60df061e8152e9f145f106549e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae2057cbb8cf5f60df061e815… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 17 13:14:25 2011 +0300 msxml3: Clean formatting chars before passing to base64 decoder. --- dlls/msxml3/element.c | 31 +++++++++++++++++++++++-------- dlls/msxml3/tests/domdoc.c | 37 ++++++++++++++++++++----------------- 2 files changed, 43 insertions(+), 25 deletions(-) diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 61afb2d..5071244 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -459,7 +459,7 @@ static inline BYTE base64_to_byte(xmlChar c) return c-'a'+26; } -static inline HRESULT VARIANT_from_DT(XDR_DT dt, xmlChar* str, VARIANT* v) +static inline HRESULT variant_from_dt(XDR_DT dt, xmlChar* str, VARIANT* v) { VARIANT src; HRESULT hr = S_OK; @@ -571,9 +571,25 @@ static inline HRESULT VARIANT_from_DT(XDR_DT dt, xmlChar* str, VARIANT* v) case DT_BIN_BASE64: { SAFEARRAYBOUND sab; + xmlChar *c1, *c2; int i, len; - len = xmlStrlen(str); + /* remove all formatting chars */ + c1 = c2 = str; + len = 0; + while (*c2) + { + if ( *c2 == ' ' || *c2 == '\t' || + *c2 == '\n' || *c2 == '\r' ) + { + c2++; + continue; + } + *c1++ = *c2++; + len++; + } + + /* skip padding */ if(str[len-2] == '=') i = 2; else if(str[len-1] == '=') i = 1; else i = 0; @@ -719,23 +735,22 @@ static XDR_DT element_get_dt(xmlNodePtr node) static HRESULT WINAPI domelem_get_nodeTypedValue( IXMLDOMElement *iface, - VARIANT* var1) + VARIANT* v) { domelem *This = impl_from_IXMLDOMElement( iface ); XDR_DT dt; xmlChar* content; HRESULT hr; - TRACE("(%p)->(%p)\n", This, var1); + TRACE("(%p)->(%p)\n", This, v); - if(!var1) - return E_INVALIDARG; + if(!v) return E_INVALIDARG; - V_VT(var1) = VT_NULL; + V_VT(v) = VT_NULL; dt = element_get_dt(get_element(This)); content = xmlNodeGetContent(get_element(This)); - hr = VARIANT_from_DT(dt, content, var1); + hr = variant_from_dt(dt, content, v); xmlFree(content); return hr; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 3e60e24..99553fd 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -373,6 +373,8 @@ static const CHAR szTypeValueXML[] = " <uuid dt:dt=\"uuid\">333C7BC4-460F-11D0-BC04-0080C7055a83</uuid>\n" " <binhex dt:dt=\"bin.hex\">fffca012003c</binhex>\n" " <binbase64 dt:dt=\"bin.base64\">YmFzZTY0IHRlc3Q=</binbase64>\n" +" <binbase64_1 dt:dt=\"bin.base64\">\nYmFzZTY0\nIHRlc3Q=\n</binbase64_1>\n" +" <binbase64_2 dt:dt=\"bin.base64\">\nYmF\r\t z ZTY0\nIHRlc3Q=\n</binbase64_2>\n" "</root>"; static const CHAR szBasicTransformSSXMLPart1[] = @@ -5867,6 +5869,9 @@ static const nodetypedvalue_t get_nodetypedvalue[] = { { "root/r8", VT_R8, "0.412" }, { "root/float", VT_R8, "41221.421" }, { "root/uuid", VT_BSTR, "333C7BC4-460F-11D0-BC04-0080C7055a83" }, + { "root/binbase64", VT_ARRAY|VT_UI1, "base64 test" }, + { "root/binbase64_1", VT_ARRAY|VT_UI1, "base64 test" }, + { "root/binbase64_2", VT_ARRAY|VT_UI1, "base64 test" }, { 0 } }; @@ -5938,21 +5943,6 @@ static void test_nodeTypedValue(void) IXMLDOMNode_Release(node); } - hr = IXMLDOMDocument_selectSingleNode(doc, _bstr_("root/binbase64"), &node); - ok(hr == S_OK, "ret %08x\n", hr ); - { - BYTE bytes[] = {0x62,0x61,0x73,0x65,0x36,0x34,0x20,0x74,0x65,0x73,0x74}; - - hr = IXMLDOMNode_get_nodeTypedValue(node, &value); - ok(hr == S_OK, "ret %08x\n", hr ); - ok(V_VT(&value) == (VT_ARRAY|VT_UI1), "incorrect type\n"); - ok(V_ARRAY(&value)->rgsabound[0].cElements == 11, "incorrect array size\n"); - if(V_ARRAY(&value)->rgsabound[0].cElements == 11) - ok(!memcmp(bytes, V_ARRAY(&value)->pvData, sizeof(bytes)), "incorrect value\n"); - VariantClear(&value); - IXMLDOMNode_Release(node); - } - hr = IXMLDOMDocument_createProcessingInstruction(doc, _bstr_("foo"), _bstr_("value"), &pi); ok(hr == S_OK, "ret %08x\n", hr ); { @@ -6042,6 +6032,12 @@ static void test_nodeTypedValue(void) ok(hr == S_OK, "ret %08x\n", hr ); ok(V_VT(&value) == entry->type, "incorrect type, expected %d, got %d\n", entry->type, V_VT(&value)); + if (entry->type == (VT_ARRAY|VT_UI1)) + { + ok(V_ARRAY(&value)->rgsabound[0].cElements == strlen(entry->value), + "incorrect array size, got %d, expected %d\n", V_ARRAY(&value)->rgsabound[0].cElements, strlen(entry->value)); + } + if (entry->type != VT_BSTR) { if (entry->type == VT_DATE || @@ -6064,8 +6060,15 @@ static void test_nodeTypedValue(void) ok(hr == S_OK, "ret %08x\n", hr ); } - ok(lstrcmpW( V_BSTR(&value), _bstr_(entry->value)) == 0, - "expected %s, got %s\n", entry->value, wine_dbgstr_w(V_BSTR(&value))); + /* for byte array from VT_ARRAY|VT_UI1 it's not a WCHAR buffer */ + if (entry->type == (VT_ARRAY|VT_UI1)) + { + ok(!memcmp( V_BSTR(&value), entry->value, strlen(entry->value)), + "expected %s", entry->value); + } + else + ok(lstrcmpW( V_BSTR(&value), _bstr_(entry->value)) == 0, + "expected %s, got %s\n", entry->value, wine_dbgstr_w(V_BSTR(&value))); } else ok(lstrcmpW( V_BSTR(&value), _bstr_(entry->value)) == 0,

1 0

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

17 Mar '11

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

Alexandre Julliard : winex11: Implement a separate entry point for PatBlt and simplify the StretchBlt handling .
by Alexandre Julliard 17 Mar '11

17 Mar '11

Module: wine Branch: master Commit: 8e396a9417d4aa3c1e9cc6b8fcd97b6f303da2f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e396a9417d4aa3c1e9cc6b8f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 17 14:49:16 2011 +0100 winex11: Implement a separate entry point for PatBlt and simplify the StretchBlt handling. --- dlls/winex11.drv/bitblt.c | 278 ++++++++++++++++++------------------- dlls/winex11.drv/winex11.drv.spec | 1 + 2 files changed, 139 insertions(+), 140 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8e396a9417d4aa3c1e9cc…

1 0

Henri Verbeet : wined3d: Get rid of IWineD3DBaseTexture::IsCondNP2().
by Alexandre Julliard 17 Mar '11

17 Mar '11

Module: wine Branch: master Commit: 09b4ed2e75d7f777be0052b3a6bad24069f65e4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=09b4ed2e75d7f777be0052b3a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 16 18:58:03 2011 +0100 wined3d: Get rid of IWineD3DBaseTexture::IsCondNP2(). --- dlls/wined3d/basetexture.c | 2 +- dlls/wined3d/cubetexture.c | 8 -------- dlls/wined3d/texture.c | 11 +---------- dlls/wined3d/volumetexture.c | 8 -------- include/wine/wined3d.idl | 2 -- 5 files changed, 2 insertions(+), 29 deletions(-) diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index 26e9a70..01652ab 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -371,7 +371,7 @@ void basetexture_apply_state_changes(IWineD3DBaseTextureImpl *texture, const DWORD samplerStates[WINED3D_HIGHEST_SAMPLER_STATE + 1], const struct wined3d_gl_info *gl_info) { - BOOL cond_np2 = IWineD3DBaseTexture_IsCondNP2((IWineD3DBaseTexture *)texture); + BOOL cond_np2 = texture->baseTexture.cond_np2; GLenum textureDimensions = texture->baseTexture.target; DWORD state; DWORD aniso; diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index 9a27f5b..aed3674 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -319,13 +319,6 @@ static void WINAPI IWineD3DCubeTextureImpl_GenerateMipSubLevels(IWineD3DCubeText basetexture_generate_mipmaps((IWineD3DBaseTextureImpl *)iface); } -static BOOL WINAPI IWineD3DCubeTextureImpl_IsCondNP2(IWineD3DCubeTexture *iface) -{ - TRACE("iface %p.\n", iface); - - return FALSE; -} - static struct wined3d_resource * WINAPI IWineD3DCubeTextureImpl_GetSubResource(IWineD3DCubeTexture *iface, UINT sub_resource_idx) { @@ -378,7 +371,6 @@ static const IWineD3DCubeTextureVtbl IWineD3DCubeTexture_Vtbl = IWineD3DCubeTextureImpl_SetAutoGenFilterType, IWineD3DCubeTextureImpl_GetAutoGenFilterType, IWineD3DCubeTextureImpl_GenerateMipSubLevels, - IWineD3DCubeTextureImpl_IsCondNP2, IWineD3DCubeTextureImpl_GetSubResource, IWineD3DCubeTextureImpl_AddDirtyRegion, }; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 4bc018c..3eb3c71 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -57,7 +57,7 @@ static HRESULT texture_bind(IWineD3DBaseTextureImpl *texture, * state. The same applies to filtering. Even if the texture has only * one mip level, the default LINEAR_MIPMAP_LINEAR filter causes a SW * fallback on macos. */ - if (IWineD3DBaseTexture_IsCondNP2((IWineD3DBaseTexture *)texture)) + if (texture->baseTexture.cond_np2) { GLenum target = texture->baseTexture.target; @@ -335,14 +335,6 @@ static void WINAPI IWineD3DTextureImpl_GenerateMipSubLevels(IWineD3DBaseTexture basetexture_generate_mipmaps((IWineD3DBaseTextureImpl *)iface); } -static BOOL WINAPI IWineD3DTextureImpl_IsCondNP2(IWineD3DBaseTexture *iface) -{ - IWineD3DBaseTextureImpl *This = (IWineD3DBaseTextureImpl *)iface; - TRACE("(%p)\n", This); - - return This->baseTexture.cond_np2; -} - static struct wined3d_resource * WINAPI IWineD3DTextureImpl_GetSubResource(IWineD3DBaseTexture *iface, UINT sub_resource_idx) { @@ -395,7 +387,6 @@ static const IWineD3DBaseTextureVtbl IWineD3DTexture_Vtbl = IWineD3DTextureImpl_SetAutoGenFilterType, IWineD3DTextureImpl_GetAutoGenFilterType, IWineD3DTextureImpl_GenerateMipSubLevels, - IWineD3DTextureImpl_IsCondNP2, IWineD3DTextureImpl_GetSubResource, IWineD3DTextureImpl_AddDirtyRegion, }; diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index 07a83c3..3831ef1 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -252,13 +252,6 @@ static void WINAPI IWineD3DVolumeTextureImpl_GenerateMipSubLevels(IWineD3DBaseTe basetexture_generate_mipmaps((IWineD3DBaseTextureImpl *)iface); } -static BOOL WINAPI IWineD3DVolumeTextureImpl_IsCondNP2(IWineD3DBaseTexture *iface) -{ - TRACE("iface %p.\n", iface); - - return FALSE; -} - static struct wined3d_resource * WINAPI IWineD3DVolumeTextureImpl_GetSubResource(IWineD3DBaseTexture *iface, UINT sub_resource_idx) { @@ -311,7 +304,6 @@ static const IWineD3DBaseTextureVtbl IWineD3DVolumeTexture_Vtbl = IWineD3DVolumeTextureImpl_SetAutoGenFilterType, IWineD3DVolumeTextureImpl_GetAutoGenFilterType, IWineD3DVolumeTextureImpl_GenerateMipSubLevels, - IWineD3DVolumeTextureImpl_IsCondNP2, IWineD3DVolumeTextureImpl_GetSubResource, IWineD3DVolumeTextureImpl_AddDirtyRegion, }; diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index b918240..50eba07 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2356,8 +2356,6 @@ interface IWineD3DBaseTexture : IWineD3DResource ); void GenerateMipSubLevels( ); - BOOL IsCondNP2( - ); struct wined3d_resource *GetSubResource( [in] UINT sub_resource_idx );

1 0

Henri Verbeet : wined3d: Don't use surface_from_resource() to retrieve volumes.
by Alexandre Julliard 17 Mar '11

17 Mar '11

Module: wine Branch: master Commit: b17d64923e4a1ecb60970319c4ad6bbb4f32a8c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b17d64923e4a1ecb60970319c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 16 18:58:04 2011 +0100 wined3d: Don't use surface_from_resource() to retrieve volumes. This happened to work because the field offsets are the same. --- dlls/wined3d/device.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 972aaa5..199aba9 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5179,9 +5179,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateTexture(IWineD3DDevice *iface, for (i = 0; i < level_count; ++i) { - src_volume = (IWineD3DVolume *)surface_from_resource(basetexture_get_sub_resource( + src_volume = (IWineD3DVolume *)volume_from_resource(basetexture_get_sub_resource( (IWineD3DBaseTextureImpl *)src_texture, i)); - dst_volume = (IWineD3DVolume *)surface_from_resource(basetexture_get_sub_resource( + dst_volume = (IWineD3DVolume *)volume_from_resource(basetexture_get_sub_resource( (IWineD3DBaseTextureImpl *)dst_texture, i)); hr = IWineD3DDeviceImpl_UpdateVolume(iface, src_volume, dst_volume); if (FAILED(hr))

1 0