April 2013 - Wine-Commits - list.winehq.org

Piotr Caban : wininet: Improve searching for no-store header in HTTP response.
by Alexandre Julliard April 24, 2013

April 24, 2013

Module: wine Branch: master Commit: 4c4a922e278a327b04ed3d4dcc0d775a69cedf06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c4a922e278a327b04ed3d4dc… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 24 11:23:18 2013 +0200 wininet: Improve searching for no-store header in HTTP response. --- dlls/wininet/http.c | 27 ++++++++++++++++++++++++--- dlls/wininet/tests/http.c | 2 +- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 9f01d0c..c910c59 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2307,9 +2307,30 @@ static void create_cache_entry(http_request_t *req) if(b) { int header_idx = HTTP_GetCustomHeaderIndex(req, szCache_Control, 0, FALSE); - if(header_idx!=-1 && (!strcmpiW(req->custHeaders[header_idx].lpszValue, no_cacheW) - || !strcmpiW(req->custHeaders[header_idx].lpszValue, no_storeW))) - b = FALSE; + if(header_idx != -1) { + WCHAR *ptr; + + for(ptr=req->custHeaders[header_idx].lpszValue; *ptr; ) { + WCHAR *end; + + while(*ptr==' ' || *ptr=='\t') + ptr++; + + end = strchrW(ptr, ','); + if(!end) + end = ptr + strlenW(ptr); + + if(!strncmpiW(ptr, no_cacheW, sizeof(no_cacheW)/sizeof(*no_cacheW)-1) + || !strncmpiW(ptr, no_storeW, sizeof(no_storeW)/sizeof(*no_storeW)-1)) { + b = FALSE; + break; + } + + ptr = end; + if(*ptr == ',') + ptr++; + } + } } if(!b) { diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index fa01917..de7f354 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2026,7 +2026,7 @@ static DWORD CALLBACK server_thread(LPVOID param) } if (strstr(buffer, "GET /test_cache_control_no_store")) { - static const char no_cache_response[] = "HTTP/1.1 200 OK\r\nCache-Control: No-StOrE\r\n\r\nsome content"; + static const char no_cache_response[] = "HTTP/1.1 200 OK\r\nCache-Control: junk, \t No-StOrE\r\n\r\nsome content"; send(c, no_cache_response, sizeof(no_cache_response)-1, 0); } if (strstr(buffer, "GET /test_premature_disconnect"))

1 0

Stefan Dösinger : d3d9/tests: Don' t test for equality in d3d9's depth_blit_test.
by Alexandre Julliard April 24, 2013

April 24, 2013

