January 2014 - Wine-Commits

Huw Davies : riched20: Revert to the default paragraph style when all text is deleted.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 56f05cfa51645621e2ba64cc42f95b052ef146bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=56f05cfa51645621e2ba64cc4… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Nov 4 14:23:53 2013 +0000 riched20: Revert to the default paragraph style when all text is deleted. (cherry picked from commit 58e83ebdea14dbc3e4839b17ec4cbcd59fa67293) --- dlls/riched20/caret.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index b39a8c7..fd7034d 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -284,13 +284,15 @@ BOOL ME_InternalDeleteText(ME_TextEditor *editor, ME_Cursor *start, int nChars, BOOL bForce) { ME_Cursor c = *start; - int nOfs = ME_GetCursorOfs(start); + int nOfs = ME_GetCursorOfs(start), text_len = ME_GetTextLength( editor ); int shift = 0; int totalChars = nChars; ME_DisplayItem *start_para; + BOOL delete_all = FALSE; /* Prevent deletion past last end of paragraph run. */ - nChars = min(nChars, ME_GetTextLength(editor) - nOfs); + nChars = min(nChars, text_len - nOfs); + if (nChars == text_len) delete_all = TRUE; start_para = c.pPara; if (!bForce) @@ -424,6 +426,7 @@ BOOL ME_InternalDeleteText(ME_TextEditor *editor, ME_Cursor *start, continue; } } + if (delete_all) ME_SetDefaultParaFormat( start_para->member.para.pFmt ); return TRUE; }

1 0

Andrey Zhezherun : msvcp: Added missing casts to unsigned char in streambuf functions.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 9eb0f54db1244041229b7050e587fdbb36cef0d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9eb0f54db1244041229b7050e… Author: Andrey Zhezherun <zhezherun(a)yandex.ru> Date: Thu Oct 31 23:38:29 2013 +0000 msvcp: Added missing casts to unsigned char in streambuf functions. (cherry picked from commit c1a5b06d49e5e39c649b5f9aa231ad4c89aae54f) --- dlls/msvcp100/ios.c | 2 +- dlls/msvcp60/ios.c | 6 +++--- dlls/msvcp71/ios.c | 6 +++--- dlls/msvcp90/ios.c | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/msvcp100/ios.c b/dlls/msvcp100/ios.c index 16677f2..abf9d10 100644 --- a/dlls/msvcp100/ios.c +++ b/dlls/msvcp100/ios.c @@ -978,7 +978,7 @@ int __thiscall basic_streambuf_char_sputc(basic_streambuf_char *this, char ch) { TRACE("(%p %d)\n", this, ch); return basic_streambuf_char__Pnavail(this) ? - (*basic_streambuf_char__Pninc(this) = ch) : + (unsigned char)(*basic_streambuf_char__Pninc(this) = ch) : call_basic_streambuf_char_overflow(this, (unsigned char)ch); } diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index e985e07..7ce3694 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -1409,7 +1409,7 @@ int __thiscall basic_streambuf_char_sputc(basic_streambuf_char *this, char ch) { TRACE("(%p %d)\n", this, ch); return basic_streambuf_char__Pnavail(this) ? - (*basic_streambuf_char__Pninc(this) = ch) : + (unsigned char)(*basic_streambuf_char__Pninc(this) = ch) : call_basic_streambuf_char_overflow(this, (unsigned char)ch); } @@ -3447,7 +3447,7 @@ int __thiscall basic_stringbuf_char_overflow(basic_stringbuf_char *this, int met this->seekhigh, basic_streambuf_char_epptr(&this->base)); if(ptr && ptr<basic_streambuf_char_epptr(&this->base)) - return (*basic_streambuf_char__Pninc(&this->base) = meta); + return (unsigned char)(*basic_streambuf_char__Pninc(&this->base) = meta); oldsize = (ptr ? basic_streambuf_char_epptr(&this->base)-basic_streambuf_char_eback(&this->base): 0); size = oldsize|0xf; @@ -3484,7 +3484,7 @@ int __thiscall basic_stringbuf_char_overflow(basic_stringbuf_char *this, int met MSVCRT_operator_delete(ptr); } - return (*basic_streambuf_char__Pninc(&this->base) = meta); + return (unsigned char)(*basic_streambuf_char__Pninc(&this->base) = meta); } /* ?pbackfail@?$basic_stringbuf(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@MAEHH(a)Z */ diff --git a/dlls/msvcp71/ios.c b/dlls/msvcp71/ios.c index 8fe6000..d9b7bc9 100644 --- a/dlls/msvcp71/ios.c +++ b/dlls/msvcp71/ios.c @@ -1451,7 +1451,7 @@ int __thiscall basic_streambuf_char_sputc(basic_streambuf_char *this, char ch) { TRACE("(%p %d)\n", this, ch); return basic_streambuf_char__Pnavail(this) ? - (*basic_streambuf_char__Pninc(this) = ch) : + (unsigned char)(*basic_streambuf_char__Pninc(this) = ch) : call_basic_streambuf_char_overflow(this, (unsigned char)ch); } @@ -3697,7 +3697,7 @@ int __thiscall basic_stringbuf_char_overflow(basic_stringbuf_char *this, int met this->seekhigh, basic_streambuf_char_epptr(&this->base)); if(ptr && ptr<basic_streambuf_char_epptr(&this->base)) - return (*basic_streambuf_char__Pninc(&this->base) = meta); + return (unsigned char)(*basic_streambuf_char__Pninc(&this->base) = meta); oldsize = (ptr ? basic_streambuf_char_epptr(&this->base)-basic_streambuf_char_eback(&this->base): 0); size = oldsize|0xf; @@ -3734,7 +3734,7 @@ int __thiscall basic_stringbuf_char_overflow(basic_stringbuf_char *this, int met MSVCRT_operator_delete(ptr); } - return (*basic_streambuf_char__Pninc(&this->base) = meta); + return (unsigned char)(*basic_streambuf_char__Pninc(&this->base) = meta); } /* ?pbackfail@?$basic_stringbuf(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@MAEHH(a)Z */ diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 87ad06e..735c140 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -1406,7 +1406,7 @@ int __thiscall basic_streambuf_char_sputc(basic_streambuf_char *this, char ch) { TRACE("(%p %d)\n", this, ch); return basic_streambuf_char__Pnavail(this) ? - (*basic_streambuf_char__Pninc(this) = ch) : + (unsigned char)(*basic_streambuf_char__Pninc(this) = ch) : call_basic_streambuf_char_overflow(this, (unsigned char)ch); } @@ -3702,7 +3702,7 @@ int __thiscall basic_stringbuf_char_overflow(basic_stringbuf_char *this, int met this->seekhigh, basic_streambuf_char_epptr(&this->base)); if(ptr && ptr<basic_streambuf_char_epptr(&this->base)) - return (*basic_streambuf_char__Pninc(&this->base) = meta); + return (unsigned char)(*basic_streambuf_char__Pninc(&this->base) = meta); oldsize = (ptr ? basic_streambuf_char_epptr(&this->base)-basic_streambuf_char_eback(&this->base): 0); size = oldsize|0xf; @@ -3739,7 +3739,7 @@ int __thiscall basic_stringbuf_char_overflow(basic_stringbuf_char *this, int met MSVCRT_operator_delete(ptr); } - return (*basic_streambuf_char__Pninc(&this->base) = meta); + return (unsigned char)(*basic_streambuf_char__Pninc(&this->base) = meta); } /* ?pbackfail@?$basic_stringbuf(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@MAEHH(a)Z */

1 0

