November 2012 - Wine-Commits

Piotr Caban : msvcp90: Fixed a memory leak in virtual destructor tests.
by Alexandre Julliard Nov. 12, 2012

Nov. 12, 2012

Module: wine Branch: master Commit: 96c9b0fb842c0ecf6f4e6d36c7aced3e36c805f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96c9b0fb842c0ecf6f4e6d36c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Nov 10 00:00:23 2012 +0100 msvcp90: Fixed a memory leak in virtual destructor tests. --- dlls/msvcp90/tests/misc.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/msvcp90/tests/misc.c b/dlls/msvcp90/tests/misc.c index 19dcdde..5188fd5 100644 --- a/dlls/msvcp90/tests/misc.c +++ b/dlls/msvcp90/tests/misc.c @@ -96,6 +96,7 @@ static /*basic_ostringstream_char*/void* (__thiscall *p_basic_ostringstream_char /*basic_ostringstream_char*/void*, int, /*MSVCP_bool*/int); static void (__thiscall *p_basic_ostringstream_char_dtor)(/*basic_ostringstream_char*/void*); static void (__thiscall *p_basic_ostringstream_char_vbase_dtor)(/*basic_ostringstream_char*/void*); +static void (__thiscall *p_basic_ios_char_dtor)(/*basic_ios_char*/void*); static int invalid_parameter = 0; static void __cdecl test_invalid_parameter_handler(const wchar_t *expression, @@ -223,6 +224,8 @@ static BOOL init(void) "??1?$basic_ostringstream(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@UEAA(a)XZ"); SET(p_basic_ostringstream_char_vbase_dtor, "??_D?$basic_ostringstream(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAXXZ"); + SET(p_basic_ios_char_dtor, + "??1?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@UEAA(a)XZ"); } else { SET(p_char_assign, "?assign@?$char_traits(a)D@std@@SAXAADABD(a)Z"); SET(p_wchar_assign, "?assign@?$char_traits(a)_W@std@@SAXAA_WAB_W(a)Z"); @@ -258,6 +261,8 @@ static BOOL init(void) "??1?$basic_ostringstream(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@UAE(a)XZ"); SET(p_basic_ostringstream_char_vbase_dtor, "??_D?$basic_ostringstream(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEXXZ"); + SET(p_basic_ios_char_dtor, + "??1?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@UAE(a)XZ"); } init_thiscall_thunk(); @@ -503,8 +508,10 @@ static void test_virtual_base_dtors(void) call_func3(p_basic_ostringstream_char_ctor_mode, this, 0, 1); call_func1(p_basic_ostringstream_char_vbase_dtor, this); + /* this test uses vbtable set by earlier test */ call_func3(p_basic_ostringstream_char_ctor_mode, this, 0, 0); call_func1(p_basic_ostringstream_char_dtor, this+basic_ostringstream_char_vbtable[1]); + call_func1(p_basic_ios_char_dtor, this+((int**)this)[0][1]); } START_TEST(misc)

1 0

Francois Gouget : shell32: Fix a buffer overflow in CommandLineToArgvW().
by Alexandre Julliard Nov. 12, 2012

Nov. 12, 2012