Module: wine Branch: master Commit: 098105dca4af9322c9fab7fb6790f27d480addc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=098105dca4af9322c9fab7fb6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Apr 21 19:28:20 2013 +0200 d3d9/tests: Don't test for equality in d3d9's depth_blit_test. --- dlls/d3d9/tests/visual.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 82f364b..32470f0 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -11549,10 +11549,10 @@ static void depth_blit_test(IDirect3DDevice9 *device) { static const struct vertex quad1[] = { - { -1.0, 1.0, 0.50f, 0xff00ff00}, - { 1.0, 1.0, 0.50f, 0xff00ff00}, - { -1.0, -1.0, 0.50f, 0xff00ff00}, - { 1.0, -1.0, 0.50f, 0xff00ff00}, + { -1.0, 1.0, 0.33f, 0xff00ff00}, + { 1.0, 1.0, 0.33f, 0xff00ff00}, + { -1.0, -1.0, 0.33f, 0xff00ff00}, + { 1.0, -1.0, 0.33f, 0xff00ff00}, }; static const struct vertex quad2[] = {

1 0

Francois Gouget : testbot: Always log the 'errno' with an error.
by Alexandre Julliard April 24, 2013

April 24, 2013

Module: tools Branch: master Commit: c1907e42fda5598142decf23e9c49ad53f526b94 URL: http://source.winehq.org/git/tools.git/?a=commit;h=c1907e42fda5598142decf23… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Apr 24 18:38:12 2013 +0200 testbot: Always log the 'errno' with an error. Also log the relevant filename if any. --- testbot/bin/WineSendLog.pl | 2 +- testbot/lib/WineTestBot/Log.pm | 2 +- testbot/lib/WineTestBot/Tasks.pm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index 8ea4d9c..87be910 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -131,7 +131,7 @@ sub ReadLog } else { - LogMsg "Unable to open log $LogName\n"; + LogMsg "Unable to open '$LogName' for reading: $!\n"; } return \@Messages; diff --git a/testbot/lib/WineTestBot/Log.pm b/testbot/lib/WineTestBot/Log.pm index 6982943..b88ba6f 100644 --- a/testbot/lib/WineTestBot/Log.pm +++ b/testbot/lib/WineTestBot/Log.pm @@ -70,7 +70,7 @@ sub SetupRedirects() } else { - LogMsg "unable to redirect stderr to the log file\n"; + LogMsg "unable to redirect stderr to '$logfile': $!\n"; } } } diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index c892066..210815d 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -119,7 +119,7 @@ sub Run } else { - LogMsg "unable to redirect stderr to '$TaskDir/err'\n"; + LogMsg "unable to redirect stderr to '$TaskDir/err': $!\n"; } $ENV{PATH} = "/usr/bin:/bin"; delete $ENV{ENV};

1 0

Francois Gouget : testbot/WineRunTask: Only link test suite results from the 'latest' directory.
by Alexandre Julliard April 24, 2013

April 24, 2013

Module: tools Branch: master Commit: b36dfd8b7dda8c38d870d50bd7b11f657cdcea06 URL: http://source.winehq.org/git/tools.git/?a=commit;h=b36dfd8b7dda8c38d870d50b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Apr 24 18:37:39 2013 +0200 testbot/WineRunTask: Only link test suite results from the 'latest' directory. These results are later used to filter out test failures that are already present in the Wine source from those introduced by the new patches being tested. Linking every test result there would result in test failures to be sometimes wrongfully ignored. --- testbot/bin/WineRunTask.pl | 8 +++----- testbot/bin/WineSendLog.pl | 3 +++ 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 4428b6b..a06c8e6 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -68,6 +68,7 @@ sub FatalError($$$$$) LogTaskError($ErrMessage, $FullErrFileName); if ($Step->Type eq "suite") { + # Link the test suite's results for future use in WineSendLog.pl. my $LatestName = "$DataDir/latest/" . $Task->VM->Name . "_" . ($Step->FileType eq "exe64" ? "64" : "32") . ".err"; unlink($LatestName); @@ -337,13 +338,10 @@ if ($TA->GetFile($RptFileName, $FullLogFileName)) $Task->TestFailures($TestFailures); $NewStatus = "completed"; + chmod 0664, $FullLogFileName; if ($Step->Type eq "suite") { - chmod 0664, $FullLogFileName; - } - else - { - chmod 0664, $FullLogFileName; + # Link the test suite's results for future use in WineSendLog.pl. my $LatestNameBase = "$DataDir/latest/" . $VM->Name . "_" . ($Step->FileType eq "exe64" ? "64" : "32"); unlink("${LatestNameBase}.log"); diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index 0b31e7c..8ea4d9c 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -401,6 +401,9 @@ EOF { if (defined($StepTask->CmdLineArg)) { + # Filter out failures that happened in the full test suite: + # the test suite is run against code which is already in Wine + # so all any failure it reported not caused by this patch. $MessagesFromLog = CompareLogs("$LatestName.log", "$TaskDir/log", $BaseName, $StepTask->CmdLineArg); }

1 0

Lucas Zawacki : Correct portuguese translation for release 1.5.28
by Jeremy Newman April 24, 2013

April 24, 2013

Module: website Branch: master Commit: 8fd04b9de6404d386384337d8821b2c4d4c83f22 URL: http://source.winehq.org/git/website.git/?a=commit;h=8fd04b9de6404d38638433… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Tue Apr 23 18:33:36 2013 -0300 Correct portuguese translation for release 1.5.28 I forgot to translate the first line, my apologies. --- news/pt/2013041201.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/news/pt/2013041201.xml b/news/pt/2013041201.xml index f8acd19..7741e29 100644 --- a/news/pt/2013041201.xml +++ b/news/pt/2013041201.xml @@ -5,7 +5,7 @@ A versão de desenvolvimento 1.5.28 já está disponível agora. <a href="{$root}/announce/1.5.28">Novidades</a> desta versão: <ul> - <li>GnuTLS used for all secure connections, OpenSSL is no longer needed.</li> + <li>GnuTLS sendo usado para todas conexões seguras, OpenSSL não é mais necessário.</li> <li>Driver de Mac habilitado por padrão.</li> <li>Fontes FixedSys incluídas.</li> <li>Um novo ícone para o painel de controle de controladores de jogo.</li>

1 0

Lucas Zawacki : Translate Ubuntu download section to Portuguese
by Jeremy Newman April 23, 2013

April 23, 2013

Module: website Branch: master Commit: 0fa5fc99e1607ec3ea30cca5be766b6b307ffbda URL: http://source.winehq.org/git/website.git/?a=commit;h=0fa5fc99e1607ec3ea30cc… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Tue Apr 23 14:16:53 2013 -0300 Translate Ubuntu download section to Portuguese --- templates/pt/download/ubuntu.template | 61 +++++++++++++++++++++++++++++++++ 1 files changed, 61 insertions(+), 0 deletions(-) diff --git a/templates/pt/download/ubuntu.template b/templates/pt/download/ubuntu.template new file mode 100644 index 0000000..405f9f8 --- /dev/null +++ b/templates/pt/download/ubuntu.template @@ -0,0 +1,61 @@ + + + +<h1 class="title"><a href="http://www.ubuntu.com/" target="_new"><img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu Logo" border="0"></a> +Wine para o Ubuntu e derivativos do Ubuntu +<a href="http://www.ubuntu.com/" target="_new"><img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu Logo" border="0"></a></h1> + +Ubuntu e derivativas do Ubuntu (como o Kubuntu) obtém seus aplicativos de +pacotes que são guardados em repositórios. O repositório padrão +do Ubuntu inclui o Wine, entretanto se você quiser se manter a par dos pacotes +mais recentes do Wine você pode usar o repositório do WineHQ seguindo estas instruções. + + +<h2>Adicionando o repositório PPA do WineHQ:</h2> + +Acesse o menu 'Fontes de Aplicativos' abrindo o Centro de Aplicativos do Ubuntu +e selecionando Editar->Fontes de Aplicativos. Escolha a aba +Aplicativos de Terceiros e clique Adicionar. + +<img src="{$root}/images/distro/ubuntu-ppa.png" width="531" height="509" alt="Software Center->Edit->Software Sources->Other Software" border="0"> + +<ppa>Depois, copie e cole a linha abaixo. + +ppa:ubuntu-wine/ppa + +<h2>Aviso: Pacotes Beta</h2> + +Os pacotes da versão 1.5 são pacotes beta. Isto quer dizer que +eles podem sofrer <a href="http://wiki.winehq.org/Regression">regressões</a> +periodicamente, e como resultado, prejudicar a funcionalidade do Wine. +Caso o pacote estável da versão 1.4 do Wine funcione bem no seu sistema, talvez +você prefira não usar estes pacotes beta. + +<h2>Instalando o Wine:</h2> + +Depois de adicionar o repositório PPA do WineHQ, você está pronto para instalar. + +Para adquirir a versão mais recente do Wine 1.5 beta, +<a href="apt://wine1.5">clique neste link para instalar o pacote wine1.5</a>. +Para instalar a versão mais antiga e estável do Wine 1.4, +<a href="apt://wine1.4">clique neste link para instalar o pacote wine1.4</a>. + +<h2>Atualizando para uma versão mais nova do Ubuntu</h2> + +Caso você esteja fazendo a atualização de sistema, como por exemplo ao atualizar do Ubuntu 11.10 para 12.04, +você precisará voltar nesta página e adicionar o repositório novamente. +O gerenciador de atualizações padrão não irá fazer a mudança de repositório automaticamente. + + +<h2>Instruções alternativas de linha de comando para instalar o Wine:</h2> + +Também é possível adicionar a PPA do Wine e fazer a instalação via terminal. Isto +pode ser útil no Kubuntu, Xubuntu e outras derivativas de Ubuntu. + +sudo add-apt-repository ppa:ubuntu-wine/ppa + +Então atualize a informação de pacotes APT com o comando 'sudo apt-get +update'. Você agora pode instalar o Wine digitando 'sudo apt-get +install wine1.5'. + +Caso você queira navegar a PPA manualmente, você pode <a href="https://launchpad.net/~ubuntu-wine/+archive/ppa">visitar a página no Launchpad</a>.

1 0

Lucas Zawacki : Portuguese translation for release 1.5.28
by Jeremy Newman April 23, 2013

April 23, 2013

Module: website Branch: master Commit: 47467e7a1141b6a299b34fcf268666b6217b3ff2 URL: http://source.winehq.org/git/website.git/?a=commit;h=47467e7a1141b6a299b34f… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Tue Apr 23 14:16:52 2013 -0300 Portuguese translation for release 1.5.28 --- news/pt/2013041201.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/pt/2013041201.xml b/news/pt/2013041201.xml new file mode 100644 index 0000000..f8acd19 --- /dev/null +++ b/news/pt/2013041201.xml @@ -0,0 +1,16 @@ +<news> +<date>12 de Abril de 2013</date> +<title>Wine 1.5.28 lançado</title> +<body> + A versão de desenvolvimento 1.5.28 já está disponível agora. + <a href="{$root}/announce/1.5.28">Novidades</a> desta versão: +<ul> + <li>GnuTLS used for all secure connections, OpenSSL is no longer needed.</li> + <li>Driver de Mac habilitado por padrão.</li> + <li>Fontes FixedSys incluídas.</li> + <li>Um novo ícone para o painel de controle de controladores de jogo.</li> + <li>Melhoria do driver Postscript.</li> + <li>Várias correções de bugs</li> +O código fonte está <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.28.tar.bz2">disponível agora</a>. +Pacotes binários estão em processo de construção e irão aparecer em breve em suas respectivas <a href="{$root}/download">sessões da área de downloads</a>. +</body></news>

1 0

André Hentschel : winegcc: Set target based on forced pointer size.
by Alexandre Julliard April 23, 2013

April 23, 2013

Module: wine Branch: master Commit: 504925a8f70c1e99e7c4637826f8ced15649ff80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=504925a8f70c1e99e7c463782… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Apr 21 16:58:53 2013 +0200 winegcc: Set target based on forced pointer size. --- tools/winegcc/winegcc.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 06aa200..1469b8a 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -343,11 +343,9 @@ static int check_platform( struct options *opts, const char *file ) if (!memcmp( header, "\177ELF", 4 )) { if (header[4] == 2) /* 64-bit */ - ret = (opts->force_pointer_size == 8 || - (!opts->force_pointer_size && (opts->target_cpu == CPU_x86_64 || opts->target_cpu == CPU_ARM64))); + ret = (opts->target_cpu == CPU_x86_64 || opts->target_cpu == CPU_ARM64); else - ret = (opts->force_pointer_size == 4 || - (!opts->force_pointer_size && opts->target_cpu != CPU_x86_64 && opts->target_cpu != CPU_ARM64)); + ret = (opts->target_cpu != CPU_x86_64 && opts->target_cpu != CPU_ARM64); } } close( fd ); @@ -370,13 +368,13 @@ static char *get_lib_dir( struct options *opts ) strcpy( p, libwine ); if (check_platform( opts, buffer )) goto found; if (p > buffer + 2 && (!memcmp( p - 2, "32", 2 ) || !memcmp( p - 2, "64", 2 ))) p -= 2; - if (opts->force_pointer_size == 4 || (!opts->force_pointer_size && opts->target_cpu != CPU_x86_64 && opts->target_cpu != CPU_ARM64)) + if (opts->target_cpu != CPU_x86_64 && opts->target_cpu != CPU_ARM64) { strcpy( p, "32" ); strcat( p, libwine ); if (check_platform( opts, buffer )) goto found; } - if (opts->force_pointer_size == 8 || (!opts->force_pointer_size && (opts->target_cpu == CPU_x86_64 || opts->target_cpu == CPU_ARM64))) + if (opts->target_cpu == CPU_x86_64 || opts->target_cpu == CPU_ARM64) { strcpy( p, "64" ); strcat( p, libwine ); @@ -1406,6 +1404,10 @@ int main(int argc, char **argv) } else if (strcmp("-m64", argv[i]) == 0) { + if (opts.target_cpu == CPU_x86) + opts.target_cpu = CPU_x86_64; + else if (opts.target_cpu == CPU_ARM) + opts.target_cpu = CPU_ARM64; opts.force_pointer_size = 8; raw_linker_arg = 1; }

1 0

Jacek Caban : jscript: Store concatenated strings as a rope string to avoid useless copying.
by Alexandre Julliard April 23, 2013

April 23, 2013

Module: wine Branch: master Commit: 8541f94e2ced1af23ee3dc41961fe891986d449b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8541f94e2ced1af23ee3dc419… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 23 15:02:37 2013 +0200 jscript: Store concatenated strings as a rope string to avoid useless copying. --- dlls/jscript/jsstr.c | 204 +++++++++++++++++++++++++++++++++++++++++++++++-- dlls/jscript/jsstr.h | 107 +++++++++++++++++++++++--- 2 files changed, 290 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8541f94e2ced1af23ee3d…

1 0

Piotr Caban : mshtml: Added IOmHistory::get_length implementation.
by Alexandre Julliard April 23, 2013

April 23, 2013

Module: wine Branch: master Commit: 019a1af76e3c5e6bab394215f075eb1545e880b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=019a1af76e3c5e6bab394215f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 23 16:21:04 2013 +0200 mshtml: Added IOmHistory::get_length implementation. --- dlls/mshtml/htmlwindow.c | 14 +++++++++----- dlls/mshtml/mshtml_private.h | 16 ++++++++++++++-- dlls/mshtml/oleobj.c | 31 ++++++++++++++++++++++++++----- dlls/mshtml/omnavigator.c | 26 +++++++++++++++----------- dlls/mshtml/tests/htmldoc.c | 6 +++--- 5 files changed, 67 insertions(+), 26 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index ccb2a56..28c071e 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -264,8 +264,12 @@ static void release_inner_window(HTMLInnerWindow *This) if(This->screen) IHTMLScreen_Release(This->screen); - if(This->history) - IOmHistory_Release(This->history); + + if(This->history) { + This->history->window = NULL; + IOmHistory_Release(&This->history->IOmHistory_iface); + } + if(This->mon) IMoniker_Release(This->mon); @@ -763,13 +767,13 @@ static HRESULT WINAPI HTMLWindow2_get_history(IHTMLWindow2 *iface, IOmHistory ** if(!window->history) { HRESULT hres; - hres = create_history(&window->history); + hres = create_history(window, &window->history); if(FAILED(hres)) return hres; } - IOmHistory_AddRef(window->history); - *p = window->history; + IOmHistory_AddRef(&window->history->IOmHistory_iface); + *p = &window->history->IOmHistory_iface; return S_OK; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index c610ef5..08c48ce 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -28,6 +28,7 @@ #include "objsafe.h" #include "htiframe.h" #include "tlogstg.h" +#include "shdeprecated.h" #include "wine/list.h" #include "wine/unicode.h" @@ -339,6 +340,15 @@ struct HTMLLocation { }; typedef struct { + DispatchEx dispex; + IOmHistory IOmHistory_iface; + + LONG ref; + + HTMLInnerWindow *window; +} OmHistory; + +typedef struct { HTMLOuterWindow *window; LONG ref; } windowref_t; @@ -403,7 +413,7 @@ struct HTMLInnerWindow { HTMLImageElementFactory *image_factory; HTMLOptionElementFactory *option_factory; IHTMLScreen *screen; - IOmHistory *history; + OmHistory *history; IHTMLStorage *session_storage; unsigned parser_callback_cnt; @@ -545,6 +555,8 @@ struct HTMLDocumentObj { IAdviseSink *view_sink; IDocObjectService *doc_object_service; IUnknown *webbrowser; + ITravelLog *travel_log; + IUnknown *browser_service; DOCHOSTUIINFO hostinfo; @@ -738,7 +750,7 @@ HRESULT HTMLImageElementFactory_Create(HTMLInnerWindow*,HTMLImageElementFactory* HRESULT HTMLLocation_Create(HTMLInnerWindow*,HTMLLocation**) DECLSPEC_HIDDEN; IOmNavigator *OmNavigator_Create(void) DECLSPEC_HIDDEN; HRESULT HTMLScreen_Create(IHTMLScreen**) DECLSPEC_HIDDEN; -HRESULT create_history(IOmHistory**) DECLSPEC_HIDDEN; +HRESULT create_history(HTMLInnerWindow*,OmHistory**) DECLSPEC_HIDDEN; HRESULT create_storage(IHTMLStorage**) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c index c463ebe..ac15cdf 100644 --- a/dlls/mshtml/oleobj.c +++ b/dlls/mshtml/oleobj.c @@ -215,6 +215,7 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite HTMLDocument *This = impl_from_IOleObject(iface); IOleCommandTarget *cmdtrg = NULL; IOleWindow *ole_window; + IBrowserService *browser_service; BOOL hostui_setup; VARIANT silent; HWND hwnd; @@ -251,6 +252,16 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite This->doc_obj->webbrowser = NULL; } + if(This->doc_obj->browser_service) { + IUnknown_Release(This->doc_obj->browser_service); + This->doc_obj->browser_service = NULL; + } + + if(This->doc_obj->travel_log) { + ITravelLog_Release(This->doc_obj->travel_log); + This->doc_obj->travel_log = NULL; + } + memset(&This->doc_obj->hostinfo, 0, sizeof(DOCHOSTUIINFO)); if(!pClientSite) @@ -323,6 +334,20 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite IOleWindow_Release(ole_window); } + hres = do_query_service((IUnknown*)pClientSite, &IID_IShellBrowser, + &IID_IBrowserService, (void**)&browser_service); + if(SUCCEEDED(hres)) { + ITravelLog *travel_log; + + This->doc_obj->browser_service = (IUnknown*)browser_service; + + hres = IBrowserService_GetTravelLog(browser_service, &travel_log); + if(SUCCEEDED(hres)) + This->doc_obj->travel_log = travel_log; + }else { + browser_service = NULL; + } + hres = IOleClientSite_QueryInterface(pClientSite, &IID_IOleCommandTarget, (void**)&cmdtrg); if(SUCCEEDED(hres)) { VARIANT var; @@ -332,16 +357,13 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite if(!hostui_setup) { IDocObjectService *doc_object_service; - IBrowserService *browser_service; IWebBrowser2 *wb; V_VT(&var) = VT_UNKNOWN; V_UNKNOWN(&var) = (IUnknown*)&This->window->base.IHTMLWindow2_iface; IOleCommandTarget_Exec(cmdtrg, &CGID_DocHostCmdPriv, DOCHOST_DOCCANNAVIGATE, 0, &var, NULL); - hres = do_query_service((IUnknown*)pClientSite, &IID_IShellBrowser, - &IID_IBrowserService, (void**)&browser_service); - if(SUCCEEDED(hres)) { + if(browser_service) { hres = IBrowserService_QueryInterface(browser_service, &IID_IDocObjectService, (void**)&doc_object_service); if(SUCCEEDED(hres)) { @@ -354,7 +376,6 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite hres = do_query_service((IUnknown*)pClientSite, &IID_IWebBrowserApp, &IID_IWebBrowser2, (void**)&wb); if(SUCCEEDED(hres)) This->doc_obj->webbrowser = (IUnknown*)wb; - IBrowserService_Release(browser_service); } } } diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index 51421d3..5b564a1 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -44,13 +44,6 @@ typedef struct { HTMLMimeTypesCollection *mime_types; } OmNavigator; -typedef struct { - DispatchEx dispex; - IOmHistory IOmHistory_iface; - - LONG ref; -} OmHistory; - static inline OmHistory *impl_from_IOmHistory(IOmHistory *iface) { return CONTAINING_RECORD(iface, OmHistory, IOmHistory_iface); @@ -142,8 +135,17 @@ static HRESULT WINAPI OmHistory_Invoke(IOmHistory *iface, DISPID dispIdMember, R static HRESULT WINAPI OmHistory_get_length(IOmHistory *iface, short *p) { OmHistory *This = impl_from_IOmHistory(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + if(!This->window || !This->window->base.outer_window->doc_obj + || !This->window->base.outer_window->doc_obj->travel_log) { + *p = 0; + }else { + *p = ITravelLog_CountEntries(This->window->base.outer_window->doc_obj->travel_log, + This->window->base.outer_window->doc_obj->browser_service); + } + return S_OK; } static HRESULT WINAPI OmHistory_back(IOmHistory *iface, VARIANT *pvargdistance) @@ -193,7 +195,7 @@ static dispex_static_data_t OmHistory_dispex = { }; -HRESULT create_history(IOmHistory **ret) +HRESULT create_history(HTMLInnerWindow *window, OmHistory **ret) { OmHistory *history; @@ -205,7 +207,9 @@ HRESULT create_history(IOmHistory **ret) history->IOmHistory_iface.lpVtbl = &OmHistoryVtbl; history->ref = 1; - *ret = &history->IOmHistory_iface; + history->window = window; + + *ret = history; return S_OK; } diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index f1fa06e..7531a40 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -5291,7 +5291,7 @@ static void test_Load(IPersistMoniker *persist, IMoniker *mon) CHECK_CALLED(Exec_ShellDocView_37); todo_wine CHECK_CALLED_BROKEN(IsErrorUrl); }else { - todo_wine CHECK_CALLED(GetTravelLog); + CHECK_CALLED(GetTravelLog); } CHECK_CALLED_BROKEN(Exec_ShellDocView_84); todo_wine CHECK_CALLED(GetPendingUrl); @@ -6377,7 +6377,7 @@ static void test_ClientSite(IOleObject *oleobj, DWORD flags) CHECK_CALLED(Invoke_AMBIENT_USERAGENT); CLEAR_CALLED(Invoke_AMBIENT_PALETTE); /* not called on IE9 */ CLEAR_CALLED(GetOverrideKeyPath); /* Called by IE9 */ - todo_wine CHECK_CALLED(GetTravelLog); + CHECK_CALLED(GetTravelLog); CHECK_CALLED_BROKEN(Exec_ShellDocView_84); set_clientsite = TRUE; @@ -7706,7 +7706,7 @@ static void test_UIActivate(BOOL do_load, BOOL use_ipsex, BOOL use_ipsw) CHECK_CALLED(QueryStatus_SETPROGRESSTEXT); CHECK_CALLED(Exec_SETPROGRESSMAX); CHECK_CALLED(Exec_SETPROGRESSPOS); - todo_wine CHECK_CALLED(GetTravelLog); + CHECK_CALLED(GetTravelLog); CHECK_CALLED_BROKEN(Exec_ShellDocView_84); hres = IOleDocumentView_GetInPlaceSite(view, &inplacesite);

1 0