January 2008 - Wine-commits

Alexandre Julliard : Wine release 0.9.53
by Alexandre Julliard 11 Jan '08

11 Jan '08

Module: website Branch: master Commit: 8dde720442ae4b273ffc9602cc600c77cacb6f93 URL: http://source.winehq.org/git/website.git/?a=commit;h=8dde720442ae4b273ffc96… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 11 17:36:02 2008 +0100 Wine release 0.9.53 --- news/2008011101.xml | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/news/2008011101.xml b/news/2008011101.xml new file mode 100644 index 0000000..50b72d9 --- /dev/null +++ b/news/2008011101.xml @@ -0,0 +1,25 @@ +<news> +<date>January 11, 2008</date> +<title>Wine 0.9.53 Released</title> +<body> +<p>Wine 0.9.53 was released today, with the following main changes:</p> + +<ul> +<li>RunOnce and Run entries now executed on startup.</li> +<li>Beginnings of support for emulated disk devices.</li> +<li>Many Richedit improvements.</li> +<li>Nicer looking color dialog.</li> +<li>Lots of bug fixes.</li> +</ul> + +<p> +Binary packages are in the process of being built and it may take a +few days for them to appear, but the source is +<a href="http://prdownloads.sourceforge.net/wine/wine-0.9.53.tar.bz2">available now</a>. +You can find out more about this release in the +<a href="?announce=0.9.53">announcement</a>. Check out our +<a href="/site/download">download page</a> for packages for your +distribution. +</p> +</body> +</news>

1 0

Alexandre Julliard : Release 0.9.53.
by Alexandre Julliard 11 Jan '08

11 Jan '08

Module: wine Branch: master Commit: 0b50076355e5084a56bc19c78a6ada7b74d4afc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b50076355e5084a56bc19c78… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 11 17:25:55 2008 +0100 Release 0.9.53. --- ANNOUNCE | 816 +++++++++++++++++------------- ChangeLog | 1662 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ VERSION | 2 +- configure | 18 +- 4 files changed, 2139 insertions(+), 359 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0b50076355e5084a56bc1…

1 0

Tag wine-0.9.53 : Alexandre Julliard : Release 0.9.53
by Alexandre Julliard 11 Jan '08

11 Jan '08

Module: wine Branch: refs/tags/wine-0.9.53 Tag: ef747057edd33a8d0eeb13fb8fc3e8627c5912f5 URL: http://source.winehq.org/git/wine.git/?a=tag;h=ef747057edd33a8d0eeb13fb8fc3… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 11 17:25:55 2008 +0100 Release 0.9.53

1 0

Andrey Turkin : dbghelp: Implement ImageDirectoryEntryToDataEx.
by Alexandre Julliard 11 Jan '08

11 Jan '08