Module: wine Branch: master Commit: 3b6b2107e2648b562c7266b17c66ab263c374c31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b6b2107e2648b562c7266b17… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sat Nov 10 01:00:54 2012 +0100 shell32: Fix a buffer overflow in CommandLineToArgvW(). --- dlls/shell32/shell32_main.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 7648dbb..1507d4a 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -227,15 +227,20 @@ LPWSTR* WINAPI CommandLineToArgvW(LPCWSTR lpCmdline, int* numargs) if (*s) s++; } - /* close the argument */ + /* close the executable path */ *d++=0; /* skip to the first argument and initialize it if any */ while (*s==' ' || *s=='\t') s++; - if (*s) - argv[argc++]=d; + if (!*s) + { + /* There are no parameters so we are all done */ + *numargs=argc; + return argv; + } /* Split and copy the remaining arguments */ + argv[argc++]=d; qcount=bcount=0; while (*s) {

1 0

Łukasz Wojniłowicz : Polish translation for release 1.5.17
by Jeremy Newman Nov. 12, 2012

Nov. 12, 2012

Module: website Branch: master Commit: d97aede18aa7c1228997c36ca1340318b7624203 URL: http://source.winehq.org/git/website.git/?a=commit;h=d97aede18aa7c1228997c3… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Nov 10 07:28:36 2012 +0100 Polish translation for release 1.5.17 --- news/pl/2012110901.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/pl/2012110901.xml b/news/pl/2012110901.xml new file mode 100644 index 0000000..e10ec77 --- /dev/null +++ b/news/pl/2012110901.xml @@ -0,0 +1,17 @@ +<news> +<date>Listopad 9, 2012</date> +<title>Wydano Wine 1.5.17</title> +<body> + Wydanie rozwojowe Wine 1.5.17 jest już dostępne. + <a href="{$root}/announce/1.5.17">Co nowego</a> w tym wydaniu: +<ul> + <li>Międzypikselowe wygładzanie czcionek w silniku DIB.</li> + <li>Wsparcie dla samoczynnej instalacji elementów sterowania ActiveX.</li> + <li>Samoczynny powrót do TLS 1.0 dla zabezpieczonych połączeń.</li> + <li>Początki analizatora tekstu DirectWrite.</li> + <li>Lepsza obsługa zarysów czcionek w OpenGL.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.17.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Frédéric Delanoy : French translation for release 1.5.17
by Jeremy Newman Nov. 12, 2012

Nov. 12, 2012

Module: website Branch: master Commit: 1eef770d1aeffd93f8bc530c782d46ee400b0056 URL: http://source.winehq.org/git/website.git/?a=commit;h=1eef770d1aeffd93f8bc53… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Nov 9 21:09:47 2012 +0100 French translation for release 1.5.17 --- news/fr/2012110901.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/fr/2012110901.xml b/news/fr/2012110901.xml new file mode 100644 index 0000000..2ea1717 --- /dev/null +++ b/news/fr/2012110901.xml @@ -0,0 +1,16 @@ +<news> +<date>9 novembre 2012</date> +<title>Sortie de Wine 1.5.17</title> +<body> + La version de développement 1.5.17 de Wine est disponible. + <a href="{$root}/announce/1.5.17">Nouveautés</a> de cette version : +<ul> + <li>Anticrénelage sur éléments de pixel des fontes dans le moteur DIB.</li> + <li>Prise en charge de l'installation automatique des contrôles ActiveX.</li> + <li>Substitution automatique vers TLS 1.0 pour les connexions sécurisées.</li> + <li>Ébauche d'un analyseur de texte DirectWrite.</li> + <li>Meilleur traitement des polices contours dans OpenGL.</li> + <li>Diverses corrections de bogues.</li> +</ul> +Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.17.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

André Hentschel : Wine 1.5.17 freigegeben
by Jeremy Newman Nov. 9, 2012

Nov. 9, 2012

Module: website Branch: master Commit: 0ae35fc7d6b3891c1b2fc47d5d5f528041890e88 URL: http://source.winehq.org/git/website.git/?a=commit;h=0ae35fc7d6b3891c1b2fc4… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Nov 9 20:43:14 2012 +0100 Wine 1.5.17 freigegeben --- news/de/2012110901.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/de/2012110901.xml b/news/de/2012110901.xml new file mode 100644 index 0000000..bc36730 --- /dev/null +++ b/news/de/2012110901.xml @@ -0,0 +1,17 @@ +<news> +<date>9. November 2012</date> +<title>Wine 1.5.17 freigegeben</title> +<body> + Die Entwicklungsversion 1.5.17 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.5.17">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Subpixel Schrift Antialiasing in der DIB Engine.</li> + <li>Unterstützung für die automatische Installation von ActiveX-Steuerelementen.</li> + <li>Bei sicheren Verbindungen wird automatisch auf TLS 1.0 zurückgeschaltet.</li> + <li>Anfänge des DirectWrite Textanalysators.</li> + <li>Besseres Handling von Schriftkonturen in OpenGL.</li> + <li>Verschiedene Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.17.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Alexandre Julliard : Wine release 1.5.17
by Alexandre Julliard Nov. 9, 2012

Nov. 9, 2012

Module: website Branch: master Commit: ec36f6748726ddbf8c0f8befa19a722dbfe8d185 URL: http://source.winehq.org/git/website.git/?a=commit;h=ec36f6748726ddbf8c0f8b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 9 19:59:32 2012 +0100 Wine release 1.5.17 --- news/en/2012110901.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/en/2012110901.xml b/news/en/2012110901.xml new file mode 100644 index 0000000..3cf992e --- /dev/null +++ b/news/en/2012110901.xml @@ -0,0 +1,17 @@ +<news> +<date>November 9, 2012</date> +<title>Wine 1.5.17 Released</title> +<body> + The Wine development release 1.5.17 is now available. + <a href="{$root}/announce/1.5.17">What's new</a> in this release: +<ul> + <li>Sub-pixel font anti-aliasing in the DIB engine.</li> + <li>Support for automatic installation of ActiveX controls.</li> + <li>Automatic fallback to TLS 1.0 for secure connections.</li> + <li>Beginnings of the DirectWrite text analyzer.</li> + <li>Better handling of font outlines in OpenGL.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.17.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-1.5.17 : Alexandre Julliard : Release 1.5.17
by Alexandre Julliard Nov. 9, 2012

Nov. 9, 2012

Module: wine Branch: refs/tags/wine-1.5.17 Tag: 71461e3ede8285a1bce94881b6f51dfe077afed1 URL: http://source.winehq.org/git/wine.git/?a=tag;h=71461e3ede8285a1bce94881b6f5… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 9 19:46:40 2012 +0100 Release 1.5.17

1 0

Alexandre Julliard : Release 1.5.17.
by Alexandre Julliard Nov. 9, 2012

Nov. 9, 2012

Module: wine Branch: master Commit: 1262f07609e6722a841f511445f145d941848800 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1262f07609e6722a841f51144… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 9 19:46:37 2012 +0100 Release 1.5.17. --- ANNOUNCE | 974 ++++++++++++++++++++++++++++--------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 452 insertions(+), 542 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1262f07609e6722a841f5…

1 0

Matteo Bruni : d3dcompiler: Put data type name of constants on the heap.
by Alexandre Julliard Nov. 9, 2012

Nov. 9, 2012

Module: wine Branch: master Commit: f6b22a7570b3a13e1423537c70b65ab09a0b2c32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6b22a7570b3a13e1423537c7… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Nov 9 15:20:39 2012 +0100 d3dcompiler: Put data type name of constants on the heap. --- dlls/d3dcompiler_43/hlsl.y | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 6c360ec..777fb4e 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -1770,7 +1770,7 @@ primary_expr: C_FLOAT } c->node.type = HLSL_IR_CONSTANT; set_location(&c->node.loc, &yylloc); - c->node.data_type = new_hlsl_type("float", HLSL_CLASS_SCALAR, HLSL_TYPE_FLOAT, 1, 1); + c->node.data_type = new_hlsl_type(d3dcompiler_strdup("float"), HLSL_CLASS_SCALAR, HLSL_TYPE_FLOAT, 1, 1); c->v.value.f[0] = $1; $$ = &c->node; } @@ -1784,7 +1784,7 @@ primary_expr: C_FLOAT } c->node.type = HLSL_IR_CONSTANT; set_location(&c->node.loc, &yylloc); - c->node.data_type = new_hlsl_type("int", HLSL_CLASS_SCALAR, HLSL_TYPE_INT, 1, 1); + c->node.data_type = new_hlsl_type(d3dcompiler_strdup("int"), HLSL_CLASS_SCALAR, HLSL_TYPE_INT, 1, 1); c->v.value.i[0] = $1; $$ = &c->node; } @@ -1798,7 +1798,7 @@ primary_expr: C_FLOAT } c->node.type = HLSL_IR_CONSTANT; set_location(&c->node.loc, &yylloc); - c->node.data_type = new_hlsl_type("bool", HLSL_CLASS_SCALAR, HLSL_TYPE_BOOL, 1, 1); + c->node.data_type = new_hlsl_type(d3dcompiler_strdup("bool"), HLSL_CLASS_SCALAR, HLSL_TYPE_BOOL, 1, 1); c->v.value.b[0] = $1; $$ = &c->node; }

