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

Alex Băluț : maintainer: Fix getMaintainerCountForUser()
by Alexander Nicolaysen Sørnes June 21, 2010

June 21, 2010

Module: appdb Branch: master Commit: 4fce59fde74eb10090d7b97619c3d7b9ce54429a URL: http://source.winehq.org/git/appdb.git/?a=commit;h=4fce59fde74eb10090d7b976… Author: Alex Băluț <alexandru.balut(a)gmail.com> Date: Mon Jun 21 22:59:01 2010 +0200 maintainer: Fix getMaintainerCountForUser() --- include/maintainer.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/maintainer.php b/include/maintainer.php index 34cef97..00ff90d 100644 --- a/include/maintainer.php +++ b/include/maintainer.php @@ -543,7 +543,7 @@ class maintainer // returns the number of applications/versions a particular user maintains function getMaintainerCountForUser($oUser, $bSuperMaintainer) { - return getMaintainerCountForUserId($oUser->iUserId, $bSuperMaintainer); + return self::getMaintainerCountForUserId($oUser->iUserId, $bSuperMaintainer); } /**

1 0

Alex Băluț : Updated test_appData, because using downloadurl objects does not work anymore, because appData. listSubmittedBy() ignores queued downloadurls
by Alexander Nicolaysen Sørnes June 21, 2010

June 21, 2010

Module: appdb Branch: master Commit: dcc72bf43f35d6a575ec2c884392dd5ac00fe86e URL: http://source.winehq.org/git/appdb.git/?a=commit;h=dcc72bf43f35d6a575ec2c88… Author: Alex Băluț <alexandru.balut(a)gmail.com> Date: Mon Jun 21 23:12:27 2010 +0200 Updated test_appData, because using downloadurl objects does not work anymore, because appData.listSubmittedBy() ignores queued downloadurls --- unit_test/test_appData.php | 65 ++++++++++++++++++++++++------------------- 1 files changed, 36 insertions(+), 29 deletions(-) diff --git a/unit_test/test_appData.php b/unit_test/test_appData.php index 335a642..ba62234 100644 --- a/unit_test/test_appData.php +++ b/unit_test/test_appData.php @@ -3,7 +3,7 @@ require_once("path.php"); require_once("test_common.php"); require_once(BASE."include/appData.php"); -require_once(BASE."include/downloadurl.php"); +require_once(BASE."include/url.php"); function test_appData_listSubmittedBy() { @@ -19,38 +19,45 @@ function test_appData_listSubmittedBy() return FALSE; } - /* Create a queued appData entry */ - $oDownloadUrl = new downloadurl; - - $oDownloadUrl->sUrl = "http://www.microsoft.com/windowsmedia"; - $oDownloadUrl->sDescription = "Download Meida Player"; - $oDownloadUrl->iVersionId = 1; - - $oDownloadUrl->create(); - - $shReturn = appData::listSubmittedBy($oUser->iUserId, true); - - /* This is needed for deleting the entry */ - $oUser->addPriv("admin"); - - /* There should be two lines; one header and one for the downloadurl */ - $iExpected = 2; - $iReceived = substr_count($shReturn, "</tr>"); - if($iExpected != $iReceived) + /* Create a queued Url, which will be stored in the appData table */ + $oUrl = new Url; + $bResult = $oUrl->create("test description", "http://testurl", 1, null, true); + if(!$bResult) { - error("Got $iReceived rows instead of $iExpected."); $bSuccess = false; - } - - /* Clean up */ - if(!$oDownloadUrl->purge()) + error("Failed to create Url"); + } else { - $bSuccess = false; - error("Failed to delete oDownloadUrl!"); + $shReturn = appData::listSubmittedBy($oUser->iUserId, true); + if(!$shReturn) + { + $bSuccess = false; + error("Got empty list."); + } else + { + /* There should be two lines; one header and one for the linked data */ + $iExpected = 2; + $iReceived = substr_count($shReturn, "</tr>"); + if($iExpected != $iReceived) + { + error("Got $iReceived rows instead of $iExpected."); + $bSuccess = false; + } + } + + /* Clean up */ + /* This is needed for deleting the entry */ + $oUser->addPriv("admin"); + + if(!$oUrl->purge()) + { + $bSuccess = false; + error("Failed to delete oUrl!"); + } + + $oUser->delete(); } - - $oUser->delete(); - + return $bSuccess; }