Module: wine Branch: master Commit: 9e2c76c6d454078932079f0d41b71486c590d3bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e2c76c6d454078932079f0d4… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Fri Jan 11 15:42:17 2008 +0300 dbghelp: Implement ImageDirectoryEntryToDataEx. --- dlls/dbghelp/dbghelp.spec | 4 +- dlls/dbghelp/pe_module.c | 50 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/dbghelp.spec b/dlls/dbghelp/dbghelp.spec index b023f3d..d29b880 100644 --- a/dlls/dbghelp/dbghelp.spec +++ b/dlls/dbghelp/dbghelp.spec @@ -15,8 +15,8 @@ @ stub FindFileInPath @ stub FindFileInSearchPath @ stdcall GetTimestampForLoadedLibrary(long) -@ stdcall ImageDirectoryEntryToData(ptr long long ptr) ntdll.RtlImageDirectoryEntryToData -@ stub ImageDirectoryEntryToDataEx +@ stdcall ImageDirectoryEntryToData(ptr long long ptr) +@ stdcall ImageDirectoryEntryToDataEx(ptr long long ptr ptr) @ stdcall ImageNtHeader(ptr) ntdll.RtlImageNtHeader @ stdcall ImageRvaToSection(ptr ptr long) ntdll.RtlImageRvaToSection @ stdcall ImageRvaToVa(ptr ptr long ptr) ntdll.RtlImageRvaToVa diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index 3027f5b..6676f29 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -417,3 +417,53 @@ struct module* pe_load_builtin_module(struct process* pcs, const WCHAR* name, } return module; } + +/*********************************************************************** + * ImageDirectoryEntryToDataEx (DBGHELP.@) + * + * Search for specified directory in PE image + * + * PARAMS + * + * base [in] Image base address + * image [in] TRUE - image has been loaded by loader, FALSE - raw file image + * dir [in] Target directory index + * size [out] Receives directory size + * section [out] Receives pointer to section header of section containing directory data + * + * RETURNS + * Success: pointer to directory data + * Failure: NULL + * + */ +PVOID WINAPI ImageDirectoryEntryToDataEx( PVOID base, BOOLEAN image, USHORT dir, PULONG size, PIMAGE_SECTION_HEADER *section ) +{ + const IMAGE_NT_HEADERS *nt; + DWORD addr; + + *size = 0; + + if (!(nt = RtlImageNtHeader( base ))) return NULL; + if (dir >= nt->OptionalHeader.NumberOfRvaAndSizes) return NULL; + if (!(addr = nt->OptionalHeader.DataDirectory[dir].VirtualAddress)) return NULL; + + *size = nt->OptionalHeader.DataDirectory[dir].Size; + if (image || addr < nt->OptionalHeader.SizeOfHeaders) + { + if (*section) *section = NULL; + return (char *)base + addr; + } + + return RtlImageRvaToVa( nt, (HMODULE)base, addr, section ); +} + +/*********************************************************************** + * ImageDirectoryEntryToData (DBGHELP.@) + * + * NOTES + * See ImageDirectoryEntryToDataEx + */ +PVOID WINAPI ImageDirectoryEntryToData( PVOID base, BOOLEAN image, USHORT dir, PULONG size ) +{ + return ImageDirectoryEntryToDataEx( base, image, dir, size, NULL ); +}

1 0

Alexandre Julliard : Spelling fixes in French man pages.
by Alexandre Julliard 11 Jan '08

11 Jan '08

