Jacek Caban : mshtml: Don't return empty string in IHTMLSelectElement:: get_name.

Alexandre Julliard julliard at wine.codeweavers.com
Mon Oct 23 06:12:27 CDT 2006


Module: wine
Branch: master
Commit: 637310be274e5c7ec124ee6686b915ae2af1714a
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=637310be274e5c7ec124ee6686b915ae2af1714a

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Fri Oct 20 15:38:13 2006 +0200

mshtml: Don't return empty string in IHTMLSelectElement::get_name.

---

 dlls/mshtml/htmlselect.c |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c
index ce1b40b..4a01ef1 100644
--- a/dlls/mshtml/htmlselect.c
+++ b/dlls/mshtml/htmlselect.c
@@ -178,8 +178,15 @@ static HRESULT WINAPI HTMLSelectElement_
 
     nsres = nsIDOMHTMLSelectElement_GetName(This->nsselect, &name_str);
     if(NS_SUCCEEDED(nsres)) {
+        static const WCHAR wszGarbage[] = {'g','a','r','b','a','g','e',0};
+
         nsAString_GetData(&name_str, &name, NULL);
-        *p = SysAllocString(name);
+
+        /*
+         * Native never returns empty string here. If an element has no name,
+         * name of previous element or ramdom data is returned.
+         */
+        *p = SysAllocString(*name ? name : wszGarbage);
     }else {
         ERR("GetName failed: %08x\n", nsres);
     }




More information about the wine-cvs mailing list