1 0

Alex Băluț : Fixed a bug in Url.create(): after creating a table row, the object is not updated properly
by Alexander Nicolaysen Sørnes June 21, 2010

June 21, 2010

Module: appdb Branch: master Commit: 55a4b0c38df3d708db1f1ba9b8bf72b1b7ca4b14 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=55a4b0c38df3d708db1f1ba9… Author: Alex Băluț <alexandru.balut(a)gmail.com> Date: Mon Jun 21 22:59:01 2010 +0200 Fixed a bug in Url.create(): after creating a table row, the object is not updated properly --- include/url.php | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/include/url.php b/include/url.php index 0419168..15d33ef 100644 --- a/include/url.php +++ b/include/url.php @@ -5,7 +5,10 @@ require_once(BASE."include/util.php"); /** - * Url class for handling urls + * Class for handling URLs (aka Links) of applications and + * of application versions. + * + * Uses the appData table to store the URLs in rows with type='url'. */ class Url { var $iUrlId; @@ -33,6 +36,8 @@ class Url { WHERE type = 'url' AND id = '?'"; $hResult = query_parameters($sQuery, $iUrlId); + if(!$hResult) + return; $oRow = query_fetch_object($hResult); } @@ -53,12 +58,14 @@ class Url { /** * Creates a new url. + * Writes the url into the appData table, then updates the object. + * + * @param bSilent Whether to send a notification email. + * @return true if everything went fine. */ function create($sDescription = null, $sUrl = null, $iVersionId = null, $iAppId = null, $bSilent = false) { - global $aClean; - // Security, if we are not an administrator or a maintainer, the url must be queued. if(($iAppId && !url::canEdit(NULL, $iAppId)) || ($iVersionId && !url::canEdit($iVersionId))) @@ -78,7 +85,7 @@ class Url { } $this->iUrlId = query_appdb_insert_id(); - $this->url($this->iUrlId,$this->bQueued); + $this->Url($this->iUrlId); if(!$bSilent) $this->SendNotificationMail();

1 0

André Hentschel : German translation of release news 1 .2-rc4
by Jeremy Newman June 21, 2010

June 21, 2010

Module: website Branch: master Commit: d4767c2fcd40ed075f665da32bfbe7856dfe0a72 URL: http://source.winehq.org/git/website.git/?a=commit;h=d4767c2fcd40ed075f665d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jun 21 17:56:13 2010 +0200 German translation of release news 1.2-rc4 --- news/de/2010061801.xml | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/news/de/2010061801.xml b/news/de/2010061801.xml new file mode 100644 index 0000000..d3a2b34 --- /dev/null +++ b/news/de/2010061801.xml @@ -0,0 +1,13 @@ +<news> +<date>18. Juni 2010</date> +<title>Wine 1.2-rc4 Freigegeben</title> +<body> + Die Entwicklungsversion 1.2-rc4 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.2-rc4">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Viele Übersetzungen.</li> + <li>Ein Haufen Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.2-rc4.tar.bz2">verfügbar</a>. +Binär-Downloads werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Download-Seiten</a> zur Verfügung. +</body></news>

1 0

Alexandre Julliard : advapi32: Make rpcrt4 a delayed import to work around circular dependencies with native .
by Alexandre Julliard June 21, 2010

June 21, 2010

Module: wine Branch: master Commit: 58a698882d7f048e642bfccba65edcac98bd3a40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58a698882d7f048e642bfccba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 21 16:56:12 2010 +0200 advapi32: Make rpcrt4 a delayed import to work around circular dependencies with native. --- dlls/advapi32/Makefile.in | 3 +- dlls/advapi32/crypt.c | 56 ++++++++++++++++++-------------------------- 2 files changed, 25 insertions(+), 34 deletions(-) diff --git a/dlls/advapi32/Makefile.in b/dlls/advapi32/Makefile.in index a3d0efc..d880360 100644 --- a/dlls/advapi32/Makefile.in +++ b/dlls/advapi32/Makefile.in @@ -5,7 +5,8 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = advapi32.dll IMPORTLIB = advapi32 -IMPORTS = rpcrt4 kernel32 ntdll +IMPORTS = kernel32 ntdll +DELAYIMPORTS = rpcrt4 EXTRALIBS = @SECURITYLIB@ C_SRCS = \ diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index bb019d0..4235e83 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -284,40 +284,30 @@ static void CRYPT_CreateMachineGuid(void) r = RegQueryValueExW(key, machineGuidW, NULL, NULL, NULL, &size); if (r == ERROR_FILE_NOT_FOUND) { - static const WCHAR rpcrt4[] = { - 'r','p','c','r','t','4',0 }; - HMODULE lib = LoadLibraryW(rpcrt4); - - if (lib) - { - RPC_STATUS (RPC_ENTRY *pUuidCreate)(UUID *); - UUID uuid; - WCHAR buf[37]; - RPC_STATUS rs; - static const WCHAR uuidFmt[] = { - '%','0','8','x','-','%','0','4','x','-', - '%','0','4','x','-','%','0','2','x', - '%','0','2','x','-','%','0','2','x', - '%','0','2','x','%','0','2','x', - '%','0','2','x','%','0','2','x', - '%','0','2','x',0 }; - - pUuidCreate = (void *)GetProcAddress(lib, "UuidCreate"); - rs = pUuidCreate(&uuid); - if (rs == S_OK) - { - sprintfW(buf, uuidFmt, - uuid.Data1, uuid.Data2, uuid.Data3, - uuid.Data4[0], uuid.Data4[1], - uuid.Data4[2], uuid.Data4[3], - uuid.Data4[4], uuid.Data4[5], - uuid.Data4[6], uuid.Data4[7] ); - RegSetValueExW(key, machineGuidW, 0, REG_SZ, - (const BYTE *)buf, - (lstrlenW(buf)+1)*sizeof(WCHAR)); - } - FreeLibrary(lib); - } + UUID uuid; + WCHAR buf[37]; + RPC_STATUS rs; + static const WCHAR uuidFmt[] = { + '%','0','8','x','-','%','0','4','x','-', + '%','0','4','x','-','%','0','2','x', + '%','0','2','x','-','%','0','2','x', + '%','0','2','x','%','0','2','x', + '%','0','2','x','%','0','2','x', + '%','0','2','x',0 }; + + rs = UuidCreate(&uuid); + if (rs == S_OK) + { + sprintfW(buf, uuidFmt, + uuid.Data1, uuid.Data2, uuid.Data3, + uuid.Data4[0], uuid.Data4[1], + uuid.Data4[2], uuid.Data4[3], + uuid.Data4[4], uuid.Data4[5], + uuid.Data4[6], uuid.Data4[7] ); + RegSetValueExW(key, machineGuidW, 0, REG_SZ, + (const BYTE *)buf, + (lstrlenW(buf)+1)*sizeof(WCHAR)); + } } RegCloseKey(key); }

1 0

Andrey Turkin : ntdll: Fix race in NtRead/WriteFile.
by Alexandre Julliard June 21, 2010

June 21, 2010

Module: wine Branch: master Commit: 5b3750e2a4496c6088af82518721ec470cd68d19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b3750e2a4496c6088af82518… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Mon Jun 21 18:16:04 2010 +0400 ntdll: Fix race in NtRead/WriteFile. --- dlls/ntdll/file.c | 24 ++++++++++++++++++++---- 1 files changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 30b93aa..0a6ee55 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -582,6 +582,7 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent, ULONG total = 0; enum server_fd_type type; ULONG_PTR cvalue = apc ? 0 : (ULONG_PTR)apc_user; + BOOL send_completion = FALSE; TRACE("(%p,%p,%p,%p,%p,%p,0x%08x,%p,%p),partial stub!\n", hFile,hEvent,apc,apc_user,io_status,buffer,length,offset,key); @@ -730,7 +731,7 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent, } done: - if (cvalue) NTDLL_AddCompletion( hFile, cvalue, status, total ); + send_completion = cvalue != 0; err: if (needs_close) close( unix_handle ); @@ -748,6 +749,9 @@ err: TRACE("= 0x%08x\n", status); if (status != STATUS_PENDING && hEvent) NtResetEvent( hEvent, NULL ); } + + if (send_completion) NTDLL_AddCompletion( hFile, cvalue, status, total ); + return status; } @@ -767,6 +771,7 @@ NTSTATUS WINAPI NtReadFileScatter( HANDLE file, HANDLE event, PIO_APC_ROUTINE ap ULONG pos = 0, total = 0; enum server_fd_type type; ULONG_PTR cvalue = apc ? 0 : (ULONG_PTR)apc_user; + BOOL send_completion = FALSE; TRACE( "(%p,%p,%p,%p,%p,%p,0x%08x,%p,%p),partial stub!\n", file, event, apc, apc_user, io_status, segments, length, offset, key); @@ -814,7 +819,7 @@ NTSTATUS WINAPI NtReadFileScatter( HANDLE file, HANDLE event, PIO_APC_ROUTINE ap } } - if (cvalue) NTDLL_AddCompletion( file, cvalue, status, total ); + send_completion = cvalue != 0; error: if (needs_close) close( unix_handle ); @@ -832,6 +837,9 @@ NTSTATUS WINAPI NtReadFileScatter( HANDLE file, HANDLE event, PIO_APC_ROUTINE ap TRACE("= 0x%08x\n", status); if (status != STATUS_PENDING && event) NtResetEvent( event, NULL ); } + + if (send_completion) NTDLL_AddCompletion( file, cvalue, status, total ); + return status; } @@ -921,6 +929,7 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, ULONG total = 0; enum server_fd_type type; ULONG_PTR cvalue = apc ? 0 : (ULONG_PTR)apc_user; + BOOL send_completion = FALSE; TRACE("(%p,%p,%p,%p,%p,%p,0x%08x,%p,%p)!\n", hFile,hEvent,apc,apc_user,io_status,buffer,length,offset,key); @@ -1054,7 +1063,7 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, } done: - if (cvalue) NTDLL_AddCompletion( hFile, cvalue, status, total ); + send_completion = cvalue != 0; err: if (needs_close) close( unix_handle ); @@ -1072,6 +1081,9 @@ err: TRACE("= 0x%08x\n", status); if (status != STATUS_PENDING && hEvent) NtResetEvent( hEvent, NULL ); } + + if (send_completion) NTDLL_AddCompletion( hFile, cvalue, status, total ); + return status; } @@ -1091,6 +1103,7 @@ NTSTATUS WINAPI NtWriteFileGather( HANDLE file, HANDLE event, PIO_APC_ROUTINE ap ULONG pos = 0, total = 0; enum server_fd_type type; ULONG_PTR cvalue = apc ? 0 : (ULONG_PTR)apc_user; + BOOL send_completion = FALSE; TRACE( "(%p,%p,%p,%p,%p,%p,0x%08x,%p,%p),partial stub!\n", file, event, apc, apc_user, io_status, segments, length, offset, key); @@ -1143,7 +1156,7 @@ NTSTATUS WINAPI NtWriteFileGather( HANDLE file, HANDLE event, PIO_APC_ROUTINE ap } } - if (cvalue) NTDLL_AddCompletion( file, cvalue, status, total ); + send_completion = cvalue != 0; error: if (needs_close) close( unix_handle ); @@ -1161,6 +1174,9 @@ NTSTATUS WINAPI NtWriteFileGather( HANDLE file, HANDLE event, PIO_APC_ROUTINE ap TRACE("= 0x%08x\n", status); if (status != STATUS_PENDING && event) NtResetEvent( event, NULL ); } + + if (send_completion) NTDLL_AddCompletion( file, cvalue, status, total ); + return status; }

