June 2006 - Wine-Commits - list.winehq.org

Robert Shearman : ole32: Implement CoGetObject.
by Alexandre Julliard June 29, 2006

June 29, 2006

Module: wine Branch: refs/heads/master Commit: b0efdcbdbd9de273abf5bda9302c5bdfea044613 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b0efdcbdbd9de273abf5bda… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Jun 28 21:24:38 2006 +0100 ole32: Implement CoGetObject. --- dlls/ole32/compobj.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/ole32/ole32.spec | 2 +- 2 files changed, 53 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 1a8ab45..fc65ddb 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -2909,6 +2909,58 @@ HRESULT WINAPI CoWaitForMultipleHandles( return hr; } + +/*********************************************************************** + * CoGetObject [OLE32.@] + * + * Gets the object named by coverting the name to a moniker and binding to it. + * + * PARAMS + * pszName [I] String representing the object. + * pBindOptions [I] Parameters affecting the binding to the named object. + * riid [I] Interface to bind to on the objecct. + * ppv [O] On output, the interface riid of the object represented + * by pszName. + * + * RETURNS + * Success: S_OK. + * Failure: HRESULT code. + * + * SEE ALSO + * MkParseDisplayName. + */ +HRESULT WINAPI CoGetObject(LPCWSTR pszName, BIND_OPTS *pBindOptions, + REFIID riid, void **ppv) +{ + IBindCtx *pbc; + HRESULT hr; + + *ppv = NULL; + + hr = CreateBindCtx(0, &pbc); + if (SUCCEEDED(hr)) + { + if (pBindOptions) + hr = IBindCtx_SetBindOptions(pbc, pBindOptions); + + if (SUCCEEDED(hr)) + { + ULONG chEaten; + IMoniker *pmk; + + hr = MkParseDisplayName(pbc, pszName, &chEaten, &pmk); + if (SUCCEEDED(hr)) + { + hr = IMoniker_BindToObject(pmk, pbc, NULL, riid, ppv); + IMoniker_Release(pmk); + } + } + + IBindCtx_Release(pbc); + } + return hr; +} + /*********************************************************************** * DllMain (OLE32.@) */ diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 74f2bfc..56058bb 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -30,7 +30,7 @@ @ stdcall CoGetInterfaceAndReleaseStream(ptr ptr ptr) @ stdcall CoGetMalloc(long ptr) @ stdcall CoGetMarshalSizeMax(ptr ptr ptr long ptr long) -@ stub CoGetObject +@ stdcall CoGetObject(wstr ptr ptr ptr) @ stdcall CoGetPSClsid(ptr ptr) @ stdcall CoGetStandardMarshal(ptr ptr long ptr long ptr) @ stdcall CoGetState(ptr)

1 0

Robert Shearman : oleaut32: RegisterTypeLib should register any interface that derives
by Alexandre Julliard June 29, 2006

June 29, 2006

Module: wine Branch: refs/heads/master Commit: 166a91b12dae3d15566566765b0743edf18cafc2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=166a91b12dae3d155665667… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Jun 28 21:24:49 2006 +0100 oleaut32: RegisterTypeLib should register any interface that derives from IDispatch rather than just dual interfaces. This is hinted at, although not explicitly stated on MSDN, but was verified by tests with native oleaut32. --- dlls/oleaut32/typelib.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index d55120d..11302be 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -597,7 +597,7 @@ #undef XX MESSAGE("\n"); } - if (tattr->wTypeFlags & (TYPEFLAG_FOLEAUTOMATION|TYPEFLAG_FDUAL)) + if (tattr->wTypeFlags & (TYPEFLAG_FOLEAUTOMATION|TYPEFLAG_FDISPATCHABLE)) { /* register interface<->typelib coupling */ get_interface_key( &tattr->guid, keyName );

1 0

Stefan Dösinger : ddraw: Correct a NULL pointer check.
by Alexandre Julliard June 29, 2006

June 29, 2006