Module: wine Branch: master Commit: c3b0addde6f791f449fd6e509c7f6d632191beec URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3b0addde6f791f449fd6e509… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 11 12:45:50 2008 +0100 Spelling fixes in French man pages. --- loader/wine.fr.man.in | 10 ++++------ server/wineserver.fr.man.in | 8 ++++---- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/loader/wine.fr.man.in b/loader/wine.fr.man.in index 25ab5a2..e497ae3 100644 --- a/loader/wine.fr.man.in +++ b/loader/wine.fr.man.in @@ -92,7 +92,7 @@ et, s'il n'existe pas, il cherchera alors un fichier nommé "wineserver" dans le chemin et dans quelques autres emplacements potentiels. .TP .I WINELOADER -Spécifie le chemin et le nom de l'éxécutable +Spécifie le chemin et le nom de l'exécutable .B wine à utiliser pour exécuter de nouveaux processus Windows. S'il n'est pas défini, Wine essaiera de charger @@ -157,10 +157,10 @@ Wine cherchera aussi dans le répertoire .B @dlldir(a). .TP .I WINEDLLOVERRIDES -Définit le type de surclassage et l'ordre de chargement des dlss utilisées lors du chargement +Définit le type de surclassage et l'ordre de chargement des dlls utilisées lors du chargement d'un processus pour chaque dll. La valeur par défaut est définie dans le fichier de configuration. Il y a actuellement deux types de librairies qui peuvent être chargées -dans l'espace d'adressage d'un processus : Le dlls natives de Windows ( +dans l'espace d'adressage d'un processus : Les dlls natives de Windows ( .I native ), et les dlls fournies par .B wine @@ -230,9 +230,7 @@ Le chargeur de programme de . .TP .I @bindir@/wineconsole -The -.B wine -chargeur de programme pour les applications en mode console (CUI). +Le chargeur de programme pour les applications en mode console (CUI). .TP .I @bindir@/wineserver Le serveur diff --git a/server/wineserver.fr.man.in b/server/wineserver.fr.man.in index d0a14f4..fe69d42 100644 --- a/server/wineserver.fr.man.in +++ b/server/wineserver.fr.man.in @@ -6,7 +6,7 @@ wineserver \- le serveur Wine .BI wineserver\ [options] .SH DESCRIPTION .B wineserver -est un démon qui fournit à Wine à peut près les mêmes services +est un démon qui fournit à Wine à peu près les mêmes services que le noyau de Windows fournit sous Windows. .PP .B wineserver @@ -17,7 +17,7 @@ comme expliqué ci-dessous. .SH OPTIONS .TP .BI \-d [n] -Défini le niveau de débogage à +Définit le niveau de débogage à .I n. 0 signifie aucune information de débogage, 1 est le niveau normal et 2 est pour un débogage plus important. Si @@ -99,13 +99,13 @@ est Alexandre Julliard. Beaucoup d'autres personnes ont contribué de nouvelles et des correction d'anomalies. Référez-vous au fichier Changelog dans la distribution de Wine pour les détails complets. .SH ANOMALIES -Si vous rencontrez une anomalie, veuillez soumettre à rapport d'anomalie sur +Si vous rencontrez une anomalie, veuillez soumettre un rapport d'anomalie sur .UR http://bugs.winehq.org .B http://bugs.winehq.org. .UE .SH DISPONIBILITÉ .B wineserver -fait partie de la distribution de Wine qui est dispobible depuis WineHQ, +fait partie de la distribution de Wine qui est disponible depuis WineHQ, le quartier général des développeurs de Wine, sur .UR http://www.winehq.org/ .B http://www.winehq.org/.

1 0

Austin English : loader: Add disabling dlls to wine man page.
by Alexandre Julliard 11 Jan '08

11 Jan '08

Module: wine Branch: master Commit: 5e10ef042cd3f4c8fbd2f622d5dac7b69e58ddaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e10ef042cd3f4c8fbd2f622d… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Jan 10 16:11:11 2008 -0600 loader: Add disabling dlls to wine man page. --- loader/wine.man.in | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/loader/wine.man.in b/loader/wine.man.in index 1a551f0..0f71f95 100644 --- a/loader/wine.man.in +++ b/loader/wine.man.in @@ -168,7 +168,7 @@ internal dlls ( .I builtin ). The type may be abbreviated with the first letter of the type ( .I n, b -). Each sequence of orders must be separated by commas. +). The library may also be disabled (''). Each sequence of orders must be separated by commas. .RS .PP Each dll may have its own specific load order. The load order @@ -197,11 +197,11 @@ WINEDLLOVERRIDES="comdlg32,shell32=n;c:\(rs\(rsfoo\(rs\(rsbar\(rs\(rsbaz=b" Try to load the libraries comdlg32 and shell32 as native windows dlls. Furthermore, if an application request to load c:\(rsfoo\(rsbar\(rsbaz.dll load the builtin library baz. .TP -WINEDLLOVERRIDES="comdlg32=b,n;shell32=b;comctl32=n" +WINEDLLOVERRIDES="comdlg32=b,n;shell32=b;comctl32=n;oleaut32=" .br Try to load comdlg32 as builtin first and try the native version if the builtin load fails; load shell32 always as builtin and comctl32 -always as native. +always as native. Oleaut32 will be disabled. .RE .TP .I DISPLAY

1 0

Jacek Caban : mshtml: Added more range tests.
by Alexandre Julliard 11 Jan '08

11 Jan '08

Module: wine Branch: master Commit: ed11dbab6c5fcba54f13599b54a7683983dd8d73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed11dbab6c5fcba54f13599b5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 10 23:51:38 2008 +0100 mshtml: Added more range tests. --- dlls/mshtml/tests/dom.c | 24 ++++++++++++++++++++++-- 1 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index cb7faa3..35d82c6 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -33,8 +33,10 @@ static const char doc_blank[] = "<html></html>"; static const char doc_str1[] = "<html><body>test</body></html>"; -static const char doc_str2[] = +static const char range_test_str[] = "<html><body>test \na<font size=\"2\">bc\t123<br /> it's\r\n \t</font>text<br /></body></html>"; +static const char range_test2_str[] = + "<html><body>abc<hr />123</body></html>"; static const char elem_test_str[] = "<html><head><title>test</title><style>.body { margin-right: 0px; }</style>" "<body><a href=\"http://test\" name=\"x\">link</a><input />" @@ -940,6 +942,23 @@ static void test_txtrange(IHTMLDocument2 *doc) IHTMLTxtRange_Release(range); } +static void test_txtrange2(IHTMLDocument2 *doc) +{ + IHTMLTxtRange *range; + + range = test_create_body_range(doc); + + test_range_text(range, "abc\r\n\r\n123"); + test_range_move(range, characterW, 5, 5); + test_range_moveend(range, characterW, 1, 1); + test_range_text(range, "2"); + test_range_move(range, characterW, -3, -3); + test_range_moveend(range, characterW, 3, 3); + test_range_text(range, "c\r\n\r\n1"); + + IHTMLTxtRange_Release(range); +} + static void test_compatmode(IHTMLDocument2 *doc) { IHTMLDocument5 *doc5; @@ -1441,7 +1460,8 @@ START_TEST(dom) CoInitialize(NULL); run_domtest(doc_str1, test_doc_elem); - run_domtest(doc_str2, test_txtrange); + run_domtest(range_test_str, test_txtrange); + run_domtest(range_test2_str, test_txtrange2); run_domtest(elem_test_str, test_elems); run_domtest(doc_blank, test_defaults); run_domtest(indent_test_str, test_indent);

1 0

Jacek Caban : mshtml: Use QueryService to get IHttpNegotiate in get_post_data_stream.
by Alexandre Julliard 11 Jan '08

11 Jan '08

Module: wine Branch: master Commit: c32cca8066807d09e3b953aee9242eba8cfa8cdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=c32cca8066807d09e3b953aee… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 11 11:26:08 2008 +0100 mshtml: Use QueryService to get IHttpNegotiate in get_post_data_stream. --- dlls/mshtml/persist.c | 35 +++++++++++++++++++++++++---------- 1 files changed, 25 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 38b4cef..a1d50b4 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -90,8 +90,9 @@ static int fix_headers(char *buf, DWORD post_len) static nsIInputStream *get_post_data_stream(IBindCtx *bctx) { nsIInputStream *ret = NULL; + IUnknown *unk; IBindStatusCallback *callback; - IHttpNegotiate *http_negotiate; + IServiceProvider *service_provider; BINDINFO bindinfo; DWORD bindf = 0; DWORD post_len = 0, headers_len = 0; @@ -108,19 +109,33 @@ static nsIInputStream *get_post_data_stream(IBindCtx *bctx) if(!bctx) return NULL; - hres = IBindCtx_GetObjectParam(bctx, _BSCB_Holder_, (IUnknown**)&callback); + hres = IBindCtx_GetObjectParam(bctx, _BSCB_Holder_, &unk); if(FAILED(hres)) return NULL; - hres = IBindStatusCallback_QueryInterface(callback, &IID_IHttpNegotiate, - (void**)&http_negotiate); + hres = IUnknown_QueryInterface(unk, &IID_IBindStatusCallback, (void**)&callback); + if(FAILED(hres)) { + IUnknown_Release(unk); + return NULL; + } + + hres = IUnknown_QueryInterface(unk, &IID_IServiceProvider, (void**)&service_provider); + IUnknown_Release(unk); if(SUCCEEDED(hres)) { - hres = IHttpNegotiate_BeginningTransaction(http_negotiate, emptystr, - emptystr, 0, &headers); - IHttpNegotiate_Release(http_negotiate); + IHttpNegotiate *http_negotiate; + + hres = IServiceProvider_QueryService(service_provider, &IID_IHttpNegotiate, &IID_IHttpNegotiate, + (void**)&http_negotiate); + if(SUCCEEDED(hres)) { + hres = IHttpNegotiate_BeginningTransaction(http_negotiate, emptystr, + emptystr, 0, &headers); + IHttpNegotiate_Release(http_negotiate); + + if(SUCCEEDED(hres) && headers) + headers_len = WideCharToMultiByte(CP_ACP, 0, headers, -1, NULL, 0, NULL, NULL); + } - if(SUCCEEDED(hres) && headers) - headers_len = WideCharToMultiByte(CP_ACP, 0, headers, -1, NULL, 0, NULL, NULL); + IServiceProvider_Release(service_provider); } memset(&bindinfo, 0, sizeof(bindinfo)); @@ -140,7 +155,6 @@ static nsIInputStream *get_post_data_stream(IBindCtx *bctx) if(headers_len) { WideCharToMultiByte(CP_ACP, 0, headers, -1, data, -1, NULL, NULL); - CoTaskMemFree(headers); len = fix_headers(data, post_len); } @@ -159,6 +173,7 @@ static nsIInputStream *get_post_data_stream(IBindCtx *bctx) ret = create_nsstream(data, len+post_len); } + CoTaskMemFree(headers); ReleaseBindInfo(&bindinfo); IBindStatusCallback_Release(callback);

1 0

Jacek Caban : mshtml: Disable some default Gecko warnings.
by Alexandre Julliard 11 Jan '08

11 Jan '08

Module: wine Branch: master Commit: c0881ac515809775593117c3558b0f1023a8c68f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0881ac515809775593117c35… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 11 12:06:35 2008 +0100 mshtml: Disable some default Gecko warnings. --- dlls/mshtml/nsembed.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 360e826..5563c6f 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -303,6 +303,15 @@ static void set_lang(nsIPrefBranch *pref) ERR("SetCharPref failed: %08x\n", nsres); } +static void set_bool_pref(nsIPrefBranch *pref, const char *pref_name, BOOL val) +{ + nsresult nsres; + + nsres = nsIPrefBranch_SetBoolPref(pref, pref_name, val); + if(NS_FAILED(nsres)) + ERR("Could not set pref %s\n", debugstr_a(pref_name)); +} + static void set_profile(void) { nsIPrefBranch *pref; @@ -340,6 +349,8 @@ static void set_profile(void) } set_lang(pref); + set_bool_pref(pref, "security.warn_entering_secure", FALSE); + set_bool_pref(pref, "security.warn_submit_insecure", FALSE); nsIPrefBranch_Release(pref); }

1 0

Jonathan Ernst : server: Updated French man page.
by Alexandre Julliard 11 Jan '08

11 Jan '08

Module: wine Branch: master Commit: 3b4011eec7e7b295c047145ef6bfdd7b579fbbba URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b4011eec7e7b295c047145ef… Author: Jonathan Ernst <jonathan(a)ernstfamily.ch> Date: Thu Jan 10 15:45:42 2008 +0100 server: Updated French man page. --- server/wineserver.fr.man.in | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/server/wineserver.fr.man.in b/server/wineserver.fr.man.in index 83770e0..d0a14f4 100644 --- a/server/wineserver.fr.man.in +++ b/server/wineserver.fr.man.in @@ -1,5 +1,5 @@ .\" -*- nroff -*- -.TH WINESERVER 1 "Décembre 2007" "@PACKAGE_STRING@" "Windows sur Unix" +.TH WINESERVER 1 "Janvier 2008" "@PACKAGE_STRING@" "Windows sur Unix" .SH NAME wineserver \- le serveur Wine .SH SYNOPSIS @@ -17,18 +17,18 @@ comme expliqué ci-dessous. .SH OPTIONS .TP .BI \-d [n] -Défini le niveau de déboguage à +Défini le niveau de débogage à .I n. -0 signifie aucune information de déboguage, 1 est le niveau normal et 2 est -pour un déboguage plus important. Si +0 signifie aucune information de débogage, 1 est le niveau normal et 2 est +pour un débogage plus important. Si .I n -n'est pas spécifié, la valeur par défaut est 1. La sortie de déboguage sera -stderr. \fBwine(1)\fR définit automatiquement le niveau de déboguage lorsqu'il +n'est pas spécifié, la valeur par défaut est 1. La sortie de débogage sera +stderr. \fBwine(1)\fR définit automatiquement le niveau de débogage lorsqu'il démarre \fBwineserver\fR si l'option +server est indiquée dans la variable WINEDEBUG. .TP .B \-f -Laisse le serveur au premier plan pour un déboguage plus aisé, par +Laisse le serveur au premier plan pour un débogage plus aisé, par exemple lorsqu'il est exécuté dans un débogueur. .TP .B \-h

1 0