1 0

Nikolay Sivov : msxml3: Don't crash on null pointer when doing ::Next() on a last child.
by Alexandre Julliard June 21, 2010

June 21, 2010

Module: wine Branch: master Commit: 473c5c4cc02b376ae561368cd5623372fe4223b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=473c5c4cc02b376ae561368cd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 21 02:46:23 2010 +0400 msxml3: Don't crash on null pointer when doing ::Next() on a last child. --- dlls/msxml3/tests/xmlelem.c | 10 ++++++++++ dlls/msxml3/xmlelem.c | 17 ++++++++++++----- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/dlls/msxml3/tests/xmlelem.c b/dlls/msxml3/tests/xmlelem.c index 3304d5a..f38d515 100644 --- a/dlls/msxml3/tests/xmlelem.c +++ b/dlls/msxml3/tests/xmlelem.c @@ -357,6 +357,16 @@ static void test_xmlelem_collection(void) ok(V_VT(&var) == VT_DISPATCH, "Expected VT_DISPATCH, got %d\n", V_VT(&var)); ok(num_vars == 1, "Expected 1, got %d\n", num_vars); + /* try advance further, no children left */ + hr = IEnumVARIANT_Next(enumVar, 1, &var, &num_vars); + ok(hr == S_FALSE, "Expected S_FALSE, got %08x\n", hr); + ok(V_VT(&var) == 0, "Expected 0, got %d\n", V_VT(&var)); + ok(num_vars == 0, "Expected 0, got %d\n", num_vars); + + hr = IEnumVARIANT_Next(enumVar, 1, &var, NULL); + ok(hr == S_FALSE, "Expected S_FALSE, got %08x\n", hr); + ok(V_VT(&var) == 0, "Expected 0, got %d\n", V_VT(&var)); + hr = IUnknown_QueryInterface(V_DISPATCH(&var), &IID_IXMLElement, (LPVOID *)&child); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); ok(child != NULL, "Expected non-NULL child\n"); diff --git a/dlls/msxml3/xmlelem.c b/dlls/msxml3/xmlelem.c index 7a4faa3..c067179 100644 --- a/dlls/msxml3/xmlelem.c +++ b/dlls/msxml3/xmlelem.c @@ -723,21 +723,28 @@ static ULONG WINAPI xmlelem_collection_IEnumVARIANT_Release( } static HRESULT WINAPI xmlelem_collection_IEnumVARIANT_Next( - IEnumVARIANT *iface, ULONG celt, VARIANT *rgVar, ULONG *pCeltFetched) + IEnumVARIANT *iface, ULONG celt, VARIANT *rgVar, ULONG *fetched) { xmlelem_collection *This = impl_from_IEnumVARIANT(iface); xmlNodePtr ptr = This->current; - TRACE("(%p, %d, %p, %p)\n", iface, celt, rgVar, pCeltFetched); + TRACE("(%p, %d, %p, %p)\n", iface, celt, rgVar, fetched); if (!rgVar) return E_INVALIDARG; /* FIXME: handle celt */ - if (pCeltFetched) - *pCeltFetched = 1; + if (fetched) + *fetched = 1; - This->current = This->current->next; + if (This->current) + This->current = This->current->next; + else + { + V_VT(rgVar) = VT_EMPTY; + if (fetched) *fetched = 0; + return S_FALSE; + } V_VT(rgVar) = VT_DISPATCH; return XMLElement_create((IUnknown *)iface, ptr, (LPVOID *)&V_DISPATCH(rgVar), FALSE);