Jacek Caban : jscript: Added support for octal literals.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 546b51c411c326ee932dbd7fdf6e3af8dbf7836f URL: http://source.winehq.org/git/wine.git/?a=commit;h=546b51c411c326ee932dbd7fd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 6 17:18:28 2013 +0100 jscript: Added support for octal literals. (cherry picked from commit 4d9ea4b5635654cfcd65478a1cc47363ee1798ad) --- dlls/jscript/lex.c | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index 54c8fcf..d6a0ba1 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -486,15 +486,37 @@ static int parse_numeric_literal(parser_ctx_t *ctx, literal_t **literal) return tNumericLiteral; } + if(isdigitW(*ctx->ptr)) { + unsigned base = 8; + const WCHAR *ptr; + double val = 0; + + for(ptr = ctx->ptr; ptr < ctx->end && isdigitW(*ptr); ptr++) { + if(*ptr > '7') { + base = 10; + break; + } + } + + do { + val = val*base + *ctx->ptr-'0'; + }while(++ctx->ptr < ctx->end && isdigitW(*ctx->ptr)); + + /* FIXME: Do we need it here? */ + if(ctx->ptr < ctx->end && (is_identifier_char(*ctx->ptr) || *ctx->ptr == '.')) { + WARN("wrong char after octal literal: '%c'\n", *ctx->ptr); + return lex_error(ctx, JS_E_MISSING_SEMICOLON); + } + + *literal = new_double_literal(ctx, val); + return tNumericLiteral; + } + if(is_identifier_char(*ctx->ptr)) { WARN("wrong char after zero\n"); return lex_error(ctx, E_FAIL); } - if(isdigitW(*ctx->ptr)) { - FIXME("octal literals not implemented\n"); - return lex_error(ctx, E_NOTIMPL); - } } return parse_double_literal(ctx, l, literal);

1 0

Rico Schüller : opengl32: Fix some style issues.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: d63936d548c906672860063060c55400342f6deb URL: http://source.winehq.org/git/wine.git/?a=commit;h=d63936d548c90667286006306… Author: Rico Schüller <kgbricola(a)web.de> Date: Fri Nov 1 18:18:14 2013 +0100 opengl32: Fix some style issues. (cherry picked from commit 465673a3d6906d32119e546f568d07e47b6ff4b7) --- dlls/opengl32/make_opengl | 108 ++++++++++++++++++++++----------------------- 1 file changed, 52 insertions(+), 56 deletions(-) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index 9817f8c..18d5107 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -210,10 +210,9 @@ sub ConvertType($) ); foreach my $org (reverse sort keys %hash) { - if ($type =~ /$org/) { - my ($before, $after) = ($type =~ /^(.*)$org(.*)$/); - return "$before$hash{$org}$after"; - } + if ($type =~ /^(.*)$org(.*)$/) { + return "$1$hash{$org}$2"; + } } return $type; } @@ -229,10 +228,9 @@ sub ConvertVarName($) "far" => "farParam" ); foreach my $org (keys %hash) { - if ($type =~ /$org/) { - my ($before, $after) = ($type =~ /^(.*)$org(.*)$/); - return "$before$hash{$org}$after"; - } + if ($type =~ /^(.*)$org(.*)$/) { + return "$1$hash{$org}$2"; + } } return $type; } @@ -255,22 +253,20 @@ sub GenerateThunk($$$$) # If for opengl_norm.c, generate a nice heading otherwise Patrik won't be happy :-) # Patrik says: Well I would be even happier if a (OPENGL32.@) was added as well. Done. :-) if ($comment eq 1) { - $ret = "$ret/***********************************************************************\n"; - $ret = "$ret * $name (OPENGL32.\@)\n"; - $ret = "$ret */\n"; + $ret .= "/***********************************************************************\n"; + $ret .= " * $name (OPENGL32.\@)\n"; + $ret .= " */\n"; } - $ret = $ret . ConvertType($func_ref->[0]) . " WINAPI $name( "; + $ret .= ConvertType($func_ref->[0]) . " WINAPI $name( "; for (my $i = 0; $i < @{$func_ref->[1]}; $i++) { - ## Quick debug code :-) - ## print $func_ref->[1]->[$i]->[1] . "\n"; - my $type = $func_ref->[1]->[$i]->[0]; - my $name = ConvertVarName($func_ref->[1]->[$i]->[1]); - $ret .= ConvertType($type) . " $name"; - $call_arg .= $name; - if ($type =~ /\*/) { - $trace_arg .= "%p"; + my $type = $func_ref->[1]->[$i]->[0]; + my $name = ConvertVarName($func_ref->[1]->[$i]->[1]); + $ret .= ConvertType($type) . " $name"; + $call_arg .= $name; + if ($type =~ /\*/) { + $trace_arg .= "%p"; $trace_call_arg .= $name; - } elsif (defined $debug_conv{$type}) { + } elsif (defined $debug_conv{$type}) { if ($debug_conv{$type} =~ /(.*),(.*)/) { $trace_arg .= $1; @@ -281,40 +277,40 @@ sub GenerateThunk($$$$) $trace_arg .= $debug_conv{$type}; $trace_call_arg .= $name; } - } - else { printf "Unknown type %s\n", $type; } - if ($i+1 < @{$func_ref->[1]}) { - $ret .= ", "; - $call_arg .= ", "; - $trace_call_arg .= ", "; - $trace_arg .= ", "; - } else { - $ret .= " "; - $call_arg .= " "; - $trace_call_arg .= " "; - } + } + else { printf "Unknown type %s\n", $type; } + if ($i+1 < @{$func_ref->[1]}) { + $ret .= ", "; + $call_arg .= ", "; + $trace_call_arg .= ", "; + $trace_arg .= ", "; + } else { + $ret .= " "; + $call_arg .= " "; + $trace_call_arg .= " "; + } } $ret .= 'void ' if (!@{$func_ref->[1]}); $ret .= ") {\n"; $ret .= " const struct opengl_funcs *funcs = NtCurrentTeb()->glTable;\n"; if ($func_ref->[0] ne "void" && $gen_thread_safe) { - $ret = "$ret " . ConvertType($func_ref->[0]) . " ret_value;\n"; + $ret .= " " . ConvertType($func_ref->[0]) . " ret_value;\n"; } if ($gen_traces) { - $ret = "$ret TRACE(\"($trace_arg)\\n\""; - if ($trace_arg ne "") { - $ret .= ", $trace_call_arg"; - } - $ret = "$ret);\n"; + $ret .= " TRACE(\"($trace_arg)\\n\""; + if ($trace_arg ne "") { + $ret .= ", $trace_call_arg"; + } + $ret .= ");\n"; } if ($gen_thread_safe) { - $ret .= " ENTER_GL();\n"; + $ret .= " ENTER_GL();\n"; $ret .= " "; if ($func_ref->[0] ne "void") { $ret .= "ret_value = "; } $ret .= "funcs->$prefix.p_$name( $call_arg);\n"; - $ret .= " LEAVE_GL();\n"; + $ret .= " LEAVE_GL();\n"; if ($func_ref->[0] ne "void") { $ret .= " return ret_value;\n" } @@ -326,7 +322,7 @@ sub GenerateThunk($$$$) } $ret .= "funcs->$prefix.p_$name( $call_arg);\n"; } - $ret = "$ret}\n"; + $ret .= "}\n"; # Return this string.... return $ret; @@ -341,10 +337,10 @@ sub generate_null_func($$) $ret = "static " . ConvertType($func_ref->[0]) . " null_$name( "; for (my $i = 0; $i < @{$func_ref->[1]}; $i++) { - my $type = $func_ref->[1]->[$i]->[0]; - my $name = ConvertVarName($func_ref->[1]->[$i]->[1]); - $ret .= ConvertType($type) . " $name"; - $ret .= "," if ($i+1 < @{$func_ref->[1]}); + my $type = $func_ref->[1]->[$i]->[0]; + my $name = ConvertVarName($func_ref->[1]->[$i]->[1]); + $ret .= ConvertType($type) . " $name"; + $ret .= "," if ($i+1 < @{$func_ref->[1]}); $ret .= " "; } $ret .= 'void ' if (!@{$func_ref->[1]}); @@ -368,7 +364,7 @@ sub get_func_proto($$$) $ret .= " " . sprintf($format,$name) . "("; for (my $i = 0; $i < @{$func->[1]}; $i++) { - $ret .= ConvertType($func->[1]->[$i]->[0]); + $ret .= ConvertType($func->[1]->[$i]->[0]); $ret .= "," if ($i+1 < @{$func->[1]}); } $ret .= "void" unless @{$func->[1]}; @@ -882,14 +878,14 @@ open(SPEC, ">$spec_file"); foreach (sort keys %norm_functions) { my $args=" "; for (my $i = 0; $i < @{$norm_functions{$_}->[1]}; $i++) { - my $type = $norm_functions{$_}->[1]->[$i]->[0]; - if ($type =~ /\*/) { - $args .= "ptr "; - } elsif (defined($arg_conv{$type})) { - $args .= "$@$arg_conv{$type}[0] "; - } else { - die "No conversion for GL type $type...\n"; - } + my $type = $norm_functions{$_}->[1]->[$i]->[0]; + if ($type =~ /\*/) { + $args .= "ptr "; + } elsif (defined($arg_conv{$type})) { + $args .= "$@$arg_conv{$type}[0] "; + } else { + die "No conversion for GL type $type...\n"; + } } $args = substr($args,1,-1); print SPEC "@ stdcall $_($args)\n"; @@ -1003,7 +999,7 @@ foreach (sort keys %ext_functions) { my $func_ref = $ext_functions{$_}; print EXT " { \"$_\", \"$func_ref->[2]\", $_ }"; if ($i != $count-1) { - print EXT ","; + print EXT ","; } $i++; print EXT "\n";