1 0

Jacek Caban : mshtml: Use flags in navigation functions.
by Alexandre Julliard Nov. 9, 2012

Nov. 9, 2012

Module: wine Branch: master Commit: cfa0a3accdf3794c12a80b6a28460fa1d4c3312b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfa0a3accdf3794c12a80b6a2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 8 18:17:35 2012 +0100 mshtml: Use flags in navigation functions. --- dlls/mshtml/binding.h | 7 +++++-- dlls/mshtml/htmlwindow.c | 2 +- dlls/mshtml/navigate.c | 12 ++++++------ dlls/mshtml/persist.c | 12 ++++++------ 4 files changed, 18 insertions(+), 15 deletions(-) diff --git a/dlls/mshtml/binding.h b/dlls/mshtml/binding.h index f0e1cd5..fda318b 100644 --- a/dlls/mshtml/binding.h +++ b/dlls/mshtml/binding.h @@ -98,6 +98,9 @@ typedef struct { WCHAR *data; } http_header_t; +#define BINDING_NAVIGATED 0x0001 +#define BINDING_REPLACE 0x0002 + HRESULT set_http_header(struct list*,const WCHAR*,int,const WCHAR*,int) DECLSPEC_HIDDEN; HRESULT create_redirect_nschannel(const WCHAR*,nsChannel*,nsChannel**) DECLSPEC_HIDDEN; @@ -106,8 +109,8 @@ HRESULT hlink_frame_navigate(HTMLDocument*,LPCWSTR,nsChannel*,DWORD,BOOL*) DECLS HRESULT create_doc_uri(HTMLOuterWindow*,const WCHAR*,nsWineURI**) DECLSPEC_HIDDEN; HRESULT load_nsuri(HTMLOuterWindow*,nsWineURI*,nsChannelBSC*,DWORD) DECLSPEC_HIDDEN; HRESULT set_moniker(HTMLDocument*,IMoniker*,IBindCtx*,nsChannelBSC*,BOOL) DECLSPEC_HIDDEN; -void prepare_for_binding(HTMLDocument*,IMoniker*,BOOL) DECLSPEC_HIDDEN; -HRESULT super_navigate(HTMLOuterWindow*,IUri*,const WCHAR*,BYTE*,DWORD) DECLSPEC_HIDDEN; +void prepare_for_binding(HTMLDocument*,IMoniker*,DWORD) DECLSPEC_HIDDEN; +HRESULT super_navigate(HTMLOuterWindow*,IUri*,DWORD,const WCHAR*,BYTE*,DWORD) DECLSPEC_HIDDEN; HRESULT navigate_new_window(HTMLOuterWindow*,IUri*,const WCHAR*,IHTMLWindow2**) DECLSPEC_HIDDEN; HRESULT create_channelbsc(IMoniker*,const WCHAR*,BYTE*,DWORD,BOOL,nsChannelBSC**) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 0c3d7df..1696ed5 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -2098,7 +2098,7 @@ static HRESULT WINAPI HTMLPrivateWindow_SuperNavigate(IHTMLPrivateWindow *iface, headers = V_BSTR(headers_var); } - hres = super_navigate(window, uri, headers, post_data, post_data_size); + hres = super_navigate(window, uri, BINDING_NAVIGATED, headers, post_data, post_data_size); IUri_Release(uri); if(post_data) SafeArrayUnaccessData(V_ARRAY(post_data_var)); diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 18961f6..e92440e 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -2044,7 +2044,7 @@ static HRESULT navigate_fragment(HTMLOuterWindow *window, IUri *uri) return S_OK; } -HRESULT super_navigate(HTMLOuterWindow *window, IUri *uri, const WCHAR *headers, BYTE *post_data, DWORD post_data_size) +HRESULT super_navigate(HTMLOuterWindow *window, IUri *uri, DWORD flags, const WCHAR *headers, BYTE *post_data, DWORD post_data_size) { nsChannelBSC *bsc; IUri *uri_nofrag; @@ -2104,7 +2104,7 @@ HRESULT super_navigate(HTMLOuterWindow *window, IUri *uri, const WCHAR *headers, return hres; } - prepare_for_binding(&window->doc_obj->basedoc, mon, TRUE); + prepare_for_binding(&window->doc_obj->basedoc, mon, flags); hres = IUri_GetScheme(uri, &scheme); if(SUCCEEDED(hres) && scheme != URL_SCHEME_JAVASCRIPT) { @@ -2234,7 +2234,7 @@ HRESULT hlink_frame_navigate(HTMLDocument *doc, LPCWSTR url, nsChannel *nschanne hres = CreateAsyncBindCtx(0, &callback->bsc.IBindStatusCallback_iface, NULL, &bindctx); if(SUCCEEDED(hres)) - hres = CoCreateInstance(&CLSID_StdHlink, NULL, CLSCTX_INPROC_SERVER, + hres = CoCreateInstance(&CLSID_StdHlink, NULL, CLSCTX_INPROC_SERVER, &IID_IHlink, (LPVOID*)&hlink); if(SUCCEEDED(hres)) @@ -2261,7 +2261,7 @@ HRESULT hlink_frame_navigate(HTMLDocument *doc, LPCWSTR url, nsChannel *nschanne return hres; } -static HRESULT navigate_uri(HTMLOuterWindow *window, IUri *uri, const WCHAR *display_uri) +static HRESULT navigate_uri(HTMLOuterWindow *window, IUri *uri, const WCHAR *display_uri, DWORD flags) { nsWineURI *nsuri; HRESULT hres; @@ -2276,7 +2276,7 @@ static HRESULT navigate_uri(HTMLOuterWindow *window, IUri *uri, const WCHAR *dis return S_OK; } - return super_navigate(window, uri, NULL, NULL, 0); + return super_navigate(window, uri, flags, NULL, NULL, 0); } if(window->doc_obj && window == window->doc_obj->basedoc.window) { @@ -2343,7 +2343,7 @@ HRESULT navigate_url(HTMLOuterWindow *window, const WCHAR *new_url, IUri *base_u } } - hres = navigate_uri(window, uri, display_uri); + hres = navigate_uri(window, uri, display_uri, BINDING_NAVIGATED); IUri_Release(uri); SysFreeString(display_uri); diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index aa31067..2fe1cfe 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -292,7 +292,7 @@ static void set_downloading_task_destr(task_t *_task) heap_free(task); } -void prepare_for_binding(HTMLDocument *This, IMoniker *mon, BOOL navigated_binding) +void prepare_for_binding(HTMLDocument *This, IMoniker *mon, DWORD flags) { HRESULT hres; @@ -332,17 +332,17 @@ void prepare_for_binding(HTMLDocument *This, IMoniker *mon, BOOL navigated_bindi if(SUCCEEDED(hres)) { VARIANT var, out; - if(!navigated_binding) { - V_VT(&var) = VT_I4; - V_I4(&var) = 0; - IOleCommandTarget_Exec(cmdtrg, &CGID_ShellDocView, 37, 0, &var, NULL); - }else { + if(flags & BINDING_NAVIGATED) { V_VT(&var) = VT_UNKNOWN; V_UNKNOWN(&var) = (IUnknown*)&This->window->base.IHTMLWindow2_iface; V_VT(&out) = VT_EMPTY; hres = IOleCommandTarget_Exec(cmdtrg, &CGID_ShellDocView, 63, 0, &var, &out); if(SUCCEEDED(hres)) VariantClear(&out); + }else { + V_VT(&var) = VT_I4; + V_I4(&var) = 0; + IOleCommandTarget_Exec(cmdtrg, &CGID_ShellDocView, 37, 0, &var, NULL); } IOleCommandTarget_Release(cmdtrg);

1 0