1 0

Nikolay Sivov : msxml3: Extend traces for inc/dec refs on libxml2 documents .
by Alexandre Julliard June 21, 2010

June 21, 2010

Module: wine Branch: master Commit: 94e88e6712aa40cb30a6be920e9d20885aa7e7c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94e88e6712aa40cb30a6be920… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 21 13:36:13 2010 +0400 msxml3: Extend traces for inc/dec refs on libxml2 documents. --- dlls/msxml3/domdoc.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 4808e4e..688ce99 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -158,7 +158,7 @@ static xmlDocPtr doparse( char *ptr, int len, const char *encoding ) LONG xmldoc_add_ref(xmlDocPtr doc) { LONG ref = InterlockedIncrement(&priv_from_xmlDocPtr(doc)->refs); - TRACE("%d\n", ref); + TRACE("(%p)->(%d)\n", doc, ref); return ref; } @@ -166,7 +166,7 @@ LONG xmldoc_release(xmlDocPtr doc) { xmldoc_priv *priv = priv_from_xmlDocPtr(doc); LONG ref = InterlockedDecrement(&priv->refs); - TRACE("%d\n", ref); + TRACE("(%p)->(%d)\n", doc, ref); if(ref == 0) { orphan_entry *orphan, *orphan2;

1 0

André Hentschel : user32: Update comment.
by Alexandre Julliard June 21, 2010

June 21, 2010

Module: wine Branch: master Commit: 858ae060fd5403c101ef582cf007ec261b5f836a URL: http://source.winehq.org/git/wine.git/?a=commit;h=858ae060fd5403c101ef582cf… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jun 20 16:08:33 2010 +0200 user32: Update comment. --- dlls/user32/sysparams.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 7155dba..e6d2386 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -1085,7 +1085,7 @@ static void load_nonclient_metrics(void) if (!reg_get_logfont(METRICS_REGKEY, METRICS_SMCAPTIONLOGFONT_VALNAME, &ncm.lfSmCaptionFont)) SystemParametersInfoW( SPI_GETICONTITLELOGFONT, 0, &ncm.lfSmCaptionFont, 0 ); - /* menus, FIXME: names of wine.conf entries are bogus */ + /* menus, FIXME: names of registry entries are bogus */ /* size of the menu (MDI) buttons */ ncm.iMenuHeight = get_reg_metric(hkey, METRICS_MENUHEIGHT_VALNAME, 18);

1 0

Nikolay Sivov : msxml3: Support xml:lang attribute in IXMLElement:: getAttribute().
by Alexandre Julliard June 21, 2010

June 21, 2010

Module: wine Branch: master Commit: b00046ccc44ad3ed3368f1b62d8d1ad2bd7eeade URL: http://source.winehq.org/git/wine.git/?a=commit;h=b00046ccc44ad3ed3368f1b62… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 21 01:51:20 2010 +0400 msxml3: Support xml:lang attribute in IXMLElement::getAttribute(). --- dlls/msxml3/xmlelem.c | 60 ++++++++++++++++++++++++++++++++---------------- 1 files changed, 40 insertions(+), 20 deletions(-) diff --git a/dlls/msxml3/xmlelem.c b/dlls/msxml3/xmlelem.c index 3ff307b..7a4faa3 100644 --- a/dlls/msxml3/xmlelem.c +++ b/dlls/msxml3/xmlelem.c @@ -238,46 +238,66 @@ static HRESULT WINAPI xmlelem_setAttribute(IXMLElement *iface, BSTR strPropertyN return (attr) ? S_OK : S_FALSE; } -static HRESULT WINAPI xmlelem_getAttribute(IXMLElement *iface, BSTR strPropertyName, - VARIANT *PropertyValue) +static HRESULT WINAPI xmlelem_getAttribute(IXMLElement *iface, BSTR name, + VARIANT *value) { + static const WCHAR xmllangW[] = { 'x','m','l',':','l','a','n','g',0 }; xmlelem *This = impl_from_IXMLElement(iface); - xmlChar *val = NULL, *name; - xmlAttrPtr ptr; + xmlChar *val = NULL; - TRACE("(%p, %s, %p)\n", iface, debugstr_w(strPropertyName), PropertyValue); + TRACE("(%p, %s, %p)\n", iface, debugstr_w(name), value); - if (!PropertyValue) + if (!value) return E_INVALIDARG; - VariantInit(PropertyValue); - V_BSTR(PropertyValue) = NULL; + VariantInit(value); + V_BSTR(value) = NULL; - if (!strPropertyName) + if (!name) return E_INVALIDARG; - name = xmlChar_from_wchar(strPropertyName); - ptr = This->node->properties; - while (ptr) + /* case for xml:lang attribute */ + if (!lstrcmpiW(name, xmllangW)) + { + xmlNsPtr ns; + ns = xmlSearchNs(This->node->doc, This->node, (xmlChar*)"xml"); + val = xmlGetNsProp(This->node, (xmlChar*)"lang", ns->href); + xmlFree(ns); + } + else { - if (!lstrcmpiA((LPSTR)name, (LPCSTR)ptr->name)) + xmlAttrPtr attr; + xmlChar *xml_name; + + xml_name = xmlChar_from_wchar(name); + attr = This->node->properties; + while (attr) { - val = xmlNodeListGetString(ptr->doc, ptr->children, 1); - break; + BSTR attr_name; + + attr_name = bstr_from_xmlChar(attr->name); + if (!lstrcmpiW(name, attr_name)) + { + val = xmlNodeListGetString(attr->doc, attr->children, 1); + SysFreeString(attr_name); + break; + } + + attr = attr->next; + SysFreeString(attr_name); } - ptr = ptr->next; + heap_free(xml_name); } if (val) { - V_VT(PropertyValue) = VT_BSTR; - V_BSTR(PropertyValue) = bstr_from_xmlChar(val); + V_VT(value) = VT_BSTR; + V_BSTR(value) = bstr_from_xmlChar(val); } - heap_free(name); xmlFree(val); - TRACE("returning %s\n", debugstr_w(V_BSTR(PropertyValue))); + TRACE("returning %s\n", debugstr_w(V_BSTR(value))); return (val) ? S_OK : S_FALSE; }

1 0