1 0

Ken Thomases : winemac: Reduce duplicated code by consolidating exit paths from format_for_type() .
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: edf4aac3d2c0757c0975b8cdabc1d1488efb68d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=edf4aac3d2c0757c0975b8cda… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Nov 6 06:59:00 2013 -0600 winemac: Reduce duplicated code by consolidating exit paths from format_for_type(). (cherry picked from commit aa53603135fa8699b1465dca40556c14ed332551) --- dlls/winemac.drv/clipboard.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 5d765f4..f97faea 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -361,10 +361,7 @@ static WINE_CLIPFORMAT* format_for_type(WINE_CLIPFORMAT *current, CFStringRef ty { format = LIST_ENTRY(ptr, WINE_CLIPFORMAT, entry); if (CFEqual(format->type, type)) - { - TRACE(" -> %p/%s\n", format, debugstr_format(format->format_id)); - return format; - } + goto done; } format = NULL; @@ -376,7 +373,7 @@ static WINE_CLIPFORMAT* format_for_type(WINE_CLIPFORMAT *current, CFStringRef ty { ERR("Shouldn't happen. Built-in type %s should have matched something in format list.\n", debugstr_cf(type)); - return NULL; + goto done; } else if (CFStringHasPrefix(type, registered_name_type_prefix)) { @@ -403,6 +400,7 @@ static WINE_CLIPFORMAT* format_for_type(WINE_CLIPFORMAT *current, CFStringRef ty HeapFree(GetProcessHeap(), 0, name); } +done: TRACE(" -> %p/%s\n", format, debugstr_format(format ? format->format_id : 0)); return format; }

1 0

Stefan Dösinger : wined3d: GL_ARB_instanced_arrays provides glDrawElementsInstanced.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 728766f64ef5293b2c5f7dda99c11394ac7b9558 URL: http://source.winehq.org/git/wine.git/?a=commit;h=728766f64ef5293b2c5f7dda9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Nov 4 12:38:34 2013 +0100 wined3d: GL_ARB_instanced_arrays provides glDrawElementsInstanced. (cherry picked from commit 292612cf4b4a906d273d096ffc2a8c25a0e735ac) --- dlls/wined3d/drawprim.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 490bf15..2bd9488 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -44,7 +44,7 @@ static void drawStridedFast(const struct wined3d_gl_info *gl_info, GLenum primit GLenum idxtype = idx_size == 2 ? GL_UNSIGNED_SHORT : GL_UNSIGNED_INT; if (instance_count) { - if (!gl_info->supported[ARB_DRAW_INSTANCED]) + if (!gl_info->supported[ARB_DRAW_INSTANCED] && !gl_info->supported[ARB_INSTANCED_ARRAYS]) { FIXME("Instanced drawing not supported.\n"); }

1 0

Stefan Dösinger : wined3d: Check for support before calling glDrawElementsInstancedBaseVertex.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 738302ffd1d923a7fa981ff5bafce78e77252022 URL: http://source.winehq.org/git/wine.git/?a=commit;h=738302ffd1d923a7fa981ff5b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Nov 4 12:38:33 2013 +0100 wined3d: Check for support before calling glDrawElementsInstancedBaseVertex. (cherry picked from commit 84a1e60e48d99efdaa6d7f4648d51bf938a98f98) --- dlls/wined3d/drawprim.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index c75ab59..490bf15 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -52,9 +52,18 @@ static void drawStridedFast(const struct wined3d_gl_info *gl_info, GLenum primit { if (start_instance) FIXME("Start instance (%u) not supported.\n", start_instance); - GL_EXTCALL(glDrawElementsInstancedBaseVertex(primitive_type, count, idxtype, - (const char *)idx_data + (idx_size * start_idx), instance_count, base_vertex_index)); - checkGLcall("glDrawElementsInstancedBaseVertex"); + if (gl_info->supported[ARB_DRAW_ELEMENTS_BASE_VERTEX]) + { + GL_EXTCALL(glDrawElementsInstancedBaseVertex(primitive_type, count, idxtype, + (const char *)idx_data + (idx_size * start_idx), instance_count, base_vertex_index)); + checkGLcall("glDrawElementsInstancedBaseVertex"); + } + else + { + GL_EXTCALL(glDrawElementsInstancedARB(primitive_type, count, idxtype, + (const char *)idx_data + (idx_size * start_idx), instance_count)); + checkGLcall("glDrawElementsInstancedARB"); + } } } else if (gl_info->supported[ARB_DRAW_ELEMENTS_BASE_VERTEX])

1 0

Hans Leidekker : wbemprox: Add a partial implementation of Win32_NetworkAdapterConfiguration.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 113ee49bcd92e402cfa312e614334fedf9126123 URL: http://source.winehq.org/git/wine.git/?a=commit;h=113ee49bcd92e402cfa312e61… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Nov 4 11:54:51 2013 +0100 wbemprox: Add a partial implementation of Win32_NetworkAdapterConfiguration. (cherry picked from commit ec1a57f25b25dba1ed47e8456cc64c2cc1ee0aa1) --- dlls/wbemprox/builtin.c | 63 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 4d1d787..90d077b 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -66,6 +66,9 @@ static const WCHAR class_logicaldisk2W[] = {'C','I','M','_','L','o','g','i','c','a','l','D','i','s','k',0}; static const WCHAR class_networkadapterW[] = {'W','i','n','3','2','_','N','e','t','w','o','r','k','A','d','a','p','t','e','r',0}; +static const WCHAR class_networkadapterconfigW[] = + {'W','i','n','3','2','_','N','e','t','w','o','r','k','A','d','a','p','t','e','r', + 'C','o','n','f','i','g','u','r','a','t','i','o','n',0}; static const WCHAR class_osW[] = {'W','i','n','3','2','_','O','p','e','r','a','t','i','n','g','S','y','s','t','e','m',0}; static const WCHAR class_paramsW[] = @@ -160,6 +163,8 @@ static const WCHAR prop_interfaceindexW[] = {'I','n','t','e','r','f','a','c','e','I','n','d','e','x',0}; static const WCHAR prop_intvalueW[] = {'I','n','t','e','g','e','r','V','a','l','u','e',0}; +static const WCHAR prop_ipenabledW[] = + {'I','P','E','n','a','b','l','e','d',0}; static const WCHAR prop_lastbootuptimeW[] = {'L','a','s','t','B','o','o','t','U','p','T','i','m','e',0}; static const WCHAR prop_localeW[] = @@ -340,6 +345,12 @@ static const struct column col_networkadapter[] = { prop_pnpdeviceidW, CIM_STRING }, { prop_speedW, CIM_UINT64 } }; +static const struct column col_networkadapterconfig[] = +{ + { prop_indexW, CIM_UINT32|COL_FLAG_KEY }, + { prop_ipenabledW, CIM_BOOLEAN }, + { prop_macaddressW, CIM_STRING|COL_FLAG_DYNAMIC } +}; static const struct column col_os[] = { { prop_captionW, CIM_STRING }, @@ -598,6 +609,12 @@ struct record_networkadapter const WCHAR *pnpdevice_id; UINT64 speed; }; +struct record_networkadapterconfig +{ + UINT32 index; + int ipenabled; + const WCHAR *mac_address; +}; struct record_operatingsystem { const WCHAR *caption; @@ -1598,6 +1615,50 @@ static enum fill_status fill_networkadapter( struct table *table, const struct e return status; } +static enum fill_status fill_networkadapterconfig( struct table *table, const struct expr *cond ) +{ + struct record_networkadapterconfig *rec; + IP_ADAPTER_ADDRESSES *aa, *buffer; + UINT row = 0, offset = 0, count = 0; + DWORD size = 0, ret; + enum fill_status status = FILL_STATUS_UNFILTERED; + + ret = GetAdaptersAddresses( AF_UNSPEC, 0, NULL, NULL, &size ); + if (ret != ERROR_BUFFER_OVERFLOW) return FILL_STATUS_FAILED; + + if (!(buffer = heap_alloc( size ))) return FILL_STATUS_FAILED; + if (GetAdaptersAddresses( AF_UNSPEC, 0, NULL, buffer, &size )) + { + heap_free( buffer ); + return FILL_STATUS_FAILED; + } + for (aa = buffer; aa; aa = aa->Next) count++; + if (!resize_table( table, count, sizeof(*rec) )) + { + heap_free( buffer ); + return FILL_STATUS_FAILED; + } + for (aa = buffer; aa; aa = aa->Next) + { + rec = (struct record_networkadapterconfig *)(table->data + offset); + rec->index = aa->u.s.IfIndex; + rec->ipenabled = -1; + rec->mac_address = get_mac_address( aa->PhysicalAddress, aa->PhysicalAddressLength ); + if (!match_row( table, row, cond, &status )) + { + free_row_values( table, row ); + continue; + } + offset += sizeof(*rec); + row++; + } + TRACE("created %u rows\n", row); + table->num_rows = row; + + heap_free( buffer ); + return status; +} + static WCHAR *get_cmdline( DWORD process_id ) { if (process_id == GetCurrentProcessId()) return heap_strdupW( GetCommandLineW() ); @@ -2100,6 +2161,8 @@ static struct table builtin_classes[] = { class_logicaldiskW, SIZEOF(col_logicaldisk), col_logicaldisk, 0, 0, NULL, fill_logicaldisk }, { class_logicaldisk2W, SIZEOF(col_logicaldisk), col_logicaldisk, 0, 0, NULL, fill_logicaldisk }, { class_networkadapterW, SIZEOF(col_networkadapter), col_networkadapter, 0, 0, NULL, fill_networkadapter }, + { class_networkadapterconfigW, SIZEOF(col_networkadapterconfig), col_networkadapterconfig, 0, 0, NULL, + fill_networkadapterconfig }, { class_osW, SIZEOF(col_os), col_os, 0, 0, NULL, fill_os }, { class_paramsW, SIZEOF(col_param), col_param, SIZEOF(data_param), 0, (BYTE *)data_param }, { class_processW, SIZEOF(col_process), col_process, 0, 0, NULL, fill_process },

1 0

Andrey Zhezherun : msvcp: Fixed char_traits<char>::to_int_type.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 659757be9bb1a719675b52800067fa60046bb11b URL: http://source.winehq.org/git/wine.git/?a=commit;h=659757be9bb1a719675b52800… Author: Andrey Zhezherun <zhezherun(a)yandex.ru> Date: Thu Oct 31 23:35:21 2013 +0000 msvcp: Fixed char_traits<char>::to_int_type. (cherry picked from commit 43d31483572dd5d17f3fa300738c813ef169a8f1) --- dlls/msvcp71/string.c | 2 +- dlls/msvcp90/string.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp71/string.c b/dlls/msvcp71/string.c index 415e514..848d39f 100644 --- a/dlls/msvcp71/string.c +++ b/dlls/msvcp71/string.c @@ -162,7 +162,7 @@ char CDECL MSVCP_char_traits_char_to_char_type(const int *i) /* ?to_int_type@?$char_traits(a)D@std@@SAHAEBD(a)Z */ int CDECL MSVCP_char_traits_char_to_int_type(const char *ch) { - return (int)*ch; + return (unsigned char)*ch; } /* ?eq_int_type@?$char_traits(a)D@std@@SA_NABH0(a)Z */ diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index a0359a1..fd7b131 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -162,7 +162,7 @@ char CDECL MSVCP_char_traits_char_to_char_type(const int *i) /* ?to_int_type@?$char_traits(a)D@std@@SAHAEBD(a)Z */ int CDECL MSVCP_char_traits_char_to_int_type(const char *ch) { - return (int)*ch; + return (unsigned char)*ch; } /* ?eq_int_type@?$char_traits(a)D@std@@SA_NABH0(a)Z */

1 0

Henri Verbeet : wined3d: Mark the context valid if making it current on the "backup" window worked.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 638f15f3679c3ae1d9ec40d1fdc606a4a194f3aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=638f15f3679c3ae1d9ec40d1f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 4 10:02:44 2013 +0100 wined3d: Mark the context valid if making it current on the "backup" window worked. (cherry picked from commit f4aab54ca15d0447e1336cea7844fdabbb975339) --- dlls/wined3d/context.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index a20bc7f..4a37b23 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -812,6 +812,8 @@ static BOOL context_set_gl_context(struct wined3d_context *ctx) context_set_current(NULL); return FALSE; } + + ctx->valid = 1; } return TRUE; }