Module: wine Branch: refs/heads/master Commit: a509aabb97b89d7d64516a4837ad9ff7375a2f8f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a509aabb97b89d7d64516a4… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Wed Jun 28 19:45:49 2006 +0200 ddraw: Correct a NULL pointer check. --- dlls/ddraw/vertexbuffer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index 01db5d5..51dcc5e 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -214,7 +214,7 @@ IDirect3DVertexBufferImpl_Lock(IDirect3D HRESULT hr; TRACE("(%p)->(%08lx,%p,%p)\n", This, Flags, Data, Size); - if(*Size) + if(Size) { /* Get the size, for returning it, and for locking */ hr = IWineD3DVertexBuffer_GetDesc(This->wineD3DVertexBuffer,

1 0

Saulius Krasuckas : kernel: Version test was using imports missing on WinME .
by Alexandre Julliard June 29, 2006

June 29, 2006

Module: wine Branch: refs/heads/master Commit: fcc68659d4dff49f75ad599dec7bc943f8948994 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fcc68659d4dff49f75ad599… Author: Saulius Krasuckas <saulius.krasuckas(a)ieee.org> Date: Wed Jun 28 19:57:37 2006 +0300 kernel: Version test was using imports missing on WinME. --- dlls/kernel/tests/version.c | 115 ++++++++++++++++++++++++++----------------- 1 files changed, 70 insertions(+), 45 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=fcc68659d4dff49f75a…

1 0

Paul Vriens : quartz: Fixed typo (Coverity).
by Alexandre Julliard June 29, 2006

June 29, 2006

Module: wine Branch: refs/heads/master Commit: cc6bb93baaa1e9e26e5b5a965ddc8c1589c2b5f5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cc6bb93baaa1e9e26e5b5a9… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Wed Jun 28 19:49:48 2006 +0200 quartz: Fixed typo (Coverity). --- dlls/quartz/filtergraph.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index dbb4048..bbf22e6 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -3979,7 +3979,7 @@ static HRESULT WINAPI MediaEvent_SetNoti TRACE("(%p/%p)->(%ld)\n", This, iface, lNoNotifyFlags); - if ((lNoNotifyFlags != 0) || (lNoNotifyFlags != 1)) + if ((lNoNotifyFlags != 0) && (lNoNotifyFlags != 1)) return E_INVALIDARG; This->notif.disabled = lNoNotifyFlags;

1 0

Paul Vriens : quartz: Use the return value of register_key_guid.
by Alexandre Julliard June 29, 2006

June 29, 2006

Module: wine Branch: refs/heads/master Commit: e5f009e05c5ae5f833258b467309939cb0a0268c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e5f009e05c5ae5f833258b4… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Tue Jun 27 20:53:28 2006 +0200 quartz: Use the return value of register_key_guid. --- dlls/quartz/regsvr.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/regsvr.c b/dlls/quartz/regsvr.c index 74badcb..a6bd671 100644 --- a/dlls/quartz/regsvr.c +++ b/dlls/quartz/regsvr.c @@ -228,12 +228,12 @@ static HRESULT register_interfaces(struc } if (list->ps_clsid) { - register_key_guid(iid_key, ps_clsid_keyname, list->ps_clsid); + res = register_key_guid(iid_key, ps_clsid_keyname, list->ps_clsid); if (res != ERROR_SUCCESS) goto error_close_iid_key; } if (list->ps_clsid32) { - register_key_guid(iid_key, ps_clsid32_keyname, list->ps_clsid32); + res = register_key_guid(iid_key, ps_clsid32_keyname, list->ps_clsid32); if (res != ERROR_SUCCESS) goto error_close_iid_key; }

1 0

lostwages/templates/en home_about.template
by Jeremy Newman June 28, 2006

June 28, 2006

ChangeSet ID: 26110 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/06/28 15:48:50 Modified files: templates/en : home_about.template Log message: Steven Edwards <winehacker(a)gmail.com> Add entry for Mac OS X to the about blurb on main page Patch: http://cvs.winehq.org/patch.py?id=26110 Old revision New revision Changes Path 1.20 1.21 +2 -1 lostwages/templates/en/home_about.template Index: lostwages/templates/en/home_about.template diff -u -p lostwages/templates/en/home_about.template:1.20 lostwages/templates/en/home_about.template:1.21 --- lostwages/templates/en/home_about.template:1.20 28 Jun 2006 20:48:50 -0000 +++ lostwages/templates/en/home_about.template 28 Jun 2006 20:48:50 -0000 @@ -12,7 +12,8 @@ provides both a development toolkit for as well as a program loader, allowing many unmodified Windows programs to run on x86-based Unixes, including <a href="http://www.linux.org/">Linux</a>, -<a href="http://www.freebsd.org/">FreeBSD</a>, and +<a href="http://www.freebsd.org/">FreeBSD</a>, +<a href="http://www.apple.com/macosx/">Mac OS X</a>, and <a href="http://wwws.sun.com/software/solaris/">Solaris</a>.</p> <p>More information can be read in the articles <a href="{$root}/site/why">Why Wine

1 0

tools/. winegecko.php
by Jeremy Newman June 28, 2006

June 28, 2006

ChangeSet ID: 26109 CVSROOT: /opt/cvs-commit Module name: tools Changes by: jnewman(a)winehq.org 2006/06/28 15:43:37 Added files: . : winegecko.php Log message: Jonathan Ernst <jonathan(a)ernstfamily.ch> Gecko installer redirection script Patch: http://cvs.winehq.org/patch.py?id=26109 Old revision New revision Changes Path Added 1.1 +0 -0 tools/winegecko.php Index: tools/winegecko.php diff -u -p /dev/null tools/winegecko.php:1.1 --- /dev/null 28 Jun 2006 20:43:37 -0000 +++ tools/winegecko.php 28 Jun 2006 20:43:37 -0000 @@ -0,0 +1,90 @@ +<?php +/** + * Redirects to one of many URLs that have the Wine Gecko installer available. + * + * Usage: + * winegecko.php + * (main usage, redirects to one of many URLs that have the Wine Gecko installer available) + * + * winegecko.php?action=showlist + * (display a list of server and tells if the file is available for each server) + * + * Copyright (c) 2006 Jonathan Ernst + */ + + +// Name of the file +$sFileName = "wine_gecko.cab"; + +// Exact size of the file: +$iFileSize = 5219822; + +// List of locations +$aList = array("http://switch.dl.sourceforge.net/sourceforge/wine/", + "http://surfnet.dl.sourceforge.net/sourceforge/wine/", + "http://citkit.dl.sourceforge.net/sourceforge/wine/", + "http://keihanna.dl.sourceforge.net/sourceforge/wine/", + "http://heanet.dl.sourceforge.net/sourceforge/wine/", + "http://easynews.dl.sourceforge.net/sourceforge/wine/", + "http://ovh.dl.sourceforge.net/sourceforge/wine/", + "http://jaist.dl.sourceforge.net/sourceforge/wine/", + "http://puzzle.dl.sourceforge.net/sourceforge/wine/", + "http://nchc.dl.sourceforge.net/sourceforge/wine/", + "http://switch.dl.sourceforge.net/sourceforge/wine/", + "http://kent.dl.sourceforge.net/sourceforge/wine/", + "http://optusnet.dl.sourceforge.net/sourceforge/wine/", + "http://mesh.dl.sourceforge.net/sourceforge/wine/", + "http://internap.dl.sourceforge.net/sourceforge/wine/", + "http://superb-east.dl.sourceforge.net/sourceforge/wine/", + "http://optusnet.dl.sourceforge.net/sourceforge/wine/", + "http://superb-west.dl.sourceforge.net/sourceforge/wine/", + "http://nchc.dl.sourceforge.net/sourceforge/wine/", + "http://umn.dl.sourceforge.net/sourceforge/wine/", + "http://belnet.dl.sourceforge.net/sourceforge/wine/", + "http://ufpr.dl.sourceforge.net/sourceforge/wine/" + ); + + +function is_downloadable($sUrl){ + global $iFileSize; + $parse = parse_url($sUrl); + // open a socket connection + if($fp = @fsockopen($parse['host'], 80, $errno, $errstr, 10)){ + // set request + $get = "HEAD ".$parse['path']." HTTP/1.1\r\n". + "Host: ".$parse['host']."\r\n". + "Connection: close\r\n\r\n"; + fputs($fp, $get); + while(!feof($fp)){ + // get ONLY header informations + $header .= fgets($fp, 128); + } + fclose($fp); + // match file size + preg_match('/Content-Length:\s([0-9].+?)\s/', $header, $matches); + $iSize = intval($matches[1]); + if($iSize == $iFileSize) return TRUE; + } + return FALSE; +} + + +if($_REQUEST['action']=="showlist") { + echo "<h2>List of mirrors available for file ".$sFileName." (".$iFileSize." bytes)</h2>"; + foreach($aList as $sLocation) { + echo $sLocation.": "; + if(is_downloadable($sLocation.$sFileName)) { + echo "<font color=\"green\">online</font>"; + } else { + echo "<font color=\"red\">offline</font>"; + } + echo "\n<br />"; + } +} else { + while(!is_downloadable($sUrl)) { + $iRand = rand(0, (sizeof($aList)-1)); + $sUrl = $aList[$iRand].$sFileName; + } + header("Location: ".$sUrl); +} +?>

1 0

appdb/include filter.php
by WineHQ June 28, 2006

June 28, 2006

ChangeSet ID: 26108 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/06/28 12:30:44 Added files: include : filter.php Log message: Jonathan Ernst <jonathan(a)ernstfamily.ch> Automatic filtering of $_REQUEST variables Patch: http://cvs.winehq.org/patch.py?id=26108 Old revision New revision Changes Path Added 1.1 +0 -0 appdb/include/filter.php Index: appdb/include/filter.php diff -u -p /dev/null appdb/include/filter.php:1.1 --- /dev/null 28 Jun 2006 17:30:44 -0000 +++ appdb/include/filter.php 28 Jun 2006 17:30:44 -0000 @@ -0,0 +1,54 @@ +<?php +$aClean = array(); +filter_gpc(); + +/* + * Make all get/post/cookies variable clean based on their names. + */ +function filter_gpc() +{ + global $aClean; + $aKeys = array_keys($_REQUEST); + for($i=0;$i<sizeof($aKeys);$i++) + { + switch($aKeys[$i][0]) + { + case "i": // integer + case "f": // float + if(is_numeric($_REQUEST[$aKeys[$i]])) + $aClean[$aKeys[$i]] = $_REQUEST[$aKeys[$i]]; + else + util_show_error_page("Fatal error: ".$aKeys[$i]." should be a numeric value."); + break; + case "b": // boolean + if($_REQUEST[$aKeys[$i]]=="true" || $_REQUEST[$aKeys[$i]]=="false") + $aClean[$aKeys[$i]] = $_REQUEST[$aKeys[$i]]; + else + util_show_error_page("Fatal error: ".$aKeys[$i]." should be a boolean value."); + break; + case "s": // string + switch($aKeys[$i][1]) + { + case "h": // HTML string + $aClean[$aKeys[$i]] = htmlspecialchars($_REQUEST[$aKeys[$i]]); + break; + default: // normal string (no HTML) + $aClean[$aKeys[$i]] = strip_tags($_REQUEST[$aKeys[$i]]); + break; + } + break; + default: + if($aKeys[$i]!="whq_appdb") // that's the name of the session cookie + util_show_error_page("Fatal error: type of variable ".$aKeys[$i]." is not recognized."); + break; + } + } + + /* null out all input data so we can be assured that */ + /* no unfiltered values are being used */ + $_REQUEST = array(); + $_POST = array(); + $_GET = array(); + $_COOKIES = array(); +} +?>

1 0

appdb/. CODING_STANDARD
by WineHQ June 28, 2006

June 28, 2006

ChangeSet ID: 26107 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/06/28 12:21:58 Modified files: . : CODING_STANDARD Log message: Jonathan Ernst <jonathan(a)ernstfamily.ch> Update coding standards to specify function prefix that should match the module name and 'sh' a new variable prefix that means 'string html' Patch: http://cvs.winehq.org/patch.py?id=26107 Old revision New revision Changes Path 1.7 1.8 +2 -1 appdb/CODING_STANDARD Index: appdb/CODING_STANDARD diff -u -p appdb/CODING_STANDARD:1.7 appdb/CODING_STANDARD:1.8 --- appdb/CODING_STANDARD:1.7 28 Jun 2006 17:21:58 -0000 +++ appdb/CODING_STANDARD 28 Jun 2006 17:21:58 -0000 @@ -22,6 +22,7 @@ Scalar types: i for integers f for floats s for strings +sh for html strings b for booleans Compound types: a for arrays @@ -41,7 +42,7 @@ $hResult /** * Functions naming */ -1)functions name should be declarative (i.e. put a declarative verb as the first word like in do_someting()) +1)functions name should be declarative and be prefixed with the name of the module (=file) where it is stored (for example image_show_thumbnail()) 2)methods (functions inside a class) are named like this: setMyName() (i.e. words separated with an upper case character) 3)normal functions (outside a class) are named like this: query_appdb() (i.e. words separated with an underscore)

1 0