August 2009 - Wine-Commits - list.winehq.org

Paul Vriens : transl: Use the same font everywhere.
by Alexandre Julliard Aug. 4, 2009

Aug. 4, 2009

Module: tools Branch: master Commit: 917aa1c2aa75c246f860d316b1994dc7472d158c URL: http://source.winehq.org/git/tools.git/?a=commit;h=917aa1c2aa75c246f860d316… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Jul 31 19:49:55 2009 +0200 transl: Use the same font everywhere. --- transl/php/style.css | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/transl/php/style.css b/transl/php/style.css index affea71..b963c06 100644 --- a/transl/php/style.css +++ b/transl/php/style.css @@ -49,10 +49,9 @@ div.group { } td { - font-family: monospace; - font-size: medium; - padding-left: 5px; - padding-right: 5px; + font-size: small; + padding-left: 5px; + padding-right: 5px; } th {

1 0

Paul Vriens : transl: Fix parsing of Dialog resources.
by Alexandre Julliard Aug. 4, 2009

Aug. 4, 2009

Module: tools Branch: master Commit: ca6dcfc2f28dff6880e6812f163bd499f9680aba URL: http://source.winehq.org/git/tools.git/?a=commit;h=ca6dcfc2f28dff6880e6812f… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Jul 31 16:30:02 2009 +0200 transl: Fix parsing of Dialog resources. --- transl/php/lib_res.php | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/transl/php/lib_res.php b/transl/php/lib_res.php index c19087f..a7af016 100644 --- a/transl/php/lib_res.php +++ b/transl/php/lib_res.php @@ -721,8 +721,8 @@ class DialogResource extends Resource $this->cy = get_word($data); $pos = 0; - $this->menuName = get_stringorid($data, $pos, 0xff00); - $this->className = get_stringorid($data, $pos, 0xff00); + $this->menuName = get_stringorid($data, $pos); + $this->className = get_stringorid($data, $pos); $this->title = get_stringorid($data, $pos, 0xff00); $data = substr($data, $pos);

1 0

Paul Vriens : winetest: Correctly mark XP-64bit as XP.
by Alexandre Julliard Aug. 4, 2009

Aug. 4, 2009

Module: tools Branch: master Commit: d42b630e5ae8e650c96b84fd32910c1c7d5de284 URL: http://source.winehq.org/git/tools.git/?a=commit;h=d42b630e5ae8e650c96b84fd… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Jul 31 09:27:13 2009 +0200 winetest: Correctly mark XP-64bit as XP. --- winetest/dissect | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index 297cebb..b18434a 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -168,7 +168,11 @@ if ($plid==1 && $major==4) { } elsif ($minor==1) { $version = "xp"; } elsif ($minor==2) { - $version = "2003"; + if ($product==1) { + $version = "xp"; + } else { + $version = "2003"; + } } } elsif ($major==6 && $minor== 0) { if ($product==1) {

1 0

André Hentschel : winetest: Some HTML markup fixes.
by Alexandre Julliard Aug. 4, 2009

Aug. 4, 2009

Module: tools Branch: master Commit: a73a1298fe182b499e32f7d253e448e4166d51d8 URL: http://source.winehq.org/git/tools.git/?a=commit;h=a73a1298fe182b499e32f7d2… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jul 26 14:05:53 2009 +0200 winetest: Some HTML markup fixes. --- winetest/dissect | 2 +- winetest/resultform.html | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index 7416434..297cebb 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -276,7 +276,7 @@ while (<IN>) { elsif ($text =~ /^Test succeeded inside todo block: /) { $class = "test failed"; } elsif ($text =~ /^Test marked todo: /) { $class = "test todo"; } elsif ($text =~ /^Tests skipped: /) { $class = "test skipped"; } - $testbox->{data} .= sprintf "<div class=\"%s\"><a href=%s/?a=blob;f=%s;hb=%s#l%u>%s.c:%u</a>: %s</div>\n", + $testbox->{data} .= sprintf "<div class=\"%s\"><a href=\"%s/?a=blob;f=%s;hb=%s#l%u\">%s.c:%u</a>: %s</div>\n", $class, $gitweb, $source, $testbuild, $line, $unit, $line, escapeHTML($text); } else diff --git a/winetest/resultform.html b/winetest/resultform.html index 1284d5c..9cfb67f 100644 --- a/winetest/resultform.html +++ b/winetest/resultform.html @@ -12,7 +12,7 @@ <body> <h5>Test under the mouse:</h5> -<form name="results"> +<form action="" name="results"> <table> <tr> <td>Test</td> @@ -38,6 +38,7 @@ <td>Skips</td> <td><input type="text" name="skipped" size="10" readonly></td> </tr> + </table> </form> </body> </html>

1 0

Maik Schulz : Website: German translation of update to contributing. template
by Maik Schulz Aug. 4, 2009

Aug. 4, 2009

