wine-commits July 2014

wine-commits@winehq.org

2 participants
287 discussions

Alexandre Julliard : libwine: Update LD_LIBRARY_PATH in the current process from the JNI environment.
by Alexandre Julliard 24 Jul '14

24 Jul '14

Module: wine Branch: master Commit: 8478cece692c1498e361388783f515f03c9ca71a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8478cece692c1498e36138878… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 24 09:24:49 2014 +0200 libwine: Update LD_LIBRARY_PATH in the current process from the JNI environment. --- libs/wine/loader.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libs/wine/loader.c b/libs/wine/loader.c index 5c0192d..c2290df 100644 --- a/libs/wine/loader.c +++ b/libs/wine/loader.c @@ -873,6 +873,12 @@ static jstring wine_init_jni( JNIEnv *env, jobject obj, jobjectArray cmdline, jo { const char *val = (*env)->GetStringUTFChars( env, val_obj, NULL ); setenv( var, val, 1 ); + if (!strcmp( var, "LD_LIBRARY_PATH" )) + { + void (*update_func)( const char * ) = dlsym( RTLD_DEFAULT, + "android_update_LD_LIBRARY_PATH" ); + if (update_func) update_func( val ); + } (*env)->ReleaseStringUTFChars( env, val_obj, val ); } else unsetenv( var );

1 0

Nikolay Sivov : t2embed: Added TTDeleteEmbeddedFont() stub.
by Alexandre Julliard 24 Jul '14

24 Jul '14

Module: wine Branch: master Commit: c27e5ca511d65dfd1a516430676ef9b77fdccd53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c27e5ca511d65dfd1a5164306… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 24 08:27:33 2014 +0400 t2embed: Added TTDeleteEmbeddedFont() stub. --- dlls/t2embed/main.c | 6 ++++++ dlls/t2embed/t2embed.spec | 14 +++++++------- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/t2embed/main.c b/dlls/t2embed/main.c index e92c49c..e1a880d 100644 --- a/dlls/t2embed/main.c +++ b/dlls/t2embed/main.c @@ -84,3 +84,9 @@ LONG WINAPI TTIsEmbeddingEnabled(HDC hDC, BOOL *enabled) if (enabled) *enabled = FALSE; return E_API_NOTIMPL; } + +LONG WINAPI TTDeleteEmbeddedFont(HANDLE hFontReference, ULONG flags, ULONG *status) +{ + FIXME("(%p 0x%08x %p) stub\n", hFontReference, flags, status); + return E_API_NOTIMPL; +} diff --git a/dlls/t2embed/t2embed.spec b/dlls/t2embed/t2embed.spec index 120eaaa..e3be15c 100644 --- a/dlls/t2embed/t2embed.spec +++ b/dlls/t2embed/t2embed.spec @@ -1,22 +1,22 @@ @ stub TTCharToUnicode -@ stub TTDeleteEmbeddedFont -@ stdcall TTEmbedFont(ptr long long ptr ptr ptr ptr ptr long long ptr) +@ stdcall TTDeleteEmbeddedFont(long long ptr) +@ stdcall TTEmbedFont(long long long ptr ptr ptr ptr ptr long long ptr) @ stub TTEmbedFontFromFileA @ stub TTEnableEmbeddingForFacename @ stub TTGetEmbeddedFontInfo -@ stdcall TTGetEmbeddingType(ptr ptr) -@ stdcall TTIsEmbeddingEnabled(ptr ptr) +@ stdcall TTGetEmbeddingType(long ptr) +@ stdcall TTIsEmbeddingEnabled(long ptr) @ stub TTIsEmbeddingEnabledForFacename @ stdcall TTLoadEmbeddedFont(ptr long ptr long ptr ptr ptr wstr str ptr) @ stub TTRunValidationTests @ stub _TTCharToUnicode@24 @ stub _TTDeleteEmbeddedFont@12 -@ stdcall _TTEmbedFont@44(ptr long long ptr ptr ptr ptr ptr long long ptr) TTEmbedFont +@ stdcall _TTEmbedFont@44(long long long ptr ptr ptr ptr ptr long long ptr) TTEmbedFont @ stub _TTEmbedFontFromFileA@52 @ stub _TTEnableEmbeddingForFacename@8 @ stub _TTGetEmbeddedFontInfo@28 -@ stdcall _TTGetEmbeddingType@8(ptr ptr) TTGetEmbeddingType -@ stdcall _TTIsEmbeddingEnabled@8(ptr ptr) TTIsEmbeddingEnabled +@ stdcall _TTGetEmbeddingType@8(long ptr) TTGetEmbeddingType +@ stdcall _TTIsEmbeddingEnabled@8(long ptr) TTIsEmbeddingEnabled @ stub _TTIsEmbeddingEnabledForFacename@8 @ stdcall _TTLoadEmbeddedFont@40(ptr long ptr long ptr ptr ptr wstr str ptr) TTLoadEmbeddedFont @ stub _TTRunValidationTests@8

1 0

Daniel Lehman : cryptnet: Continue checking the revocation urls if one is offline.
by Alexandre Julliard 24 Jul '14

24 Jul '14