1 0

Rico Schüller : opengl32: Use opengl xml registry files.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: bac043824b092295b2ae0a91a30a0e97d08752d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bac043824b092295b2ae0a91a… Author: Rico Schüller <kgbricola(a)web.de> Date: Fri Nov 1 18:18:26 2013 +0100 opengl32: Use opengl xml registry files. (cherry picked from commit 2fa9b7ebb5cee85a1d712a78b8ff50eae097851f) --- dlls/opengl32/make_opengl | 414 +++--- dlls/opengl32/opengl_ext.c | 2918 ++++++++++++++++++++++++++++++++----------- dlls/opengl32/opengl_norm.c | 1146 +++++++++++------ dlls/winemac.drv/opengl.c | 8 +- dlls/winex11.drv/opengl.c | 8 +- include/wine/wgl.h | 504 ++++++-- include/wine/wgl_driver.h | 860 ++++++++----- 7 files changed, 4098 insertions(+), 1760 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bac043824b092295b2ae0…

1 0

Rico Schüller : opengl32: Allow multiple extensions to support the same function.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 3c49f0a67a6e2ff73f92dec06ec1bd3268a54baa URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c49f0a67a6e2ff73f92dec06… Author: Rico Schüller <kgbricola(a)web.de> Date: Fri Nov 1 18:18:19 2013 +0100 opengl32: Allow multiple extensions to support the same function. This allows that gl functions are available for different extensions, e.g. "glVertexP2ui" which is new GL_ARB_vertex_type_2_10_10_10_rev and also in GL_VERSION_3_3. It is valid to get that function for each gl version when GL_ARB_vertex_type_2_10_10_10_rev is in the extension list. On the other hand that function is available, when the gl version is >= 3.3. (cherry picked from commit 8a23fbf56fa9e0191fbcdfe942b9be18d74c6388) --- dlls/opengl32/wgl.c | 53 ++++++++++++++++++++++++++++----------------------- 1 file changed, 29 insertions(+), 24 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 1317ff5..6735915 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -665,10 +665,8 @@ int WINAPI wglGetLayerPaletteEntries(HDC hdc, } /* check if the extension is present in the list */ -static BOOL has_extension( const char *list, const char *ext ) +static BOOL has_extension( const char *list, const char *ext, size_t len ) { - size_t len = strlen( ext ); - while (list) { while (*list == ' ') list++; @@ -688,6 +686,7 @@ static BOOL is_extension_supported(const char* extension) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; const char *gl_ext_string = (const char*)glGetString(GL_EXTENSIONS); + size_t len; TRACE("Checking for extension '%s'\n", extension); @@ -702,30 +701,36 @@ static BOOL is_extension_supported(const char* extension) * require the function to return NULL when an extension isn't found. For this reason we check * if the OpenGL extension required for the function we are looking up is supported. */ - /* Check if the extension is part of the GL extension string to see if it is supported. */ - if (has_extension(gl_ext_string, extension)) - return TRUE; - - /* In general an OpenGL function starts as an ARB/EXT extension and at some stage - * it becomes part of the core OpenGL library and can be reached without the ARB/EXT - * suffix as well. In the extension table, these functions contain GL_VERSION_major_minor. - * Check if we are searching for a core GL function */ - if(strncmp(extension, "GL_VERSION_", 11) == 0) + while ((len = strcspn(extension, " ")) != 0) { - const GLubyte *gl_version = funcs->gl.p_glGetString(GL_VERSION); - const char *version = extension + 11; /* Move past 'GL_VERSION_' */ + /* Check if the extension is part of the GL extension string to see if it is supported. */ + if (has_extension(gl_ext_string, extension, len)) + return TRUE; - if(!gl_version) { - ERR("No OpenGL version found!\n"); - return FALSE; - } + /* In general an OpenGL function starts as an ARB/EXT extension and at some stage + * it becomes part of the core OpenGL library and can be reached without the ARB/EXT + * suffix as well. In the extension table, these functions contain GL_VERSION_major_minor. + * Check if we are searching for a core GL function */ + if(strncmp(extension, "GL_VERSION_", 11) == 0) + { + const GLubyte *gl_version = funcs->gl.p_glGetString(GL_VERSION); + const char *version = extension + 11; /* Move past 'GL_VERSION_' */ - /* Compare the major/minor version numbers of the native OpenGL library and what is required by the function. - * The gl_version string is guaranteed to have at least a major/minor and sometimes it has a release number as well. */ - if( (gl_version[0] >= version[0]) || ((gl_version[0] == version[0]) && (gl_version[2] >= version[2])) ) { - return TRUE; + if(!gl_version) { + ERR("No OpenGL version found!\n"); + return FALSE; + } + + /* Compare the major/minor version numbers of the native OpenGL library and what is required by the function. + * The gl_version string is guaranteed to have at least a major/minor and sometimes it has a release number as well. */ + if( (gl_version[0] >= version[0]) || ((gl_version[0] == version[0]) && (gl_version[2] >= version[2])) ) { + return TRUE; + } + WARN("The function requires OpenGL version '%c.%c' while your drivers only provide '%c.%c'\n", version[0], version[2], gl_version[0], gl_version[2]); } - WARN("The function requires OpenGL version '%c.%c' while your drivers only provide '%c.%c'\n", version[0], version[2], gl_version[0], gl_version[2]); + + if (extension[len] == ' ') len++; + extension += len; } return FALSE; @@ -1677,7 +1682,7 @@ static GLubyte *filter_extensions( const char *extensions ) if (!(end = strchr( extensions, ' ' ))) end = extensions + strlen( extensions ); memcpy( p, extensions, end - extensions ); p[end - extensions] = 0; - if (!has_extension( disabled, p )) + if (!has_extension( disabled, p , strlen( p ))) { TRACE("++ %s\n", p ); p += end - extensions;

1 0

Andrey Zhezherun : msvcrt: Implemented _chsize_s.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: f768b8dec18a03d363c8c885ae792c73571dc5c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f768b8dec18a03d363c8c885a… Author: Andrey Zhezherun <zhezherun(a)yandex.ru> Date: Tue Nov 5 09:04:19 2013 +0000 msvcrt: Implemented _chsize_s. (cherry picked from commit 3bb2c11757156223be0f8a22f3b377b060b09562) --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/file.c | 27 +++++++++++++++++++-------- dlls/msvcrt/msvcrt.spec | 2 +- include/msvcrt/io.h | 1 + 7 files changed, 25 insertions(+), 13 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index bc93840..038a787 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -721,7 +721,7 @@ @ cdecl -arch=i386 -norelay _chkesp() msvcrt._chkesp @ cdecl _chmod(str long) msvcrt._chmod @ cdecl _chsize(long long) msvcrt._chsize -@ stub _chsize_s +@ cdecl _chsize_s(long int64) msvcrt._chsize_s @ cdecl _clearfp() msvcrt._clearfp @ cdecl _close(long) msvcrt._close @ cdecl _commit(long) msvcrt._commit diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 57bd107..343d26b 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1073,7 +1073,7 @@ @ cdecl -arch=i386 -norelay _chkesp() msvcrt._chkesp @ cdecl _chmod(str long) msvcrt._chmod @ cdecl _chsize(long long) msvcrt._chsize -@ stub _chsize_s +@ cdecl _chsize_s(long int64) msvcrt._chsize_s @ cdecl _clearfp() msvcrt._clearfp @ cdecl _close(long) msvcrt._close @ cdecl _commit(long) msvcrt._commit diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index c950f60..4f07638 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -384,7 +384,7 @@ @ cdecl -arch=i386 -norelay _chkesp() msvcrt._chkesp @ cdecl _chmod(str long) msvcrt._chmod @ cdecl _chsize(long long) msvcrt._chsize -@ stub _chsize_s +@ cdecl _chsize_s(long int64) msvcrt._chsize_s @ cdecl _clearfp() msvcrt._clearfp @ cdecl _close(long) msvcrt._close @ cdecl _commit(long) msvcrt._commit diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index ff00184..24251e1 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -367,7 +367,7 @@ @ cdecl -arch=i386 -norelay _chkesp() msvcrt._chkesp @ cdecl _chmod(str long) msvcrt._chmod @ cdecl _chsize(long long) msvcrt._chsize -@ stub _chsize_s +@ cdecl _chsize_s(long int64) msvcrt._chsize_s @ cdecl _clearfp() msvcrt._clearfp @ cdecl _close(long) msvcrt._close @ cdecl _commit(long) msvcrt._commit diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index f26d0c2..0c67744 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1259,15 +1259,17 @@ int CDECL MSVCRT_fseek(MSVCRT_FILE* file, MSVCRT_long offset, int whence) } /********************************************************************* - * _chsize (MSVCRT.@) + * _chsize_s (MSVCRT.@) */ -int CDECL MSVCRT__chsize(int fd, MSVCRT_long size) +int CDECL MSVCRT__chsize_s(int fd, __int64 size) { - LONG cur, pos; + __int64 cur, pos; HANDLE handle; BOOL ret = FALSE; - TRACE("(fd=%d, size=%d)\n", fd, size); + TRACE("(fd=%d, size=%s)\n", fd, wine_dbgstr_longlong(size)); + + if (!MSVCRT_CHECK_PMT(size >= 0)) return MSVCRT_EINVAL; LOCK_FILES(); @@ -1275,10 +1277,10 @@ int CDECL MSVCRT__chsize(int fd, MSVCRT_long size) if (handle != INVALID_HANDLE_VALUE) { /* save the current file pointer */ - cur = MSVCRT__lseek(fd, 0, SEEK_CUR); + cur = MSVCRT__lseeki64(fd, 0, SEEK_CUR); if (cur >= 0) { - pos = MSVCRT__lseek(fd, size, SEEK_SET); + pos = MSVCRT__lseeki64(fd, size, SEEK_SET); if (pos >= 0) { ret = SetEndOfFile(handle); @@ -1286,12 +1288,21 @@ int CDECL MSVCRT__chsize(int fd, MSVCRT_long size) } /* restore the file pointer */ - MSVCRT__lseek(fd, cur, SEEK_SET); + MSVCRT__lseeki64(fd, cur, SEEK_SET); } } UNLOCK_FILES(); - return ret ? 0 : -1; + return ret ? 0 : *MSVCRT__errno(); +} + +/********************************************************************* + * _chsize (MSVCRT.@) + */ +int CDECL MSVCRT__chsize(int fd, MSVCRT_long size) +{ + /* _chsize_s returns errno on failure but _chsize should return -1 */ + return MSVCRT__chsize_s( fd, size ) == 0 ? 0 : -1; } /********************************************************************* diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 58ceaf9..090cddd 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -356,7 +356,7 @@ @ cdecl -arch=i386 -norelay _chkesp() @ cdecl _chmod(str long) MSVCRT__chmod @ cdecl _chsize(long long) MSVCRT__chsize -# stub _chsize_s(long int64) +@ cdecl _chsize_s(long int64) MSVCRT__chsize_s # stub _chvalidator(long long) # stub _chvalidator_l(ptr long long) @ cdecl _clearfp() diff --git a/include/msvcrt/io.h b/include/msvcrt/io.h index 09b615c..b227b20 100644 --- a/include/msvcrt/io.h +++ b/include/msvcrt/io.h @@ -87,6 +87,7 @@ extern "C" { int __cdecl _access(const char*,int); int __cdecl _chmod(const char*,int); int __cdecl _chsize(int,__msvcrt_ulong); +int __cdecl _chsize_s(int,__int64); int __cdecl _close(int); int __cdecl _commit(int); int __cdecl _creat(const char*,int);

1 0

Alexandre Julliard : winemac: Only register the IME class when needed.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: ee573a246db74a6d464d9a14637b96ec1d6c1966 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee573a246db74a6d464d9a146… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 21 11:31:10 2013 +0200 winemac: Only register the IME class when needed. (cherry picked from commit 5435dad997cee166f47ca7681b61b4472841bab5) --- dlls/winemac.drv/ime.c | 1 + dlls/winemac.drv/macdrv.h | 1 + dlls/winemac.drv/macdrv_main.c | 7 ++++--- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/winemac.drv/ime.c b/dlls/winemac.drv/ime.c index bed094d..8279148 100644 --- a/dlls/winemac.drv/ime.c +++ b/dlls/winemac.drv/ime.c @@ -566,6 +566,7 @@ static void UpdateDataInDefaultIMEWindow(HIMC hIMC, HWND hwnd, BOOL showable) BOOL WINAPI ImeInquire(LPIMEINFO lpIMEInfo, LPWSTR lpszUIClass, LPCWSTR lpszOption) { TRACE("\n"); + IME_RegisterClasses( macdrv_module ); lpIMEInfo->dwPrivateDataSize = sizeof(IMEPRIVATE); lpIMEInfo->fdwProperty = IME_PROP_UNICODE | IME_PROP_AT_CARET; lpIMEInfo->fdwConversionCaps = IME_CMODE_NATIVE; diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index 0c35ce1..98aa600 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -38,6 +38,7 @@ extern BOOL skip_single_buffer_flushes DECLSPEC_HIDDEN; extern BOOL allow_vsync DECLSPEC_HIDDEN; extern BOOL allow_set_gamma DECLSPEC_HIDDEN; +extern HMODULE macdrv_module DECLSPEC_HIDDEN; extern const char* debugstr_cf(CFTypeRef t) DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index d27ce94..0f4b056 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -52,6 +52,7 @@ BOOL allow_vsync = TRUE; BOOL allow_set_gamma = TRUE; int left_option_is_alt = 0; int right_option_is_alt = 0; +HMODULE macdrv_module = 0; /************************************************************************** @@ -183,7 +184,7 @@ static void setup_options(void) /*********************************************************************** * process_attach */ -static BOOL process_attach( HINSTANCE instance ) +static BOOL process_attach(void) { SessionAttributeBits attributes; OSStatus status; @@ -205,7 +206,6 @@ static BOOL process_attach( HINSTANCE instance ) set_app_icon(); macdrv_clipboard_process_attach(); - IME_RegisterClasses( instance ); return TRUE; } @@ -299,7 +299,8 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID reserved) switch(reason) { case DLL_PROCESS_ATTACH: - ret = process_attach( hinst ); + macdrv_module = hinst; + ret = process_attach(); break; case DLL_THREAD_DETACH: thread_detach();

1 0

Alexandre Julliard : wmc: Don't put timestamps in generated files.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 4665c33a77abdf3bf0f82470581afa94cc75b42b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4665c33a77abdf3bf0f824705… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 28 14:18:37 2013 +0100 wmc: Don't put timestamps in generated files. (cherry picked from commit f775f3e105f3c923368114aa839140d173f1f4d0) --- tools/wmc/wmc.c | 2 -- tools/wmc/wmc.h | 3 --- tools/wmc/write.c | 17 +++++------------ 3 files changed, 5 insertions(+), 17 deletions(-) diff --git a/tools/wmc/wmc.c b/tools/wmc/wmc.c index a08d733..9d34a40 100644 --- a/tools/wmc/wmc.c +++ b/tools/wmc/wmc.c @@ -174,8 +174,6 @@ int main(int argc,char *argv[]) signal( SIGHUP, exit_on_signal ); #endif - now = time(NULL); - /* First rebuild the commandline to put in destination */ /* Could be done through env[], but not all OS-es support it */ cmdlen = 5; /* for "wmc " and \0 */ diff --git a/tools/wmc/wmc.h b/tools/wmc/wmc.h index cf6d430..9ef9ac7 100644 --- a/tools/wmc/wmc.h +++ b/tools/wmc/wmc.h @@ -21,8 +21,6 @@ #ifndef __WMC_WMC_H #define __WMC_WMC_H -#include <time.h> /* For time_t */ - #include "wmctypes.h" /* @@ -51,7 +49,6 @@ extern char *output_name; extern char *input_name; extern char *header_name; extern char *cmdline; -extern time_t now; extern int line_number; extern int char_number; diff --git a/tools/wmc/write.c b/tools/wmc/write.c index cf170d4..19cd5b3 100644 --- a/tools/wmc/write.c +++ b/tools/wmc/write.c @@ -91,7 +91,6 @@ static const char str_header[] = "/* This file is generated with wmc version " PACKAGE_VERSION ". Do not edit! */\n" "/* Source : %s */\n" "/* Cmdline: %s */\n" - "/* Date : %s */\n" "\n" ; @@ -178,11 +177,9 @@ void write_h_file(const char *fname) perror(fname); exit(1); } - cptr = ctime(&now); - killnl(cptr, 0); - fprintf(fp, str_header, input_name ? input_name : "<stdin>", cmdline, cptr); - fprintf(fp, "#ifndef __WMCGENERATED_%08lx_H\n", (long)now); - fprintf(fp, "#define __WMCGENERATED_%08lx_H\n", (long)now); + fprintf(fp, str_header, input_name ? input_name : "<stdin>", cmdline); + fprintf(fp, "#ifndef __WMCGENERATED_H\n"); + fprintf(fp, "#define __WMCGENERATED_H\n"); fprintf(fp, "\n"); /* Write severity and facility aliases */ @@ -501,18 +498,14 @@ static void write_rcinline(FILE *fp) void write_rc_file(const char *fname) { - FILE *fp; - char *cptr; + FILE *fp = fopen(fname, "w"); - fp = fopen(fname, "w"); if(!fp) { perror(fname); exit(1); } - cptr = ctime(&now); - killnl(cptr, 0); - fprintf(fp, str_header, input_name ? input_name : "<stdin>", cmdline, cptr); + fprintf(fp, str_header, input_name ? input_name : "<stdin>", cmdline); if(rcinline) write_rcinline(fp);

1 0

Vijay Kiran Kamuju : wininet: Implement setting INTERNET_PER_CONN_PROXY_BYPASS.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: b09944a11d5138c3883efb56c1035840711abb1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b09944a11d5138c3883efb56c… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sun Oct 27 22:01:22 2013 +0000 wininet: Implement setting INTERNET_PER_CONN_PROXY_BYPASS. (cherry picked from commit ebe121e360c4118c5263c20717a3fc25ebbcd9b1) --- dlls/wininet/internet.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index a54a3df..77bc801 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2912,13 +2912,17 @@ BOOL WINAPI InternetSetOptionW(HINTERNET hInternet, DWORD dwOption, } break; + case INTERNET_PER_CONN_PROXY_BYPASS: + heap_free(pi.proxyBypass); + pi.proxyBypass = heap_strdupW(option->Value.pszValue); + break; + case INTERNET_PER_CONN_AUTOCONFIG_URL: case INTERNET_PER_CONN_AUTODISCOVERY_FLAGS: case INTERNET_PER_CONN_AUTOCONFIG_SECONDARY_URL: case INTERNET_PER_CONN_AUTOCONFIG_RELOAD_DELAY_MINS: case INTERNET_PER_CONN_AUTOCONFIG_LAST_DETECT_TIME: case INTERNET_PER_CONN_AUTOCONFIG_LAST_DETECT_URL: - case INTERNET_PER_CONN_PROXY_BYPASS: FIXME("Unhandled dwOption %d\n", option->dwOption); break;

1 0

Ken Thomases : winemac: Send WM_{ENTER, EXIT}SIZEMOVE around window frame changes initiated by Cocoa.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 120c8b2cf202ff7a645a62dbde8926c6ee9e67e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=120c8b2cf202ff7a645a62dbd… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Oct 31 16:54:53 2013 -0500 winemac: Send WM_{ENTER, EXIT}SIZEMOVE around window frame changes initiated by Cocoa. The Mac driver was already sending these events when the user resizes the window by dragging its corner/edges, but there are other occasions when the window frame changes. For example, when the user zooms the window. (cherry picked from commit de3fb34af7dbb4a8f73ac4489a02ec2225979d00) --- dlls/winemac.drv/cocoa_window.m | 1 + dlls/winemac.drv/macdrv_cocoa.h | 1 + dlls/winemac.drv/window.c | 6 ++++++ 3 files changed, 8 insertions(+) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index bfbb36d..48d3e86 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -1709,6 +1709,7 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif event = macdrv_create_event(WINDOW_FRAME_CHANGED, self); event->window_frame_changed.frame = NSRectToCGRect(frame); event->window_frame_changed.fullscreen = ([self styleMask] & NSFullScreenWindowMask) != 0; + event->window_frame_changed.in_resize = [self inLiveResize]; [queue postEvent:event]; macdrv_release_event(event); diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index d7da551..3f6c8f4 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -262,6 +262,7 @@ typedef struct macdrv_event { struct { CGRect frame; int fullscreen; + int in_resize; } window_frame_changed; struct { unsigned long serial; diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 52875cd..3d436ac 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -1687,7 +1687,13 @@ void macdrv_window_frame_changed(HWND hwnd, const macdrv_event *event) if (event->window_frame_changed.fullscreen) flags |= SWP_NOSENDCHANGING; if (!(flags & SWP_NOSIZE) || !(flags & SWP_NOMOVE)) + { + if (!event->window_frame_changed.in_resize) + SendMessageW(hwnd, WM_ENTERSIZEMOVE, 0, 0); SetWindowPos(hwnd, 0, rect.left, rect.top, width, height, flags); + if (!event->window_frame_changed.in_resize) + SendMessageW(hwnd, WM_EXITSIZEMOVE, 0, 0); + } }

1 0

Ken Thomases : winemac: Trace flags of WINDOW_FRAME_CHANGED events.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: ea26c8066d1cd557262e7e1d9edabd55545de664 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea26c8066d1cd557262e7e1d9… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Oct 31 19:16:44 2013 -0500 winemac: Trace flags of WINDOW_FRAME_CHANGED events. (cherry picked from commit 8e1fdb845e284f6aad436330bc1bb77506635e90) --- dlls/winemac.drv/window.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 273b70e..9007610 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -1658,8 +1658,9 @@ void macdrv_window_frame_changed(HWND hwnd, const macdrv_event *event) parent = GetAncestor(hwnd, GA_PARENT); - TRACE("win %p/%p new Cocoa frame %s\n", hwnd, data->cocoa_window, - wine_dbgstr_cgrect(event->window_frame_changed.frame)); + TRACE("win %p/%p new Cocoa frame %s fullscreen %d in_resize %d\n", hwnd, data->cocoa_window, + wine_dbgstr_cgrect(event->window_frame_changed.frame), + event->window_frame_changed.fullscreen, event->window_frame_changed.in_resize); rect = rect_from_cgrect(event->window_frame_changed.frame); macdrv_mac_to_window_rect(data, &rect);

1 0

Alexandre Julliard : user32: Fix the scope of a local variable.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 09b159824818db3b53043124bd03d7f634ddb43e URL: http://source.winehq.org/git/wine.git/?a=commit;h=09b159824818db3b53043124b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 21 14:48:20 2013 +0200 user32: Fix the scope of a local variable. (cherry picked from commit 6d0d7e08e51f6dd5870a0b20d2a5b3f2419f2381) --- dlls/user32/message.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 27e3441..69507dc 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -1999,6 +1999,7 @@ static BOOL post_dde_message( struct packed_message *data, const struct send_mes HGLOBAL hunlock = 0; int i; DWORD res; + ULONGLONG hpack; if (!UnpackDDElParam( info->msg, info->lparam, &uiLo, &uiHi )) return FALSE; @@ -2019,7 +2020,7 @@ static BOOL post_dde_message( struct packed_message *data, const struct send_mes HGLOBAL h = dde_get_pair( (HANDLE)uiHi ); if (h) { - ULONGLONG hpack = pack_ptr( h ); + hpack = pack_ptr( h ); /* send back the value of h on the other side */ push_data( data, &hpack, sizeof(hpack) ); lp = uiLo;

1 0

Alexandre Julliard : include: Add inline wrappers for some underscore-prefixed math functions.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: e05d42e89b0a8703631d9533e8f0830e2f842395 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e05d42e89b0a8703631d9533e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 21 18:45:27 2013 +0200 include: Add inline wrappers for some underscore-prefixed math functions. (cherry picked from commit a40574577072da11d8eda570e934636b5e83e528) --- include/msvcrt/math.h | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/include/msvcrt/math.h b/include/msvcrt/math.h index 4d0655e..34aa268 100644 --- a/include/msvcrt/math.h +++ b/include/msvcrt/math.h @@ -68,13 +68,13 @@ double __cdecl frexp(double, int*); double __cdecl modf(double, double*); double __cdecl fmod(double, double); -double __cdecl hypot(double, double); -double __cdecl j0(double); -double __cdecl j1(double); -double __cdecl jn(int, double); -double __cdecl y0(double); -double __cdecl y1(double); -double __cdecl yn(int, double); +double __cdecl _hypot(double, double); +double __cdecl _j0(double); +double __cdecl _j1(double); +double __cdecl _jn(int, double); +double __cdecl _y0(double); +double __cdecl _y1(double); +double __cdecl _yn(int, double); #ifdef __x86_64__ @@ -129,7 +129,7 @@ float __cdecl fmodf(float, float); #define fabsf(x) ((float)fabs((double)(x))) #define ldexpf(x,y) ((float)ldexp((double)(x),(y))) -float __cdecl hypotf(float, float); +float __cdecl _hypotf(float, float); int __cdecl _matherr(struct _exception*); double __cdecl _cabs(struct _complex); @@ -171,4 +171,15 @@ static const union { #endif /* !_MATH_DEFINES_DEFINED */ #endif /* _USE_MATH_DEFINES */ +static inline double hypot( double x, double y ) { return _hypot( x, y ); } +static inline double j0( double x ) { return _j0( x ); } +static inline double j1( double x ) { return _j1( x ); } +static inline double jn( int n, double x ) { return _jn( n, x ); } +static inline double y0( double x ) { return _y0( x ); } +static inline double y1( double x ) { return _y1( x ); } +static inline double yn( int n, double x ) { return _yn( n, x ); } +static inline double cabs(struct _complex z) { return _cabs( z ); } + +static inline float hypotf( float x, float y ) { return _hypotf( x, y ); } + #endif /* __WINE_MATH_H */

1 0

Ken Thomases : winemac: Send WM_CANCELMODE when keyboard layout changes from Cocoa side.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 58f2168742191ed3fea4beeee0c5936fe3bfc634 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58f2168742191ed3fea4beeee… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Oct 23 20:13:10 2013 -0500 winemac: Send WM_CANCELMODE when keyboard layout changes from Cocoa side. The standard keyboard shortcut for switching the keyboard layout is Command- Space, but the Mac driver never sees the Space key press. So, Wine only sees a press and release of Alt, which puts focus on the menu bar. This prevents that focus change. (cherry picked from commit 35f0cf26b0225f31d662c834d55997a7a4bf3c59) --- dlls/winemac.drv/keyboard.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winemac.drv/keyboard.c b/dlls/winemac.drv/keyboard.c index cc25789..206ee8d 100644 --- a/dlls/winemac.drv/keyboard.c +++ b/dlls/winemac.drv/keyboard.c @@ -843,6 +843,8 @@ void macdrv_keyboard_changed(const macdrv_event *event) thread_data->dead_key_state = 0; macdrv_compute_keyboard_layout(thread_data); + + SendMessageW(GetActiveWindow(), WM_CANCELMODE, 0, 0); }

1 0

Daniel Lehman : kernel32: Don't use depth in RtlInterlockedFlushSList.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: cae03c156dd654beb13aaa0535c84e7cb78a7dfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=cae03c156dd654beb13aaa053… Author: Daniel Lehman <dlehman(a)esri.com> Date: Tue Oct 22 22:47:26 2013 -0700 kernel32: Don't use depth in RtlInterlockedFlushSList. Depth wraps around at 65536 but list supports more elements. (cherry picked from commit 0669a8aca2dec4eaf6632e368832a8aec1c48ffd) --- dlls/ntdll/rtl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index bbcd454..0bad4a0 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -1080,7 +1080,7 @@ PSLIST_ENTRY WINAPI RtlInterlockedFlushSList(PSLIST_HEADER list) SLIST_HEADER old, new; #ifdef _WIN64 - if (!list->Header16.Depth) return NULL; + if (!list->Header16.NextEntry) return NULL; new.s.Alignment = new.s.Region = 0; new.Header16.HeaderType = 1; /* we use the 16-byte header */ do @@ -1090,7 +1090,7 @@ PSLIST_ENTRY WINAPI RtlInterlockedFlushSList(PSLIST_HEADER list) } while (!interlocked_cmpxchg128((__int64 *)list, new.s.Region, new.s.Alignment, (__int64 *)&old)); return (SLIST_ENTRY *)((ULONG_PTR)old.Header16.NextEntry << 4); #else - if (!list->s.Depth) return NULL; + if (!list->s.Next.Next) return NULL; new.Alignment = 0; do {

1 0

Vincent Povirk : xinput1_3: Make XInputGetState patchable.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 15da8cc6f9b2e0cfa178e3729eb66abf68f4e497 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15da8cc6f9b2e0cfa178e3729… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Oct 25 16:18:24 2013 -0500 xinput1_3: Make XInputGetState patchable. (cherry picked from commit b29c2b050defc9137f88d5927edb5675c8f4a5f5) --- dlls/xinput1_3/xinput1_3_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/xinput1_3/xinput1_3_main.c b/dlls/xinput1_3/xinput1_3_main.c index a2a83dd..63f725b 100644 --- a/dlls/xinput1_3/xinput1_3_main.c +++ b/dlls/xinput1_3/xinput1_3_main.c @@ -65,7 +65,7 @@ DWORD WINAPI XInputSetState(DWORD dwUserIndex, XINPUT_VIBRATION* pVibration) return ERROR_BAD_ARGUMENTS; } -DWORD WINAPI XInputGetState(DWORD dwUserIndex, XINPUT_STATE* pState) +DWORD WINAPI DECLSPEC_HOTPATCH XInputGetState(DWORD dwUserIndex, XINPUT_STATE* pState) { static int warn_once;

1 0

Ken Thomases : winemac: Hide cursor when first requested even if we don' t know it's over a window.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 692bd28f020a41a587842f251efa66d20994504b URL: http://source.winehq.org/git/wine.git/?a=commit;h=692bd28f020a41a587842f251… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Oct 30 08:07:51 2013 -0500 winemac: Hide cursor when first requested even if we don't know it's over a window. The tracking of whether it is over a window or not is only updated when the mouse moves. If a window was created or moved under it, then the state can be stale. That caused us to defer hiding the cursor until the mouse was moved. This happens at the start of games pretty often. (cherry picked from commit 6b9f81271b4b150244ed37fbda79103ba16dcbf4) --- dlls/winemac.drv/cocoa_app.m | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 1cc8d2d..ca9dcac 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -787,9 +787,9 @@ int macdrv_err_on; return ([originalDisplayModes count] > 0 || displaysCapturedForFullscreen); } - - (void) updateCursor + - (void) updateCursor:(BOOL)force { - if (lastTargetWindow) + if (force || lastTargetWindow) { if (clientWantsCursorHidden && !cursorHidden) { @@ -829,7 +829,7 @@ int macdrv_err_on; if (!clientWantsCursorHidden) { clientWantsCursorHidden = TRUE; - [self updateCursor]; + [self updateCursor:TRUE]; } } @@ -838,7 +838,7 @@ int macdrv_err_on; if (clientWantsCursorHidden) { clientWantsCursorHidden = FALSE; - [self updateCursor]; + [self updateCursor:FALSE]; } } @@ -849,7 +849,7 @@ int macdrv_err_on; [cursor release]; cursor = [newCursor retain]; cursorIsCurrent = FALSE; - [self updateCursor]; + [self updateCursor:FALSE]; } } @@ -1516,7 +1516,7 @@ int macdrv_err_on; else lastTargetWindow = nil; - [self updateCursor]; + [self updateCursor:FALSE]; } - (void) handleMouseButton:(NSEvent*)theEvent

1 0

Ken Thomases : winemac: Tell Cocoa that we don' t draw a focus ring for our views.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: c4c7375a30d9285141478e1cd8c1511dd7f65baf URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4c7375a30d9285141478e1cd… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Oct 31 15:00:13 2013 -0500 winemac: Tell Cocoa that we don't draw a focus ring for our views. This seems to eliminate a lot of house-keeping work inside Cocoa. (cherry picked from commit b11d6850f2596d58c8a9ceaf7ac08e7bd527cc30) --- dlls/winemac.drv/cocoa_window.m | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index f4926e2..bfbb36d 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -357,6 +357,11 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif [[self inputContext] discardMarkedText]; } + - (NSFocusRingType) focusRingType + { + return NSFocusRingTypeNone; + } + /* * ---------- NSTextInputClient methods ---------- */

1 0