Module: website Branch: master Commit: 54b80d36c1fc16b42f0221ee68cccee5661cff34 URL: http://source.winehq.org/git/website.git/?a=commit;h=54b80d36c1fc16b42f0221… Author: Maik Schulz <maik.schulz(a)gmail.com> Date: Tue Aug 4 09:35:15 2009 +0200 Website: German translation of update to contributing.template --- templates/de/contributing.template | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/templates/de/contributing.template b/templates/de/contributing.template index be57a75..914d17f 100644 --- a/templates/de/contributing.template +++ b/templates/de/contributing.template @@ -361,7 +361,7 @@ <ul> <li>Die README Datei inkl. weiterer Pflege der Übersetzung</li> <li>Die Wine Ressource Dateien und Meldungen, die Wine ausgibt (aber natürlich - nicht die Debug-Meldungen)</li> + nicht die Debug-Meldungen). Mittels der <a href="http://source.winehq.org/transl/">Wine-Übersetzungsstatistik</a> kannst Du für Deine Sprache überprüfen, wieviel es dort zu tun gibt.</li> </ul> <p>Wir brauchen außerdem ein "QuickStart/Howto" Dokument, das grundlegende Hilfe für die Installation und Konfiguration von Wine mit etwas mehr Details als die

1 0

Jeremy Newman : Merge branch 'master' of winehq.org:/home/winehq/opt/source /git/website
by Jeremy Newman Aug. 3, 2009

Aug. 3, 2009

Module: website Branch: master Commit: d6acb8a6deb275efe37a10dfadabb4accd45437a URL: http://source.winehq.org/git/website.git/?a=commit;h=d6acb8a6deb275efe37a10… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Aug 3 15:12:11 2009 -0500 Merge branch 'master' of winehq.org:/home/winehq/opt/source/git/website ---

1 0

Francois Gouget : contributing: Add a link the the Wine translation statistics page.
by Jeremy Newman Aug. 3, 2009

Aug. 3, 2009

Module: website Branch: master Commit: 9115d27cd0eed19b42ba05d4b239533bfa32ab41 URL: http://source.winehq.org/git/website.git/?a=commit;h=9115d27cd0eed19b42ba05… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jul 30 19:07:37 2009 +0200 contributing: Add a link the the Wine translation statistics page. --- templates/en/contributing.template | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/en/contributing.template b/templates/en/contributing.template index a652f33..910ef46 100644 --- a/templates/en/contributing.template +++ b/templates/en/contributing.template @@ -316,13 +316,13 @@ <p>Also, we need to have localized versions of the Wine Guides and man pages. For this to work, we'll need many people willing to translate - changes to the main English docu into foreign languages. If you're + changes to the main English documentation into foreign languages. If you're willing to register for work on a certain language, then please sign up with us!</p> <p>At this time we are looking for people who can translate.</p> <ul> <li>The README and maintain the translation.</li> - <li>the Wine resources and messages it issues (but not the debug message of course)</li> + <li>The Wine resources and messages it issues (but not the debug messages of course). You can check the <a href="http://source.winehq.org/transl/">Wine translation statistics</a> for your language to see how much there is to do.</li> </ul> <p>We also need a 'QuickStart/Howto' document that would describe the basic instructions for installing and configuring Wine in a bit more details than the README while being much

1 0

Austin English : start: Handle /B & /I options.
by Alexandre Julliard Aug. 3, 2009

Aug. 3, 2009