Module: wine Branch: master Commit: 3be7f3079c125155388c21d3072263a16cc7c4e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3be7f3079c125155388c21d30… Author: Daniel Lehman <dlehman(a)esri.com> Date: Wed Jul 23 13:08:34 2014 -0700 cryptnet: Continue checking the revocation urls if one is offline. --- dlls/cryptnet/cryptnet_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index 3986f0f..df9eb49 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -1553,7 +1553,8 @@ static DWORD verify_cert_revocation_from_dist_points_ext( endTime = timeout = 0; if (!ret) error = GetLastError(); - for (j = 0; !error && j < urlArray->cUrl; j++) + /* continue looping if one was offline; break if revoked or timed out */ + for (j = 0; (!error || error == CRYPT_E_REVOCATION_OFFLINE) && j < urlArray->cUrl; j++) { PCCRL_CONTEXT crl;

1 0

Francois Gouget : winetest: Whitespace cleanups.
by Alexandre Julliard 24 Jul '14

24 Jul '14

Module: tools Branch: master Commit: 063320d223569d9be83d5a0f72ec4d400a8d6a72 URL: http://source.winehq.org/git/tools.git/?a=commit;h=063320d223569d9be83d5a0f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jul 24 16:31:40 2014 +0200 winetest: Whitespace cleanups. --- winetest/dissect | 8 ++++---- winetest/error.cgi | 3 +-- winetest/gather | 2 +- winetest/service.cgi | 8 ++++---- winetest/site | 2 +- 5 files changed, 11 insertions(+), 12 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index bbd156b..676f089 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -82,7 +82,7 @@ sub create_box($$$) return $box; } -($report,undef) = glob "$queuedir/rep*/report"; +($report, undef) = glob "$queuedir/rep*/report"; exit 2 unless defined $report; ($tmpdir = $report) =~ s|^(.+)/report$|$1|; @@ -206,7 +206,7 @@ if ($plid==1 && $major==4) { } elsif ($minor == 2) { $version = "win8"; } - } + } } elsif ($plid==3) { #$version = "ce$major$minor"; } @@ -340,9 +340,9 @@ while (<IN>) { if (defined $dll) { # Either winetest crashed or the report file was cut off if ($filesize == $maxfilesize) { - mydie "report reached file limit (runaway test?)\n"; + mydie "report reached file limit (runaway test?)\n"; } else { - mydie "report truncated (winetest crash?)\n"; + mydie "report truncated (winetest crash?)\n"; } } close SUM or mydie "error writing to '$tmpdir/summary.txt': $!\n"; diff --git a/winetest/error.cgi b/winetest/error.cgi index b9692ac..ea77204 100755 --- a/winetest/error.cgi +++ b/winetest/error.cgi @@ -1,5 +1,5 @@ #!/usr/bin/perl -# +# # This script replays errors to the wine-tests-results mailing list # # Copyright (C) 2004 Brian Vincent @@ -43,4 +43,3 @@ if ($error) { print "OK\n"; } - diff --git a/winetest/gather b/winetest/gather index f469fb1..5b56b61 100755 --- a/winetest/gather +++ b/winetest/gather @@ -513,7 +513,7 @@ sub singletest($$$) { else { my $report = $group->{reports} ? $group->{reports}->[0] : $group; - $label = "$groupname $report->{tag}"; + $label = "$groupname $report->{tag}"; if (-r "$datadir/$build/$report->{dir}/$testname.html") { $href = "$report->{dir}/$testname.html"; diff --git a/winetest/service.cgi b/winetest/service.cgi index 10e3c18..53e5f10 100755 --- a/winetest/service.cgi +++ b/winetest/service.cgi @@ -1,5 +1,5 @@ #!/usr/bin/perl -# +# # This script acts as the middle man between people who build # tests to be distributed to Windows clients and the actual # Windows clients @@ -32,8 +32,8 @@ # winetest/ # <name>.url contains url to find latest winetests at, must be # writable -# url.mask contains a reg ex to match against, only needs to -# be read-only, in the above example it might be +# url.mask contains a reg ex to match against, only needs to +# be read-only, in the above example it might be # something like: http://myserver/com/path/to # <name>.cookie contains a unique identifier of a program that # winrash clients can download, must be writable @@ -99,7 +99,7 @@ sub read_one_line($) ########################################################################## # # When we publish, we: -# 1) Look for <publish key value>/url.mask that had to have been +# 1) Look for <publish key value>/url.mask that had to have been # created by a web server admin thus ensuring this program is # approved for testing # 2) Download the cookie for the program from that web server diff --git a/winetest/site b/winetest/site index a942491..16ab682 100755 --- a/winetest/site +++ b/winetest/site @@ -54,6 +54,6 @@ if ($q->param('testing')) { # redirect to data dir when no vars present my $base = $q->url(-base => 1); print $q->redirect($base . "/data/" . $build); - + # done exit();

1 0

Francois Gouget : winetest: Standardize handling of service.cgi' s arguments and add prototypes.
by Alexandre Julliard 24 Jul '14

24 Jul '14

Module: tools Branch: master Commit: 991c6c6eb454252342ed5d8d9a56f3966bddd453 URL: http://source.winehq.org/git/tools.git/?a=commit;h=991c6c6eb454252342ed5d8d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jul 24 16:24:01 2014 +0200 winetest: Standardize handling of service.cgi's arguments and add prototypes. The prototypes let Perl detect when the wrong number of parameters is passed to these functions. The functions have also been reordered so forward declarations are not necessary and are now called normally. --- winetest/service.cgi | 196 ++++++++++++++++++++++++++++----------------------- 1 file changed, 107 insertions(+), 89 deletions(-) diff --git a/winetest/service.cgi b/winetest/service.cgi index 1ec83b6..10e3c18 100755 --- a/winetest/service.cgi +++ b/winetest/service.cgi @@ -46,57 +46,56 @@ $data_root="/home/winehq/opt/winetest"; $lynx="/usr/bin/lynx"; @valid_programs=("winrash", "winetest"); -&main; -sub main { - my ($build, $urls, $cookies); - - print "Content-type: text/plain\n\n"; +########################################################################## +# +# Some convenience functions. Debug gives us output if debug=1. &read_one_line +# just opens files and returns one line, with trailing new lines removed. +# +########################################################################## - # first check for errors - my $error = cgi_error (); - if ($error) { - print $error; - exit; +# print a message if debugging is enabled +sub debug($) +{ + my ($msg) = @_; + if (param('debug')) { + print "$msg\n"; } +} - my $publish = param('publish'); - if ($publish) { - my $response = &releases_make($publish); - print "$response\n"; - exit; - } +# computes the MD5 sum of the arument +sub md5sum($) +{ + my ($string) = @_; + local $md5 = Digest::MD5->new; + $md5->add($string); + return $md5->hexdigest; +} - # for each of the programs we know about, see if they need an update - foreach $program (@valid_programs) { - ($build, $urls, $cookies) = &releases_read($program); - if (param($program)) { - my @history = split(/,/, param("$program" . "_history")); - push (@history, param($program)); - my @newhist = (); - foreach (@history) { - my ($prg, $rel) = split(/-/, $_); - if (($prg eq $program) and ($rel eq $build)) { - delete $$urls{$_}; - delete $$cookies{$_}; - push (@newhist, $_); - } - } - $winetest_history = join ',', @newhist; - } - if (scalar(%$urls)) { - &send_upgrade($urls, $winetest_history); - $update_sent = 1; - last; - } - } - if (!$update_sent) { - print "sleep 3600\n"; - return; - } +# write a string to a file +sub write_file($$) +{ + my ($filename, $content) = @_; + open(GENERIC_FH, $filename) + or ( debug("Can't open $filename for writing.") && die ); + print GENERIC_FH $content; + close(GENERIC_FH); +} +# read the content of a file +sub read_one_line($) +{ + my ($filename) = @_; + open(GENERIC_FH, $filename) + or ( debug("Can't open $filename."), die ); + $this_line = <GENERIC_FH>; + close(GENERIC_FH); + chomp $this_line; + + return $this_line; } + ########################################################################## # # When we publish, we: @@ -110,7 +109,8 @@ sub main { ########################################################################## # removes the current release from disk -sub releases_purge { +sub releases_purge($) +{ my ($project) = @_; system("rm -f $data_root/*/$project/*.cookie"); system("rm -f $data_root/*/$project/*.url"); @@ -119,7 +119,8 @@ sub releases_purge { # this function reads the current release information from disk # and returns ($thisrelease, %url, %cookies) # where the two maps are keyed by the full file name of the release -sub releases_read { +sub releases_read($) +{ my ($project) = @_; my (%urls, %cookies, $thisrelease); @@ -143,7 +144,7 @@ sub releases_read { if (scalar(%urls) == 0) { $thisrelease = $release; } elsif ($thisrelease ne $release) { - &debug("Invalid release state!") && die; + debug("Invalid release state!") && die; } $urls{$key} = $url; $cookies{$key} = $this_line; @@ -154,7 +155,8 @@ sub releases_read { } # try to add a new release to our portfolio -sub releases_make { +sub releases_make($) +{ my ($url) = @_; my ($name, $program, $build, $publisher); my ($urls, $cookies, $current_build, @other); @@ -186,43 +188,43 @@ sub releases_make { } # get current release info - ($current_build, $urls, $cookies) = &releases_read($program); + ($current_build, $urls, $cookies) = releases_read($program); # check to see how we should handle it if ($build lt $current_build) { return "Build is old, current build is $current_build"; } if ($build ne $current_build) { - &releases_purge($program); + releases_purge($program); } # check to see that the URL has the right format $base_path = "$data_root/$publisher/$program"; - $url_mask = &read_one_line("<$base_path/url.mask"); + $url_mask = read_one_line("<$base_path/url.mask"); if (!($url =~ $url_mask)) { return "Unrecognized URL format"; } # get the cookie now - $cookie = &read_one_line("$lynx -source $url.sig |"); + $cookie = read_one_line("$lynx -source $url.sig |"); # all is good, store the cookie, and URL now, this activetes the release - &write_file(">$base_path/$name.cookie", &md5sum($cookie)); - &write_file(">$base_path/$name.url", $url); + write_file(">$base_path/$name.cookie", md5sum($cookie)); + write_file(">$base_path/$name.url", $url); return "OK"; } - ########################################################################## -# +# # Issue commands understood by winrash. Try to be somewhat intelligent -# in figuring out what needs to be sent. +# in figuring out what needs to be sent. # ########################################################################## -sub send_upgrade { +sub send_upgrade($$) +{ my ($urls, $history) = @_; my (@names, $name, $url, $program); my ($build, $publisher, $id, @other); @@ -235,7 +237,7 @@ sub send_upgrade { $url = $$urls{$name}; ($program, $build, $publisher, @other) = split(/-/, $name); - &debug("Send upgrade received: $url"); + debug("Send upgrade received: $url"); print "error_url http://test.winehq.org/error\n"; print "error_sleep 3600\n"; @@ -262,45 +264,61 @@ sub send_upgrade { print "sleep 300\n"; } + ########################################################################## # -# Some convenience functions. Debug gives us output if debug=1. &read_one_line -# just opens files and returns one line, with trailing new lines removed. -# +# Main +# ########################################################################## -# print a message if debugging is enabled -sub debug { - if (param('debug')) { - print "$_[0]\n"; - } -} +sub main() +{ + my ($build, $urls, $cookies); -# computes the MD5 sum of the arument -sub md5sum { + print "Content-type: text/plain\n\n"; - local $md5 = Digest::MD5->new; - $md5->add($_[0]); - return $md5->hexdigest; -} + # first check for errors + my $error = cgi_error (); + if ($error) { + print $error; + exit; + } -# write a string to a file -sub write_file { - my ($filename, $content) = @_; - open(GENERIC_FH, $filename) - or ( &debug("Can't open $filename for writing.") && die ); - print GENERIC_FH $content; - close(GENERIC_FH); -} + my $publish = param('publish'); + if ($publish) { + my $response = releases_make($publish); + print "$response\n"; + exit; + } -# read the content of a file -sub read_one_line { - open(GENERIC_FH, $_[0]) - or ( &debug("Can't open $_[0]."), die ); - $this_line = <GENERIC_FH>; - close(GENERIC_FH); - chomp $this_line; + # for each of the programs we know about, see if they need an update + foreach $program (@valid_programs) { + ($build, $urls, $cookies) = releases_read($program); + if (param($program)) { + my @history = split(/,/, param("$program" . "_history")); + push (@history, param($program)); + my @newhist = (); + foreach (@history) { + my ($prg, $rel) = split(/-/, $_); + if (($prg eq $program) and ($rel eq $build)) { + delete $$urls{$_}; + delete $$cookies{$_}; + push (@newhist, $_); + } + } + $winetest_history = join ',', @newhist; + } + if (scalar(%$urls)) { + send_upgrade($urls, $winetest_history); + $update_sent = 1; + last; + } + } + if (!$update_sent) { + print "sleep 3600\n"; + return; + } - return $this_line; } +main();

1 0

Jacek Caban : vbscript: Added support for title and type arguments of MsgBox.
by Alexandre Julliard 23 Jul '14

23 Jul '14

Module: wine Branch: master Commit: 2c78d5815bc7b790f5285a6f1ee762b71daea8c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c78d5815bc7b790f5285a6f1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 23 18:28:28 2014 +0200 vbscript: Added support for title and type arguments of MsgBox. --- dlls/vbscript/global.c | 55 ++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 44 insertions(+), 11 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 68fa388..dc41db5 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -282,14 +282,15 @@ static IUnknown *create_object(script_ctx_t *ctx, const WCHAR *progid) return obj; } -static HRESULT show_msgbox(script_ctx_t *ctx, BSTR prompt, VARIANT *res) +static HRESULT show_msgbox(script_ctx_t *ctx, BSTR prompt, unsigned type, BSTR orig_title, VARIANT *res) { SCRIPTUICHANDLING uic_handling = SCRIPTUICHANDLING_ALLOW; IActiveScriptSiteUIControl *ui_control; IActiveScriptSiteWindow *acts_window; + WCHAR *title_buf = NULL; const WCHAR *title; HWND hwnd = NULL; - int ret; + int ret = 0; HRESULT hres; hres = IActiveScriptSite_QueryInterface(ctx->site, &IID_IActiveScriptSiteUIControl, (void**)&ui_control); @@ -310,23 +311,43 @@ static HRESULT show_msgbox(script_ctx_t *ctx, BSTR prompt, VARIANT *res) return E_FAIL; } - title = (ctx->safeopt & INTERFACE_USES_SECURITY_MANAGER) ? vbscriptW : emptyW; - hres = IActiveScriptSite_QueryInterface(ctx->site, &IID_IActiveScriptSiteWindow, (void**)&acts_window); if(FAILED(hres)) { FIXME("No IActiveScriptSiteWindow\n"); return hres; } + if(ctx->safeopt & INTERFACE_USES_SECURITY_MANAGER) { + if(orig_title && *orig_title) { + WCHAR *ptr; + + title = title_buf = heap_alloc(sizeof(vbscriptW) + (strlenW(orig_title)+2)*sizeof(WCHAR)); + if(!title) + return E_OUTOFMEMORY; + + memcpy(title_buf, vbscriptW, sizeof(vbscriptW)); + ptr = title_buf + sizeof(vbscriptW)/sizeof(WCHAR)-1; + + *ptr++ = ':'; + *ptr++ = ' '; + strcpyW(ptr, orig_title); + }else { + title = vbscriptW; + } + }else { + title = orig_title ? orig_title : emptyW; + } + hres = IActiveScriptSiteWindow_GetWindow(acts_window, &hwnd); if(SUCCEEDED(hres)) { hres = IActiveScriptSiteWindow_EnableModeless(acts_window, FALSE); if(SUCCEEDED(hres)) { - ret = MessageBoxW(hwnd, prompt, title, MB_OK); + ret = MessageBoxW(hwnd, prompt, title, type); hres = IActiveScriptSiteWindow_EnableModeless(acts_window, TRUE); } } + heap_free(title_buf); IActiveScriptSiteWindow_Release(acts_window); if(FAILED(hres)) { FIXME("failed: %08x\n", hres); @@ -1385,22 +1406,34 @@ static HRESULT Global_InputBox(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, static HRESULT Global_MsgBox(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) { - BSTR prompt; + BSTR prompt, title = NULL; + int type = MB_OK; HRESULT hres; TRACE("\n"); - if(args_cnt != 1) { - FIXME("unsupported arg_cnt %d\n", args_cnt); - return E_NOTIMPL; - } + assert(1 <= args_cnt && args_cnt <= 5); hres = to_string(args, &prompt); if(FAILED(hres)) return hres; - hres = show_msgbox(This->desc->ctx, prompt, res); + if(args_cnt > 1) + hres = to_int(args+1, &type); + + if(SUCCEEDED(hres) && args_cnt > 2) + hres = to_string(args+2, &title); + + if(SUCCEEDED(hres) && args_cnt > 3) { + FIXME("unsupported arg_cnt %d\n", args_cnt); + hres = E_NOTIMPL; + } + + if(SUCCEEDED(hres)) + hres = show_msgbox(This->desc->ctx, prompt, type, title, res); + SysFreeString(prompt); + SysFreeString(title); return hres; }

1 0

Jacek Caban : wscript: Added IActiveScriptSiteWindow implementation.
by Alexandre Julliard 23 Jul '14

23 Jul '14

Module: wine Branch: master Commit: e2fcd874e073d165e5e581fee8b0ce652f0ca881 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2fcd874e073d165e5e581fee… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 23 17:44:03 2014 +0200 wscript: Added IActiveScriptSiteWindow implementation. --- programs/wscript/main.c | 79 +++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 64 insertions(+), 15 deletions(-) diff --git a/programs/wscript/main.c b/programs/wscript/main.c index fe0a2ed..d354c90 100644 --- a/programs/wscript/main.c +++ b/programs/wscript/main.c @@ -56,23 +56,12 @@ WCHAR scriptFullName[MAX_PATH]; ITypeInfo *host_ti; ITypeInfo *arguments_ti; +static HRESULT query_interface(REFIID,void**); + static HRESULT WINAPI ActiveScriptSite_QueryInterface(IActiveScriptSite *iface, REFIID riid, void **ppv) { - if(IsEqualGUID(riid, &IID_IUnknown)) { - WINE_TRACE("(IID_IUnknown %p)\n", ppv); - *ppv = iface; - }else if(IsEqualGUID(riid, &IID_IActiveScriptSite)) { - WINE_TRACE("(IID_IActiveScriptSite %p)\n", ppv); - *ppv = iface; - }else { - *ppv = NULL; - WINE_TRACE("(%s %p)\n", wine_dbgstr_guid(riid), ppv); - return E_NOINTERFACE; - } - - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; + return query_interface(riid, ppv); } static ULONG WINAPI ActiveScriptSite_AddRef(IActiveScriptSite *iface) @@ -168,7 +157,67 @@ static IActiveScriptSiteVtbl ActiveScriptSiteVtbl = { ActiveScriptSite_OnLeaveScript }; -IActiveScriptSite script_site = { &ActiveScriptSiteVtbl }; +static IActiveScriptSite script_site = { &ActiveScriptSiteVtbl }; + +static HRESULT WINAPI ActiveScriptSiteWindow_QueryInterface(IActiveScriptSiteWindow *iface, REFIID riid, void **ppv) +{ + return query_interface(riid, ppv); +} + +static ULONG WINAPI ActiveScriptSiteWindow_AddRef(IActiveScriptSiteWindow *iface) +{ + return 2; +} + +static ULONG WINAPI ActiveScriptSiteWindow_Release(IActiveScriptSiteWindow *iface) +{ + return 1; +} + +static HRESULT WINAPI ActiveScriptSiteWindow_GetWindow(IActiveScriptSiteWindow *iface, HWND *phwnd) +{ + TRACE("(%p)\n", phwnd); + + *phwnd = NULL; + return S_OK; +} + +static HRESULT WINAPI ActiveScriptSiteWindow_EnableModeless(IActiveScriptSiteWindow *iface, BOOL fEnable) +{ + TRACE("(%x)\n", fEnable); + return S_OK; +} + +static const IActiveScriptSiteWindowVtbl ActiveScriptSiteWindowVtbl = { + ActiveScriptSiteWindow_QueryInterface, + ActiveScriptSiteWindow_AddRef, + ActiveScriptSiteWindow_Release, + ActiveScriptSiteWindow_GetWindow, + ActiveScriptSiteWindow_EnableModeless +}; + +static IActiveScriptSiteWindow script_site_window = { &ActiveScriptSiteWindowVtbl }; + +static HRESULT query_interface(REFIID riid, void **ppv) +{ + if(IsEqualGUID(riid, &IID_IUnknown)) { + TRACE("(IID_IUnknown %p)\n", ppv); + *ppv = &script_site; + }else if(IsEqualGUID(riid, &IID_IActiveScriptSite)) { + TRACE("(IID_IActiveScriptSite %p)\n", ppv); + *ppv = &script_site; + }else if(IsEqualGUID(riid, &IID_IActiveScriptSiteWindow)) { + TRACE("(IID_IActiveScriptSiteWindow %p)\n", ppv); + *ppv = &script_site_window; + }else { + *ppv = NULL; + TRACE("(%s %p)\n", wine_dbgstr_guid(riid), ppv); + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} static BOOL load_typelib(void) {

1 0

Jacek Caban : mshtml: Avoid useless PATH changes and avoid buffer overflow in set_environment.
by Alexandre Julliard 23 Jul '14

23 Jul '14

Module: wine Branch: master Commit: 1bd0f4f065da6db368f57c63d9bd89e98e1677b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bd0f4f065da6db368f57c63d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 23 16:29:48 2014 +0200 mshtml: Avoid useless PATH changes and avoid buffer overflow in set_environment. --- dlls/mshtml/nsembed.c | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index fd87d37..0cc861f 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -438,8 +438,10 @@ static BOOL install_wine_gecko(void) static void set_environment(LPCWSTR gre_path) { - WCHAR path_env[MAX_PATH], buf[20]; - int len, debug_level = 0; + size_t len, gre_path_len; + int debug_level = 0; + WCHAR *path, buf[20]; + const WCHAR *ptr; static const WCHAR pathW[] = {'P','A','T','H',0}; static const WCHAR warnW[] = {'w','a','r','n',0}; @@ -449,13 +451,6 @@ static void set_environment(LPCWSTR gre_path) {'N','S','P','R','_','L','O','G','_','M','O','D','U','L','E','S',0}; static const WCHAR debug_formatW[] = {'a','l','l',':','%','d',0}; - /* We have to modify PATH as XPCOM loads other DLLs from this directory. */ - GetEnvironmentVariableW(pathW, path_env, sizeof(path_env)/sizeof(WCHAR)); - len = strlenW(path_env); - path_env[len++] = ';'; - strcpyW(path_env+len, gre_path); - SetEnvironmentVariableW(pathW, path_env); - SetEnvironmentVariableW(xpcom_debug_breakW, warnW); if(TRACE_ON(gecko)) @@ -467,6 +462,23 @@ static void set_environment(LPCWSTR gre_path) sprintfW(buf, debug_formatW, debug_level); SetEnvironmentVariableW(nspr_log_modulesW, buf); + + len = GetEnvironmentVariableW(pathW, NULL, 0); + gre_path_len = strlenW(gre_path); + path = heap_alloc((len+gre_path_len+1)*sizeof(WCHAR)); + if(!path) + return; + GetEnvironmentVariableW(pathW, path, len); + + /* We have to modify PATH as xul.dll loads other DLLs from this directory. */ + if(!(ptr = strstrW(path, gre_path)) + || (ptr > path && *(ptr-1) != ';') + || (ptr[gre_path_len] && ptr[gre_path_len] != ';')) { + if(len) + path[len-1] = ';'; + strcpyW(path+len, gre_path); + SetEnvironmentVariableW(pathW, path); + } } static BOOL load_xul(const PRUnichar *gre_path)

1 0

Jacek Caban : mshtml: Added IHTMLMetaElement:: charset property implementation.
by Alexandre Julliard 23 Jul '14

23 Jul '14

Module: wine Branch: master Commit: 6031108076213818445668992d19a8ba0a483082 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6031108076213818445668992… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 23 15:29:32 2014 +0200 mshtml: Added IHTMLMetaElement::charset property implementation. --- dlls/mshtml/htmlelem.c | 32 +++++++++++++++++++++++++++++--- dlls/mshtml/htmlinput.c | 2 +- dlls/mshtml/htmlmeta.c | 20 +++++++++++++------- dlls/mshtml/mshtml_private.h | 3 ++- dlls/mshtml/tests/dom.c | 39 ++++++++++++++++++++++++++++++++++++--- 5 files changed, 81 insertions(+), 15 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 8e246fe..8378d74 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -175,11 +175,12 @@ nsresult get_elem_attr_value(nsIDOMHTMLElement *nselem, const WCHAR *name, nsASt return NS_OK; } -HRESULT elem_string_attr_getter(HTMLElement *elem, const WCHAR *name, BSTR *p) +HRESULT elem_string_attr_getter(HTMLElement *elem, const WCHAR *name, BOOL use_null, BSTR *p) { const PRUnichar *val; nsAString val_str; nsresult nsres; + HRESULT hres = S_OK; nsres = get_elem_attr_value(elem->nselem, name, &val_str, &val); if(NS_FAILED(nsres)) @@ -187,9 +188,34 @@ HRESULT elem_string_attr_getter(HTMLElement *elem, const WCHAR *name, BSTR *p) TRACE("%s: returning %s\n", debugstr_w(name), debugstr_w(val)); - *p = SysAllocString(val); + if(*val || !use_null) { + *p = SysAllocString(val); + if(!*p) + hres = E_OUTOFMEMORY; + }else { + *p = NULL; + } nsAString_Finish(&val_str); - return *p ? S_OK : E_OUTOFMEMORY; + return hres; +} + +HRESULT elem_string_attr_setter(HTMLElement *elem, const WCHAR *name, const WCHAR *value) +{ + nsAString name_str, val_str; + nsresult nsres; + + nsAString_InitDepend(&name_str, name); + nsAString_InitDepend(&val_str, value); + nsres = nsIDOMHTMLElement_SetAttribute(elem->nselem, &name_str, &val_str); + nsAString_Finish(&name_str); + nsAString_Finish(&val_str); + + if(NS_FAILED(nsres)) { + WARN("SetAttribute failed: %08x\n", nsres); + return E_FAIL; + } + + return S_OK; } typedef struct diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index f5e086c..f832b88 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -1337,7 +1337,7 @@ static HRESULT WINAPI HTMLLabelElement_get_htmlFor(IHTMLLabelElement *iface, BST TRACE("(%p)->(%p)\n", This, p); - return elem_string_attr_getter(&This->element, forW, p); + return elem_string_attr_getter(&This->element, forW, FALSE, p); } static HRESULT WINAPI HTMLLabelElement_put_accessKey(IHTMLLabelElement *iface, BSTR v) diff --git a/dlls/mshtml/htmlmeta.c b/dlls/mshtml/htmlmeta.c index e9783c8..ab73c3c 100644 --- a/dlls/mshtml/htmlmeta.c +++ b/dlls/mshtml/htmlmeta.c @@ -108,7 +108,7 @@ static HRESULT WINAPI HTMLMetaElement_get_httpEquiv(IHTMLMetaElement *iface, BST TRACE("(%p)->(%p)\n", This, p); - return elem_string_attr_getter(&This->element, httpEquivW, p); + return elem_string_attr_getter(&This->element, httpEquivW, TRUE, p); } static HRESULT WINAPI HTMLMetaElement_put_content(IHTMLMetaElement *iface, BSTR v) @@ -125,7 +125,7 @@ static HRESULT WINAPI HTMLMetaElement_get_content(IHTMLMetaElement *iface, BSTR TRACE("(%p)->(%p)\n", This, p); - return elem_string_attr_getter(&This->element, contentW, p); + return elem_string_attr_getter(&This->element, contentW, TRUE, p); } static HRESULT WINAPI HTMLMetaElement_put_name(IHTMLMetaElement *iface, BSTR v) @@ -142,7 +142,7 @@ static HRESULT WINAPI HTMLMetaElement_get_name(IHTMLMetaElement *iface, BSTR *p) TRACE("(%p)->(%p)\n", This, p); - return elem_string_attr_getter(&This->element, nameW, p); + return elem_string_attr_getter(&This->element, nameW, TRUE, p); } static HRESULT WINAPI HTMLMetaElement_put_url(IHTMLMetaElement *iface, BSTR v) @@ -159,18 +159,24 @@ static HRESULT WINAPI HTMLMetaElement_get_url(IHTMLMetaElement *iface, BSTR *p) return E_NOTIMPL; } +static const WCHAR charsetW[] = {'c','h','a','r','s','e','t',0}; + static HRESULT WINAPI HTMLMetaElement_put_charset(IHTMLMetaElement *iface, BSTR v) { HTMLMetaElement *This = impl_from_IHTMLMetaElement(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + return elem_string_attr_setter(&This->element, charsetW, v); } static HRESULT WINAPI HTMLMetaElement_get_charset(IHTMLMetaElement *iface, BSTR *p) { HTMLMetaElement *This = impl_from_IHTMLMetaElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return elem_string_attr_getter(&This->element, charsetW, TRUE, p); } static const IHTMLMetaElementVtbl HTMLMetaElementVtbl = { diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 8db2ba8..64b9087 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -959,7 +959,8 @@ IHTMLElementCollection *create_collection_from_nodelist(HTMLDocumentNode*,nsIDOM IHTMLElementCollection *create_collection_from_htmlcol(HTMLDocumentNode*,nsIDOMHTMLCollection*) DECLSPEC_HIDDEN; nsresult get_elem_attr_value(nsIDOMHTMLElement*,const WCHAR*,nsAString*,const PRUnichar**) DECLSPEC_HIDDEN; -HRESULT elem_string_attr_getter(HTMLElement*,const WCHAR*,BSTR*) DECLSPEC_HIDDEN; +HRESULT elem_string_attr_getter(HTMLElement*,const WCHAR*,BOOL,BSTR*) DECLSPEC_HIDDEN; +HRESULT elem_string_attr_setter(HTMLElement*,const WCHAR*,const WCHAR*) DECLSPEC_HIDDEN; /* commands */ typedef struct { diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 533d7b7..33645c8 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -3803,7 +3803,6 @@ static void _test_meta_name(unsigned line, IUnknown *unk, const char *exname) BSTR name = NULL; HRESULT hres; - meta = _get_metaelem_iface(line, unk); hres = IHTMLMetaElement_get_name(meta, &name); ok_(__FILE__,line)(hres == S_OK, "get_name failed: %08x\n", hres); @@ -3819,7 +3818,6 @@ static void _test_meta_content(unsigned line, IUnknown *unk, const char *exconte BSTR content = NULL; HRESULT hres; - meta = _get_metaelem_iface(line, unk); hres = IHTMLMetaElement_get_content(meta, &content); ok_(__FILE__,line)(hres == S_OK, "get_content failed: %08x\n", hres); @@ -3835,7 +3833,6 @@ static void _test_meta_httpequiv(unsigned line, IUnknown *unk, const char *exval BSTR val = NULL; HRESULT hres; - meta = _get_metaelem_iface(line, unk); hres = IHTMLMetaElement_get_httpEquiv(meta, &val); ok_(__FILE__,line)(hres == S_OK, "get_httpEquiv failed: %08x\n", hres); @@ -3844,6 +3841,40 @@ static void _test_meta_httpequiv(unsigned line, IUnknown *unk, const char *exval IHTMLMetaElement_Release(meta); } +#define test_meta_charset(a,b) _test_meta_charset(__LINE__,a,b) +static void _test_meta_charset(unsigned line, IUnknown *unk, const char *exval) +{ + IHTMLMetaElement *meta; + BSTR val = NULL; + HRESULT hres; + + meta = _get_metaelem_iface(line, unk); + hres = IHTMLMetaElement_get_charset(meta, &val); + ok_(__FILE__,line)(hres == S_OK, "get_charset failed: %08x\n", hres); + if(exval) + ok_(__FILE__,line)(!strcmp_wa(val, exval), "charset = %s, expected %s\n", wine_dbgstr_w(val), exval); + else + ok_(__FILE__,line)(!val, "charset = %s, expected NULL\n", wine_dbgstr_w(val)); + SysFreeString(val); + IHTMLMetaElement_Release(meta); +} + +#define set_meta_charset(a,b) _set_meta_charset(__LINE__,a,b) +static void _set_meta_charset(unsigned line, IUnknown *unk, const char *vala) +{ + BSTR val = a2bstr(vala); + IHTMLMetaElement *meta; + HRESULT hres; + + meta = _get_metaelem_iface(line, unk); + hres = IHTMLMetaElement_put_charset(meta, val); + ok_(__FILE__,line)(hres == S_OK, "put_charset failed: %08x\n", hres); + SysFreeString(val); + IHTMLMetaElement_Release(meta); + + _test_meta_charset(line, unk, vala); +} + #define test_link_media(a,b) _test_link_media(__LINE__,a,b) static void _test_link_media(unsigned line, IHTMLElement *elem, const char *exval) { @@ -6969,6 +7000,8 @@ static void test_elems(IHTMLDocument2 *doc) test_meta_name((IUnknown*)elem, "meta name"); test_meta_content((IUnknown*)elem, "text/html; charset=utf-8"); test_meta_httpequiv((IUnknown*)elem, "Content-Type"); + test_meta_charset((IUnknown*)elem, NULL); + set_meta_charset((IUnknown*)elem, "utf-8"); IHTMLElement_Release(elem); }

1 0

Thomas Faber : include: Correctly spell STATUS_SMI_PRIMITIVE_INSTALLER_FAILED.
by Alexandre Julliard 23 Jul '14

23 Jul '14

Module: wine Branch: master Commit: b4c96633ea50ef9c8838619d833616765afb3f3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4c96633ea50ef9c8838619d8… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Wed Jul 23 14:46:54 2014 +0200 include: Correctly spell STATUS_SMI_PRIMITIVE_INSTALLER_FAILED. --- dlls/ntdll/error.c | 2 +- dlls/ntdll/tests/error.c | 2 +- include/ntstatus.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/error.c b/dlls/ntdll/error.c index bc52de6..5c42010 100644 --- a/dlls/ntdll/error.c +++ b/dlls/ntdll/error.c @@ -1482,7 +1482,7 @@ static const DWORD table_c0150001[39] = ERROR_SXS_MANIFEST_TOO_BIG, /* c0150022 (STATUS_SXS_MANIFEST_TOO_BIG) */ ERROR_SXS_SETTING_NOT_REGISTERED, /* c0150023 (STATUS_SXS_SETTING_NOT_REGISTERED) */ ERROR_SXS_TRANSACTION_CLOSURE_INCOMPLETE, /* c0150024 (STATUS_SXS_TRANSACTION_CLOSURE_INCOMPLETE) */ - ERROR_SMI_PRIMITIVE_INSTALLER_FAILED, /* c0150025 (STATUS_SXS_PRIMITIVE_INSTALLER_FAILED) */ + ERROR_SMI_PRIMITIVE_INSTALLER_FAILED, /* c0150025 (STATUS_SMI_PRIMITIVE_INSTALLER_FAILED) */ ERROR_GENERIC_COMMAND_FAILED, /* c0150026 (STATUS_GENERIC_COMMAND_FAILED) */ ERROR_SXS_FILE_HASH_MISSING /* c0150027 (STATUS_SXS_FILE_HASH_MISSING) */ }; diff --git a/dlls/ntdll/tests/error.c b/dlls/ntdll/tests/error.c index 862f0a9..718b8c5 100644 --- a/dlls/ntdll/tests/error.c +++ b/dlls/ntdll/tests/error.c @@ -963,7 +963,7 @@ static void run_error_tests(void) cmp2(STATUS_SXS_MANIFEST_TOO_BIG, ERROR_SXS_MANIFEST_TOO_BIG); cmp2(STATUS_SXS_SETTING_NOT_REGISTERED, ERROR_SXS_SETTING_NOT_REGISTERED); cmp2(STATUS_SXS_TRANSACTION_CLOSURE_INCOMPLETE, ERROR_SXS_TRANSACTION_CLOSURE_INCOMPLETE); - cmp2(STATUS_SXS_PRIMITIVE_INSTALLER_FAILED, ERROR_SMI_PRIMITIVE_INSTALLER_FAILED); + cmp2(STATUS_SMI_PRIMITIVE_INSTALLER_FAILED, ERROR_SMI_PRIMITIVE_INSTALLER_FAILED); cmp2(STATUS_GENERIC_COMMAND_FAILED, ERROR_GENERIC_COMMAND_FAILED); cmp2(STATUS_SXS_FILE_HASH_MISSING, ERROR_SXS_FILE_HASH_MISSING); cmp2(STATUS_REDIRECTOR_STARTED, ERROR_SERVICE_ALREADY_RUNNING); diff --git a/include/ntstatus.h b/include/ntstatus.h index 325ce55..86dad85 100644 --- a/include/ntstatus.h +++ b/include/ntstatus.h @@ -1202,7 +1202,7 @@ #define STATUS_SXS_MANIFEST_TOO_BIG ((NTSTATUS) 0xC0150022) #define STATUS_SXS_SETTING_NOT_REGISTERED ((NTSTATUS) 0xC0150023) #define STATUS_SXS_TRANSACTION_CLOSURE_INCOMPLETE ((NTSTATUS) 0xC0150024) -#define STATUS_SXS_PRIMITIVE_INSTALLER_FAILED ((NTSTATUS) 0xC0150025) +#define STATUS_SMI_PRIMITIVE_INSTALLER_FAILED ((NTSTATUS) 0xC0150025) #define STATUS_GENERIC_COMMAND_FAILED ((NTSTATUS) 0xC0150026) #define STATUS_SXS_FILE_HASH_MISSING ((NTSTATUS) 0xC0150027)

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
29
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 July 2014