Module: wine Branch: master Commit: 6deaa09887b584ca58e68392d7178fafb8ddb079 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6deaa09887b584ca58e68392d… Author: Austin English <austinenglish(a)gmail.com> Date: Sun Aug 2 19:34:00 2009 -0500 start: Handle /B & /I options. --- programs/start/start.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/programs/start/start.c b/programs/start/start.c index e58d4c0..0c26cbc 100644 --- a/programs/start/start.c +++ b/programs/start/start.c @@ -214,6 +214,12 @@ int wmain (int argc, WCHAR *argv[]) /* Skip slash */ ci++; switch(argv[i][ci]) { + case 'b': + case 'B': + break; /* FIXME: should stop new window from being created */ + case 'i': + case 'I': + break; /* FIXME: should ignore any changes to current environment */ case 'l': case 'L': license();

1 0

Hans Leidekker : hnetcfg: Register interfaces.
by Alexandre Julliard Aug. 3, 2009

Aug. 3, 2009

Module: wine Branch: master Commit: c257ef317bb665eb65f4b7625b1e0d7dc969d52c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c257ef317bb665eb65f4b7625… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jul 30 11:16:08 2009 +0200 hnetcfg: Register interfaces. --- dlls/hnetcfg/Makefile.in | 5 +- dlls/hnetcfg/hnetcfg.c | 20 -- dlls/hnetcfg/regsvr.c | 430 ++++++++++++++++++++++++++++++++++++++++++++++ tools/wine.inf.in | 1 + 4 files changed, 434 insertions(+), 22 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c257ef317bb665eb65f4b…

1 0

Hans Leidekker : hnetcfg: Add class factory.
by Alexandre Julliard Aug. 3, 2009

Aug. 3, 2009

Module: wine Branch: master Commit: 5fd74fb4a02336c50146cca04c88b30debca7940 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fd74fb4a02336c50146cca04… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jul 30 11:15:38 2009 +0200 hnetcfg: Add class factory. --- dlls/hnetcfg/hnetcfg.c | 121 ++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 103 insertions(+), 18 deletions(-) diff --git a/dlls/hnetcfg/hnetcfg.c b/dlls/hnetcfg/hnetcfg.c index 3487bc3..59fa2d5 100644 --- a/dlls/hnetcfg/hnetcfg.c +++ b/dlls/hnetcfg/hnetcfg.c @@ -18,13 +18,98 @@ #include <stdarg.h> +#define COBJMACROS + #include "windef.h" #include "winbase.h" #include "objbase.h" +#include "netfw.h" + #include "wine/debug.h" +#include "hnetcfg_private.h" WINE_DEFAULT_DEBUG_CHANNEL(hnetcfg); +typedef HRESULT (*fnCreateInstance)( IUnknown *pUnkOuter, LPVOID *ppObj ); + +typedef struct +{ + const struct IClassFactoryVtbl *vtbl; + fnCreateInstance pfnCreateInstance; +} hnetcfg_cf; + +static inline hnetcfg_cf *impl_from_IClassFactory( IClassFactory *iface ) +{ + return (hnetcfg_cf *)((char *)iface - FIELD_OFFSET( hnetcfg_cf, vtbl )); +} + +static HRESULT WINAPI hnetcfg_cf_QueryInterface( IClassFactory *iface, REFIID riid, LPVOID *ppobj ) +{ + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IClassFactory)) + { + IClassFactory_AddRef( iface ); + *ppobj = iface; + return S_OK; + } + FIXME("interface %s not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI hnetcfg_cf_AddRef( IClassFactory *iface ) +{ + return 2; +} + +static ULONG WINAPI hnetcfg_cf_Release( IClassFactory *iface ) +{ + return 1; +} + +static HRESULT WINAPI hnetcfg_cf_CreateInstance( IClassFactory *iface, LPUNKNOWN pOuter, + REFIID riid, LPVOID *ppobj ) +{ + hnetcfg_cf *This = impl_from_IClassFactory( iface ); + HRESULT r; + IUnknown *punk; + + TRACE("%p %s %p\n", pOuter, debugstr_guid(riid), ppobj); + + *ppobj = NULL; + + if (pOuter) + return CLASS_E_NOAGGREGATION; + + r = This->pfnCreateInstance( pOuter, (LPVOID *)&punk ); + if (FAILED(r)) + return r; + + r = IUnknown_QueryInterface( punk, riid, ppobj ); + if (FAILED(r)) + return r; + + IUnknown_Release( punk ); + return r; +} + +static HRESULT WINAPI hnetcfg_cf_LockServer( IClassFactory *iface, BOOL dolock ) +{ + FIXME("(%p)->(%d)\n", iface, dolock); + return S_OK; +} + +static const struct IClassFactoryVtbl hnetcfg_cf_vtbl = +{ + hnetcfg_cf_QueryInterface, + hnetcfg_cf_AddRef, + hnetcfg_cf_Release, + hnetcfg_cf_CreateInstance, + hnetcfg_cf_LockServer +}; + +static hnetcfg_cf fw_manager_cf = { &hnetcfg_cf_vtbl, NetFwMgr_create }; +static hnetcfg_cf fw_app_cf = { &hnetcfg_cf_vtbl, NetFwAuthorizedApplication_create }; + BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpvReserved) { TRACE("(0x%p, %d, %p)\n",hInstDLL,fdwReason,lpvReserved); @@ -41,29 +126,29 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE; } -/****************************************************************** - * DllCanUnloadNow (HNETCFG.@) - * - * - */ -HRESULT WINAPI DllCanUnloadNow(void) +HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID iid, LPVOID *ppv ) { - FIXME(":stub\n"); - return S_OK; -} + IClassFactory *cf = NULL; + TRACE("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(iid), ppv); -/****************************************************************** - * DllGetClassObject (HNETCFG.@) - * - * - */ -HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) -{ + if (IsEqualGUID( rclsid, &CLSID_NetFwMgr )) + { + cf = (IClassFactory *)&fw_manager_cf.vtbl; + } + else if (IsEqualGUID( rclsid, &CLSID_NetFwAuthorizedApplication )) + { + cf = (IClassFactory *)&fw_app_cf.vtbl; + } - FIXME("(%s,%s,%p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + if (!cf) return CLASS_E_CLASSNOTAVAILABLE; + return IClassFactory_QueryInterface( cf, iid, ppv ); +} - return E_NOINTERFACE; +HRESULT WINAPI DllCanUnloadNow( void ) +{ + FIXME("\n"); + return S_FALSE; } /******************************************************************

1 0