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

Jacek Caban : mshtml: Wine Gecko 1.0.0 release.
by Alexandre Julliard Aug. 4, 2009

Aug. 4, 2009

Module: wine Branch: master Commit: d97cc15608c7511d83cda025d3dce7c9e3659252 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d97cc15608c7511d83cda025d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 4 14:05:05 2009 +0200 mshtml: Wine Gecko 1.0.0 release. --- dlls/mshtml/install.c | 4 ++-- dlls/mshtml/mutation.c | 6 ++++++ dlls/mshtml/nsiface.idl | 30 ++++++++++++++++-------------- dlls/mshtml/tests/dom.c | 1 - 4 files changed, 24 insertions(+), 17 deletions(-) diff --git a/dlls/mshtml/install.c b/dlls/mshtml/install.c index c993b99..5eca3a6 100644 --- a/dlls/mshtml/install.c +++ b/dlls/mshtml/install.c @@ -47,7 +47,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); -#define GECKO_FILE_NAME "wine_gecko-" GECKO_VERSION ".cab" +#define GECKO_FILE_NAME "wine_gecko-" GECKO_VERSION "-x86.cab" static const WCHAR mshtml_keyW[] = {'S','o','f','t','w','a','r','e', @@ -430,7 +430,7 @@ static LPWSTR get_url(void) static const WCHAR wszGeckoUrl[] = {'G','e','c','k','o','U','r','l',0}; static const WCHAR httpW[] = {'h','t','t','p'}; - static const WCHAR v_formatW[] = {'?','v','=',0}; + static const WCHAR v_formatW[] = {'?','a','r','c','h','=','x','8','6','&','v','=',0}; /* @@ Wine registry key: HKCU\Software\Wine\MSHTML */ res = RegOpenKeyW(HKEY_CURRENT_USER, mshtml_keyW, &hkey); diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index ab9649c..6060a8d 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -412,6 +412,11 @@ static void NSAPI nsDocumentObserver_CharacterDataChanged(nsIDocumentObserver *i { } +static void NSAPI nsDocumentObserver_AttributeWillChange(nsIDocumentObserver *iface, nsIDocument *aDocument, + nsIContent *aContent, PRInt32 aNameSpaceID, nsIAtom *aAttribute, PRInt32 aModType) +{ +} + static void NSAPI nsDocumentObserver_AttributeChanged(nsIDocumentObserver *iface, nsIDocument *aDocument, nsIContent *aContent, PRInt32 aNameSpaceID, nsIAtom *aAttribute, PRInt32 aModType, PRUint32 aStateMask) { @@ -563,6 +568,7 @@ static const nsIDocumentObserverVtbl nsDocumentObserverVtbl = { nsDocumentObserver_Release, nsDocumentObserver_CharacterDataWillChange, nsDocumentObserver_CharacterDataChanged, + nsDocumentObserver_AttributeWillChange, nsDocumentObserver_AttributeChanged, nsDocumentObserver_ContentAppended, nsDocumentObserver_ContentInserted, diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 894bb41..24c6214 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -23,7 +23,7 @@ * compatible with XPCOM, usable in C code. */ -cpp_quote("#define GECKO_VERSION \"0.9.1\"") +cpp_quote("#define GECKO_VERSION \"1.0.0\"") cpp_quote("#define GECKO_VERSION_STRING \"Wine Gecko \" GECKO_VERSION") import "wtypes.idl"; @@ -855,7 +855,7 @@ interface nsIDOMDocument : nsIDOMNode [ object, - uuid(533a8131-8d0c-4ebf-990b-7fad7cd51466), + uuid(09a439ad-4079-46d5-a050-4d7015d1a108), local /* NOT_FROZEN */ ] @@ -868,9 +868,9 @@ interface nsIDOMNSDocument : nsISupports nsresult GetTitle(nsAString *aTitle); nsresult SetTitle(const nsAString *aTitle); nsresult GetContentType(nsAString *aContentType); + nsresult GetReadyState(nsAString *aReadyState); nsresult GetLastModified(nsAString *aLastModified); nsresult GetReferrer(nsAString *aReferrer); - nsresult GetBoxObjectFor(nsIDOMElement *elt, nsIBoxObject **_retval); nsresult HasFocus(PRBool *_retval); nsresult GetActiveElement(nsIDOMElement **aActiveElement); nsresult GetElementsByClassName(const nsAString *classes, nsIDOMNodeList **_retval); @@ -1546,13 +1546,13 @@ interface nsIWebNavigation : nsISupports [ object, - uuid(5af07661-6477-4235-8814-4a45215855b8), + uuid(343700dd-078b-42b6-a809-b9c1d7e951d0), local /* NOT_FROZEN */ ] interface nsIPrintSettings : nsISupports { - typedef struct { char dummy; } nsMargin; + typedef struct { char dummy; } nsIntMargin; nsresult SetPrintOptions(PRInt32 aType, PRBool aTurnOnOff); nsresult GetPrintOptions(PRInt32 aType, PRBool *_retval); @@ -1672,13 +1672,13 @@ interface nsIPrintSettings : nsISupports nsresult SetIsInitializedFromPrinter(PRBool aIsInitializedFromPrinter); nsresult GetIsInitializedFromPrefs(PRBool *aIsInitializedFromPrefs); nsresult SetIsInitializedFromPrefs(PRBool aIsInitializedFromPrefs); - nsresult SetMarginInTwips(nsMargin *aMargin); - nsresult SetEdgeInTwips(nsMargin *aEdge); - nsresult GetMarginInTwips(nsMargin *aMargin); - nsresult GetEdgeInTwips(nsMargin *aEdge); + nsresult SetMarginInTwips(nsIntMargin *aMargin); + nsresult SetEdgeInTwips(nsIntMargin *aEdge); + nsresult GetMarginInTwips(nsIntMargin *aMargin); + nsresult GetEdgeInTwips(nsIntMargin *aEdge); nsresult SetupSilentPrinting(); - nsresult SetUnwriteableMarginInTwips(nsMargin *aEdge); - nsresult GetUnwriteableMarginInTwips(nsMargin *aEdge); + nsresult SetUnwriteableMarginInTwips(nsIntMargin *aEdge); + nsresult GetUnwriteableMarginInTwips(nsIntMargin *aEdge); } [ @@ -1872,7 +1872,7 @@ interface nsIIOService : nsISupports [ object, - uuid(57322c6f-f4ec-4e46-8253-b74be220de16), + uuid(a50d5516-5c0a-4f08-b427-703ca0c44ac3), local, /* NOT_FROZEN */ ] @@ -2485,7 +2485,7 @@ interface nsIHTMLEditor : nsISupports [ object, - uuid(32e68316-67d4-44a5-8d35-0d390fa9df11), + uuid(365d600b-868a-452a-8de8-f46fad8fee53), local /* NOT_FROZEN */ ] @@ -2495,6 +2495,8 @@ interface nsIMutationObserver : nsISupports void /*CharacterDataChangeInfo*/ *aInfo); void CharacterDataChanged(nsIDocument *aDocument, nsIContent *aContent, void /*CharacterDataChangeInfo*/ *aInfo); + void AttributeWillChange(nsIDocument *aDocument, nsIContent * aContent, PRInt32 aNameSpaceID, + nsIAtom *aAttribute, PRInt32 aModType); void AttributeChanged(nsIDocument *aDocument, nsIContent *aContent, PRInt32 aNameSpaceID, nsIAtom *aAttribute, PRInt32 aModType, PRUint32 aStateMask); void ContentAppended(nsIDocument *aDocument, nsIContent *aContainer, PRInt32 aNewIndexInContainer); @@ -2531,7 +2533,7 @@ interface nsIDocumentObserver : nsIMutationObserver void StyleRuleAdded(nsIDocument *aDocument, nsIStyleSheet *aStyleSheet, nsIStyleRule *aStyleRule); void StyleRuleRemoved(nsIDocument *aDocument, nsIStyleSheet *aStyleSheet, nsIStyleRule *aStyleRule); void BindToDocument(nsIDocument *aDocument, nsIContent *aContent); - void DoneAddingContent(nsIContent *aContent, PRBool aHaveNotified); + void DoneAddingChildren(nsIContent *aContent, PRBool aHaveNotified); } /* diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 97102db..4846848 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -3014,7 +3014,6 @@ static void test_default_style(IHTMLStyle *style) hres = IHTMLStyle_get_margin(style, &str); ok(hres == S_OK, "get_margin failed: %08x\n", hres); - todo_wine ok(!strcmp_wa(str, "1px"), "margin = %s\n", dbgstr_w(str)); hres = IHTMLStyle_put_margin(style, NULL);

1 0

Jacek Caban : mshtml: Install Gecko in system directory.
by Alexandre Julliard Aug. 4, 2009

Aug. 4, 2009

Module: wine Branch: master Commit: 870f508c987c2f16c99eef7b9617b5a1e83efede URL: http://source.winehq.org/git/wine.git/?a=commit;h=870f508c987c2f16c99eef7b9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 4 14:04:03 2009 +0200 mshtml: Install Gecko in system directory. --- dlls/mshtml/install.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/install.c b/dlls/mshtml/install.c index 2dd91d8..c993b99 100644 --- a/dlls/mshtml/install.c +++ b/dlls/mshtml/install.c @@ -141,7 +141,7 @@ static BOOL install_cab(LPCWSTR file_name) TRACE("(%s)\n", debugstr_w(file_name)); - GetWindowsDirectoryA(install_dir, sizeof(install_dir)); + GetSystemDirectoryA(install_dir, sizeof(install_dir)); strcat(install_dir, "\\gecko\\"); res = CreateDirectoryA(install_dir, NULL); if(!res && GetLastError() != ERROR_ALREADY_EXISTS) {

1 0

Hans Leidekker : advapi32: LsaFreeMemory returns NTSTATUS.
by Alexandre Julliard Aug. 4, 2009

Aug. 4, 2009

Module: wine Branch: master Commit: 508322a8bf905b79cecafd77a7a31e8d76037147 URL: http://source.winehq.org/git/wine.git/?a=commit;h=508322a8bf905b79cecafd77a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Aug 4 12:22:29 2009 +0200 advapi32: LsaFreeMemory returns NTSTATUS. --- dlls/advapi32/lsa.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c index 315cce9..ffc7cfd 100644 --- a/dlls/advapi32/lsa.c +++ b/dlls/advapi32/lsa.c @@ -264,7 +264,9 @@ NTSTATUS WINAPI LsaEnumerateTrustedDomainsEx( NTSTATUS WINAPI LsaFreeMemory(IN PVOID Buffer) { TRACE("(%p)\n", Buffer); - return HeapFree(GetProcessHeap(), 0, Buffer); + + HeapFree(GetProcessHeap(), 0, Buffer); + return STATUS_SUCCESS; } /******************************************************************************

1 0

Alistair Leslie-Hughes : gdiplus: Add GdipRecordMetafileI stub.
by Alexandre Julliard Aug. 4, 2009

Aug. 4, 2009

Module: wine Branch: master Commit: 7b2292fac12c67c8b03fc6654c71307d3417315f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b2292fac12c67c8b03fc6654… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jul 30 13:56:42 2009 +1000 gdiplus: Add GdipRecordMetafileI stub. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphics.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index c9dcd30..1727e30 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -469,7 +469,7 @@ @ stub GdipRecordMetafile @ stdcall GdipRecordMetafileFileName(wstr long long ptr long wstr ptr) @ stdcall GdipRecordMetafileFileNameI(wstr long long ptr long wstr ptr) -@ stub GdipRecordMetafileI +@ stdcall GdipRecordMetafileI(long long ptr long wstr ptr) @ stub GdipRecordMetafileStream @ stub GdipRecordMetafileStreamI @ stdcall GdipReleaseDC(ptr ptr) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 3199dbb..642a22f 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4097,3 +4097,13 @@ GpStatus WINGDIPAPI GdipIsVisibleRegionPointI(GpRegion *region, INT x, INT y, Gp FIXME("(%p %d %d %p %p): stub\n", region, x, y, graphics, result); return NotImplemented; } + +/***************************************************************************** + * GdipRecordMetafileI [GDIPLUS.@] + */ +GpStatus WINGDIPAPI GdipRecordMetafileI(HDC hdc, EmfType type, GDIPCONST GpRect *frameRect, + MetafileFrameUnit frameUnit, GDIPCONST WCHAR *desc, GpMetafile **metafile) +{ + FIXME("(%p %d %p %d %p %p): stub\n", hdc, type, frameRect, frameUnit, desc, metafile); + return NotImplemented; +}

1 0

Maarten Lankhorst : msgsm32.acm: Add support for encoding and decoding.
by Alexandre Julliard Aug. 4, 2009

Aug. 4, 2009

Module: wine Branch: master Commit: a89ba9e47ef98e403960e333f767bc678202ae3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a89ba9e47ef98e403960e333f… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Aug 3 16:04:22 2009 +0200 msgsm32.acm: Add support for encoding and decoding. Also makes the code only load the libgsm library only when it is used instead of on initialization of the dll. --- dlls/msgsm32.acm/msgsm32.c | 229 ++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 223 insertions(+), 6 deletions(-) diff --git a/dlls/msgsm32.acm/msgsm32.c b/dlls/msgsm32.acm/msgsm32.c index 7231fc3..6ad28fb 100644 --- a/dlls/msgsm32.acm/msgsm32.c +++ b/dlls/msgsm32.acm/msgsm32.c @@ -98,11 +98,6 @@ static LRESULT GSM_drvFree(void) #else -static LRESULT GSM_drvLoad(void) -{ - return 1; -} - static LRESULT GSM_drvFree(void) { return 1; @@ -362,6 +357,214 @@ static LRESULT GSM_FormatSuggest(PACMDRVFORMATSUGGEST adfs) return MMSYSERR_NOERROR; } +#ifdef SONAME_LIBGSM +/*********************************************************************** + * GSM_StreamOpen + * + */ +static LRESULT GSM_StreamOpen(PACMDRVSTREAMINSTANCE adsi) +{ + int used = 1; + gsm r; + if (!GSM_FormatValidate(adsi->pwfxSrc) || !GSM_FormatValidate(adsi->pwfxDst)) + return MMSYSERR_NOTSUPPORTED; + + if (adsi->pwfxSrc->nSamplesPerSec != adsi->pwfxDst->nSamplesPerSec) + return MMSYSERR_NOTSUPPORTED; + + if (!GSM_drvLoad()) return MMSYSERR_NOTSUPPORTED; + + r = pgsm_create(); + if (!r) + return MMSYSERR_NOMEM; + if (pgsm_option(r, GSM_OPT_WAV49, &used) < 0) + { + FIXME("Your libgsm library is doesn't support GSM_OPT_WAV49\n"); + FIXME("Please recompile libgsm with WAV49 support\n"); + pgsm_destroy(r); + return MMSYSERR_NOTSUPPORTED; + } + adsi->dwDriver = (DWORD_PTR)r; + return MMSYSERR_NOERROR; +} + +/*********************************************************************** + * GSM_StreamClose + * + */ +static LRESULT GSM_StreamClose(PACMDRVSTREAMINSTANCE adsi) +{ + pgsm_destroy((gsm)adsi->dwDriver); + return MMSYSERR_NOERROR; +} + +/*********************************************************************** + * GSM_StreamSize + * + */ +static LRESULT GSM_StreamSize(const ACMDRVSTREAMINSTANCE *adsi, PACMDRVSTREAMSIZE adss) +{ + switch (adss->fdwSize) + { + case ACM_STREAMSIZEF_DESTINATION: + /* cbDstLength => cbSrcLength */ + if (adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_PCM && + adsi->pwfxDst->wFormatTag == WAVE_FORMAT_GSM610) + { + adss->cbSrcLength = adss->cbDstLength / 65 * 640; + } + else if (adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_GSM610 && + adsi->pwfxDst->wFormatTag == WAVE_FORMAT_PCM) + { + adss->cbSrcLength = adss->cbDstLength / 640 * 65; + } + else + { + return MMSYSERR_NOTSUPPORTED; + } + return MMSYSERR_NOERROR; + case ACM_STREAMSIZEF_SOURCE: + /* cbSrcLength => cbDstLength */ + if (adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_PCM && + adsi->pwfxDst->wFormatTag == WAVE_FORMAT_GSM610) + { + adss->cbDstLength = (adss->cbSrcLength + 639) / 640 * 65; + } + else if (adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_GSM610 && + adsi->pwfxDst->wFormatTag == WAVE_FORMAT_PCM) + { + adss->cbDstLength = adss->cbSrcLength / 65 * 640; + } + else + { + return MMSYSERR_NOTSUPPORTED; + } + return MMSYSERR_NOERROR; + default: + WARN("Unsupported query %08x\n", adss->fdwSize); + return MMSYSERR_NOTSUPPORTED; + } +} + +/*********************************************************************** + * GSM_StreamConvert + * + */ +static LRESULT GSM_StreamConvert(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMHEADER adsh) +{ + gsm r = (gsm)adsi->dwDriver; + DWORD nsrc = 0; + DWORD ndst = 0; + BYTE *src = adsh->pbSrc; + BYTE *dst = adsh->pbDst; + int odd = 0; + + if (adsh->fdwConvert & + ~(ACM_STREAMCONVERTF_BLOCKALIGN| + ACM_STREAMCONVERTF_END| + ACM_STREAMCONVERTF_START)) + { + FIXME("Unsupported fdwConvert (%08x), ignoring it\n", adsh->fdwConvert); + } + + /* Reset the index to 0, just to be sure */ + pgsm_option(r, GSM_OPT_FRAME_INDEX, &odd); + + /* The native ms codec writes 65 bytes, and this requires 2 libgsm calls. + * First 32 bytes are written, or 33 bytes read + * Second 33 bytes are written, or 32 bytes read + */ + + /* Decode */ + if (adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_GSM610) + { + if (adsh->cbSrcLength / 65 * 640 > adsh->cbDstLength) + { + return ACMERR_NOTPOSSIBLE; + } + + while (nsrc + 65 <= adsh->cbSrcLength) + { + /* Decode data */ + if (pgsm_decode(r, src + nsrc, (gsm_signal*)(dst + ndst)) < 0) + FIXME("Couldn't decode data\n"); + ndst += 320; + nsrc += 33; + + if (pgsm_decode(r, src + nsrc, (gsm_signal*)(dst + ndst)) < 0) + FIXME("Couldn't decode data\n"); + ndst += 320; + nsrc += 32; + } + } + else + { + /* Testing a little seems to reveal that despite being able to fit + * inside the buffer if ACM_STREAMCONVERTF_BLOCKALIGN is set + * it still rounds up + */ + if ((adsh->cbSrcLength + 639) / 640 * 65 > adsh->cbDstLength) + { + return ACMERR_NOTPOSSIBLE; + } + + /* The packing algorythm writes 32 bytes, then 33 bytes, + * and it seems to pad to align to 65 bytes always + * adding extra data where necessary + */ + while (nsrc + 640 <= adsh->cbSrcLength) + { + /* Encode data */ + pgsm_encode(r, (gsm_signal*)(src+nsrc), dst+ndst); + nsrc += 320; + ndst += 32; + pgsm_encode(r, (gsm_signal*)(src+nsrc), dst+ndst); + nsrc += 320; + ndst += 33; + } + + /* If ACM_STREAMCONVERTF_BLOCKALIGN isn't set pad with zeros */ + if (!(adsh->fdwConvert & ACM_STREAMCONVERTF_BLOCKALIGN) && + nsrc < adsh->cbSrcLength) + { + char emptiness[320]; + int todo = adsh->cbSrcLength - nsrc; + + if (todo > 320) + { + pgsm_encode(r, (gsm_signal*)(src+nsrc), dst+ndst); + ndst += 32; + todo -= 320; + nsrc += 320; + + memcpy(emptiness, src+nsrc, todo); + memset(emptiness + todo, 0, 320 - todo); + pgsm_encode(r, (gsm_signal*)emptiness, dst+ndst); + ndst += 33; + } + else + { + memcpy(emptiness, src+nsrc, todo); + memset(emptiness + todo, 0, 320 - todo); + pgsm_encode(r, (gsm_signal*)emptiness, dst+ndst); + ndst += 32; + + memset(emptiness, 0, todo); + pgsm_encode(r, (gsm_signal*)emptiness, dst+ndst); + ndst += 33; + } + nsrc = adsh->cbSrcLength; + } + } + + adsh->cbSrcLengthUsed = nsrc; + adsh->cbDstLengthUsed = ndst; + TRACE("%d(%d) -> %d(%d)\n", nsrc, adsh->cbSrcLength, ndst, adsh->cbDstLength); + return MMSYSERR_NOERROR; +} + +#endif + /************************************************************************** * GSM_DriverProc [exported] */ @@ -373,7 +576,7 @@ LRESULT CALLBACK GSM_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, switch (wMsg) { - case DRV_LOAD: return GSM_drvLoad(); + case DRV_LOAD: return 1; case DRV_FREE: return GSM_drvFree(); case DRV_OPEN: return 1; case DRV_CLOSE: return 1; @@ -400,11 +603,25 @@ LRESULT CALLBACK GSM_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, case ACMDM_FORMAT_SUGGEST: return GSM_FormatSuggest((PACMDRVFORMATSUGGEST)dwParam1); +#ifdef SONAME_LIBGSM case ACMDM_STREAM_OPEN: + return GSM_StreamOpen((PACMDRVSTREAMINSTANCE)dwParam1); + + case ACMDM_STREAM_CLOSE: + return GSM_StreamClose((PACMDRVSTREAMINSTANCE)dwParam1); + + case ACMDM_STREAM_SIZE: + return GSM_StreamSize((PACMDRVSTREAMINSTANCE)dwParam1, (PACMDRVSTREAMSIZE)dwParam2); + + case ACMDM_STREAM_CONVERT: + return GSM_StreamConvert((PACMDRVSTREAMINSTANCE)dwParam1, (PACMDRVSTREAMHEADER)dwParam2); +#else + case ACMDM_STREAM_OPEN: ERR("libgsm support not compiled in!\n"); case ACMDM_STREAM_CLOSE: case ACMDM_STREAM_SIZE: case ACMDM_STREAM_CONVERT: return MMSYSERR_NOTSUPPORTED; +#endif case ACMDM_HARDWARE_WAVE_CAPS_INPUT: case ACMDM_HARDWARE_WAVE_CAPS_OUTPUT:

1 0

Maarten Lankhorst : msgsm32.acm: Add support for format enumeration.
by Alexandre Julliard Aug. 4, 2009

Aug. 4, 2009

Module: wine Branch: master Commit: 37a89ff0733f7c33b10a486e9f07b62dbf8a24ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=37a89ff0733f7c33b10a486e9… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Aug 3 15:59:19 2009 +0200 msgsm32.acm: Add support for format enumeration. --- dlls/msgsm32.acm/msgsm32.c | 230 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 229 insertions(+), 1 deletions(-) diff --git a/dlls/msgsm32.acm/msgsm32.c b/dlls/msgsm32.acm/msgsm32.c index 09dd72d..7231fc3 100644 --- a/dlls/msgsm32.acm/msgsm32.c +++ b/dlls/msgsm32.acm/msgsm32.c @@ -139,6 +139,229 @@ static LRESULT GSM_DriverDetails(PACMDRIVERDETAILSW add) return MMSYSERR_NOERROR; } +/* Validate a WAVEFORMATEX structure */ +static DWORD GSM_FormatValidate(const WAVEFORMATEX *wfx) +{ + if (wfx->nChannels != 1) + return 0; + + switch (wfx->wFormatTag) + { + case WAVE_FORMAT_PCM: + if (wfx->wBitsPerSample != 16) + { + WARN("PCM wBitsPerSample %u\n", wfx->wBitsPerSample); + return 0; + } + if (wfx->nBlockAlign != 2) + { + WARN("PCM nBlockAlign %u\n", wfx->nBlockAlign); + return 0; + } + if (wfx->nAvgBytesPerSec != wfx->nBlockAlign * wfx->nSamplesPerSec) + { + WARN("PCM nAvgBytesPerSec %u/%u\n", + wfx->nAvgBytesPerSec, + wfx->nBlockAlign * wfx->nSamplesPerSec); + return 0; + } + return 1; + case WAVE_FORMAT_GSM610: + if (wfx->cbSize < sizeof(WORD)) + { + WARN("GSM cbSize %u\n", wfx->cbSize); + return 0; + } + if (wfx->wBitsPerSample != 0) + { + WARN("GSM wBitsPerSample %u\n", wfx->wBitsPerSample); + return 0; + } + if (wfx->nBlockAlign != 65) + { + WARN("GSM nBlockAlign %u\n", wfx->nBlockAlign); + return 0; + } + if (((GSM610WAVEFORMAT*)wfx)->wSamplesPerBlock != 320) + { + WARN("GSM wSamplesPerBlock %u\n", + ((GSM610WAVEFORMAT*)wfx)->wSamplesPerBlock); + return 0; + } + if (wfx->nAvgBytesPerSec != wfx->nSamplesPerSec * 65 / 320) + { + WARN("GSM nAvgBytesPerSec %d / %d\n", + wfx->nAvgBytesPerSec, wfx->nSamplesPerSec * 65 / 320); + return 0; + } + return 1; + default: + return 0; + } + return 0; +} + +static const DWORD gsm_rates[] = { 8000, 11025, 22050, 44100, 48000, 96000 }; +#define NUM_RATES (sizeof(gsm_rates)/sizeof(*gsm_rates)) + +/*********************************************************************** + * GSM_FormatTagDetails + * + */ +static LRESULT GSM_FormatTagDetails(PACMFORMATTAGDETAILSW aftd, DWORD dwQuery) +{ + static const WCHAR szPcm[]={'P','C','M',0}; + static const WCHAR szGsm[]={'G','S','M',' ','6','.','1','0',0}; + + switch (dwQuery) + { + case ACM_FORMATTAGDETAILSF_INDEX: + if (aftd->dwFormatTagIndex > 1) return ACMERR_NOTPOSSIBLE; + break; + case ACM_FORMATTAGDETAILSF_LARGESTSIZE: + if (aftd->dwFormatTag == WAVE_FORMAT_UNKNOWN) + { + aftd->dwFormatTagIndex = 1; + break; + } + /* fall thru */ + case ACM_FORMATTAGDETAILSF_FORMATTAG: + switch (aftd->dwFormatTag) + { + case WAVE_FORMAT_PCM: aftd->dwFormatTagIndex = 0; break; + case WAVE_FORMAT_GSM610: aftd->dwFormatTagIndex = 1; break; + default: return ACMERR_NOTPOSSIBLE; + } + break; + default: + WARN("Unsupported query %08x\n", dwQuery); + return MMSYSERR_NOTSUPPORTED; + } + + aftd->fdwSupport = ACMDRIVERDETAILS_SUPPORTF_CODEC; + switch (aftd->dwFormatTagIndex) + { + case 0: + aftd->dwFormatTag = WAVE_FORMAT_PCM; + aftd->cbFormatSize = sizeof(PCMWAVEFORMAT); + aftd->cStandardFormats = NUM_RATES; + lstrcpyW(aftd->szFormatTag, szPcm); + break; + case 1: + aftd->dwFormatTag = WAVE_FORMAT_GSM610; + aftd->cbFormatSize = sizeof(GSM610WAVEFORMAT); + aftd->cStandardFormats = NUM_RATES; + lstrcpyW(aftd->szFormatTag, szGsm); + break; + } + return MMSYSERR_NOERROR; +} + +/*********************************************************************** + * GSM_FormatDetails + * + */ +static LRESULT GSM_FormatDetails(PACMFORMATDETAILSW afd, DWORD dwQuery) +{ + switch (dwQuery) + { + case ACM_FORMATDETAILSF_FORMAT: + if (!GSM_FormatValidate(afd->pwfx)) return ACMERR_NOTPOSSIBLE; + break; + case ACM_FORMATDETAILSF_INDEX: + afd->pwfx->wFormatTag = afd->dwFormatTag; + switch (afd->dwFormatTag) + { + case WAVE_FORMAT_PCM: + if (afd->dwFormatIndex >= NUM_RATES) return ACMERR_NOTPOSSIBLE; + afd->pwfx->nChannels = 1; + afd->pwfx->nSamplesPerSec = gsm_rates[afd->dwFormatIndex]; + afd->pwfx->wBitsPerSample = 16; + afd->pwfx->nBlockAlign = 2; + afd->pwfx->nAvgBytesPerSec = afd->pwfx->nSamplesPerSec * afd->pwfx->nBlockAlign; + break; + case WAVE_FORMAT_GSM610: + if (afd->dwFormatIndex >= NUM_RATES) return ACMERR_NOTPOSSIBLE; + afd->pwfx->nChannels = 1; + afd->pwfx->nSamplesPerSec = gsm_rates[afd->dwFormatIndex]; + afd->pwfx->wBitsPerSample = 0; + afd->pwfx->nBlockAlign = 65; + afd->pwfx->nAvgBytesPerSec = afd->pwfx->nSamplesPerSec * 65 / 320; + afd->pwfx->cbSize = sizeof(WORD); + ((GSM610WAVEFORMAT*)afd->pwfx)->wSamplesPerBlock = 320; + break; + default: + WARN("Unsupported tag %08x\n", afd->dwFormatTag); + return MMSYSERR_INVALPARAM; + } + break; + default: + WARN("Unsupported query %08x\n", dwQuery); + return MMSYSERR_NOTSUPPORTED; + } + afd->fdwSupport = ACMDRIVERDETAILS_SUPPORTF_CODEC; + afd->szFormat[0] = 0; /* let MSACM format this for us... */ + + return MMSYSERR_NOERROR; +} + +/*********************************************************************** + * GSM_FormatSuggest + * + */ +static LRESULT GSM_FormatSuggest(PACMDRVFORMATSUGGEST adfs) +{ + /* some tests ... */ + if (adfs->cbwfxSrc < sizeof(PCMWAVEFORMAT) || + adfs->cbwfxDst < sizeof(PCMWAVEFORMAT) || + !GSM_FormatValidate(adfs->pwfxSrc)) return ACMERR_NOTPOSSIBLE; + /* FIXME: should do those tests against the real size (according to format tag */ + + /* If no suggestion for destination, then copy source value */ + if (!(adfs->fdwSuggest & ACM_FORMATSUGGESTF_NCHANNELS)) + adfs->pwfxDst->nChannels = adfs->pwfxSrc->nChannels; + if (!(adfs->fdwSuggest & ACM_FORMATSUGGESTF_NSAMPLESPERSEC)) + adfs->pwfxDst->nSamplesPerSec = adfs->pwfxSrc->nSamplesPerSec; + + if (!(adfs->fdwSuggest & ACM_FORMATSUGGESTF_WBITSPERSAMPLE)) + { + if (adfs->pwfxSrc->wFormatTag == WAVE_FORMAT_PCM) + adfs->pwfxDst->wBitsPerSample = 0; + else + adfs->pwfxDst->wBitsPerSample = 16; + } + if (!(adfs->fdwSuggest & ACM_FORMATSUGGESTF_WFORMATTAG)) + { + switch (adfs->pwfxSrc->wFormatTag) + { + case WAVE_FORMAT_PCM: adfs->pwfxDst->wFormatTag = WAVE_FORMAT_GSM610; break; + case WAVE_FORMAT_GSM610: adfs->pwfxDst->wFormatTag = WAVE_FORMAT_PCM; break; + } + } + + /* recompute other values */ + switch (adfs->pwfxDst->wFormatTag) + { + case WAVE_FORMAT_PCM: + adfs->pwfxDst->nBlockAlign = 2; + adfs->pwfxDst->nAvgBytesPerSec = adfs->pwfxDst->nSamplesPerSec * 2; + break; + case WAVE_FORMAT_GSM610: + if (adfs->pwfxDst->cbSize < sizeof(WORD)) + return ACMERR_NOTPOSSIBLE; + adfs->pwfxDst->nBlockAlign = 65; + adfs->pwfxDst->nAvgBytesPerSec = adfs->pwfxDst->nSamplesPerSec * 65 / 320; + ((GSM610WAVEFORMAT*)adfs->pwfxDst)->wSamplesPerBlock = 320; + break; + default: + return ACMERR_NOTPOSSIBLE; + } + + /* check if result is ok */ + if (!GSM_FormatValidate(adfs->pwfxDst)) return ACMERR_NOTPOSSIBLE; + return MMSYSERR_NOERROR; +} + /************************************************************************** * GSM_DriverProc [exported] */ @@ -168,10 +391,15 @@ LRESULT CALLBACK GSM_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, case ACMDM_DRIVER_DETAILS: return GSM_DriverDetails((PACMDRIVERDETAILSW)dwParam1); - /* Not implemented yet */ case ACMDM_FORMATTAG_DETAILS: + return GSM_FormatTagDetails((PACMFORMATTAGDETAILSW)dwParam1, dwParam2); + case ACMDM_FORMAT_DETAILS: + return GSM_FormatDetails((PACMFORMATDETAILSW)dwParam1, dwParam2); + case ACMDM_FORMAT_SUGGEST: + return GSM_FormatSuggest((PACMDRVFORMATSUGGEST)dwParam1); + case ACMDM_STREAM_OPEN: case ACMDM_STREAM_CLOSE: case ACMDM_STREAM_SIZE:

1 0

Maarten Lankhorst : msgsm32.acm: Implement a stub dll.
by Alexandre Julliard Aug. 4, 2009

Aug. 4, 2009

Module: wine Branch: master Commit: 58b5a3f6bea4403a97c29b45dd27f9cc7ebbb0a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58b5a3f6bea4403a97c29b45d… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Aug 3 15:48:32 2009 +0200 msgsm32.acm: Implement a stub dll. --- configure | 117 ++++++++++++++++++++++ configure.ac | 12 +++ dlls/msgsm32.acm/Makefile.in | 12 +++ dlls/msgsm32.acm/msgsm32.acm.spec | 1 + dlls/msgsm32.acm/msgsm32.c | 198 +++++++++++++++++++++++++++++++++++++ include/config.h.in | 6 + tools/wine.inf.in | 2 + 7 files changed, 348 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=58b5a3f6bea4403a97c29…

1 0

Huw Davies : msdaps: Initial stub.
by Alexandre Julliard Aug. 4, 2009

Aug. 4, 2009

Module: wine Branch: master Commit: b8e97560fb01b3acfdaaa66ae3c4ae37be071c29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8e97560fb01b3acfdaaa66ae… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Aug 3 12:17:10 2009 +0100 msdaps: Initial stub. --- .gitignore | 3 + configure | 9 ++ configure.ac | 1 + dlls/msdaps/Makefile.in | 22 ++++ dlls/msdaps/msdaps.idl | 1 + dlls/msdaps/msdaps.spec | 4 + dlls/msdaps/usrmarshal.c | 296 ++++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 336 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b8e97560fb01b3acfdaaa…

1 0

Huw Davies : widl: Store the pointer description in the type rather than base type so that it gets re-written when the type is re-written .
by Alexandre Julliard Aug. 4, 2009

Aug. 4, 2009

Module: wine Branch: master Commit: 69091ef56905bb12ab6c267d1265b3a096087e40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69091ef56905bb12ab6c267d1… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Aug 3 12:00:29 2009 +0100 widl: Store the pointer description in the type rather than base type so that it gets re-written when the type is re-written. --- tools/widl/typegen.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index d297eb2..b820430 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -2315,8 +2315,7 @@ static unsigned int write_struct_tfs(FILE *file, type_t *type, /* On the sizing pass, type->ptrdesc may be zero, but it's ok as nothing is written to file yet. On the actual writing pass, this will have been updated. */ - unsigned int absoff = type_get_real_type(type)->ptrdesc ? - type_get_real_type(type)->ptrdesc : *tfsoff; + unsigned int absoff = type->ptrdesc ? type->ptrdesc : *tfsoff; int reloff = absoff - *tfsoff; assert( reloff >= 0 ); print_file(file, 2, "NdrFcShort(0x%hx),\t/* Offset= %d (%u) */\n", @@ -2342,7 +2341,7 @@ static unsigned int write_struct_tfs(FILE *file, type_t *type, { const var_t *f; - type_get_real_type(type)->ptrdesc = *tfsoff; + type->ptrdesc = *tfsoff; if (fields) LIST_FOR_EACH_ENTRY(f, fields, const var_t, entry) { type_t *ft = f->type; @@ -2367,8 +2366,8 @@ static unsigned int write_struct_tfs(FILE *file, type_t *type, write_nonsimple_pointer(file, f->attrs, ft, FALSE, offset, tfsoff); } } - if (type_get_real_type(type)->ptrdesc == *tfsoff) - type_get_real_type(type)->ptrdesc = 0; + if (type->ptrdesc == *tfsoff) + type->ptrdesc = 0; } current_structure = save_current_structure;

1 0

Alistair Leslie-Hughes : mshtml: Add missing interfaces.
by Alexandre Julliard Aug. 4, 2009

Aug. 4, 2009

Module: wine Branch: master Commit: ccb23e8897f56f6cc38d7541fcf474bf9963fd86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccb23e8897f56f6cc38d7541f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Aug 5 19:44:25 2009 +1000 mshtml: Add missing interfaces. --- dlls/mshtml/htmloption.c | 4 +- dlls/mshtml/htmlstylesheet.c | 4 +- include/mshtml.idl | 177 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 181 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmloption.c b/dlls/mshtml/htmloption.c index ae36a99..49d8deb 100644 --- a/dlls/mshtml/htmloption.c +++ b/dlls/mshtml/htmloption.c @@ -31,13 +31,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); -typedef struct { +struct HTMLOptionElement { HTMLElement element; const IHTMLOptionElementVtbl *lpHTMLOptionElementVtbl; nsIDOMHTMLOptionElement *nsoption; -} HTMLOptionElement; +}; #define HTMLOPTION(x) (&(x)->lpHTMLOptionElementVtbl) diff --git a/dlls/mshtml/htmlstylesheet.c b/dlls/mshtml/htmlstylesheet.c index dca4214..e39bfb7 100644 --- a/dlls/mshtml/htmlstylesheet.c +++ b/dlls/mshtml/htmlstylesheet.c @@ -48,13 +48,13 @@ struct HTMLStyleSheetsCollection { nsIDOMStyleSheetList *nslist; }; -typedef struct { +struct HTMLStyleSheetRulesCollection { const IHTMLStyleSheetRulesCollectionVtbl *lpHTMLStyleSheetRulesCollectionVtbl; LONG ref; nsIDOMCSSRuleList *nslist; -} HTMLStyleSheetRulesCollection; +}; #define HTMLSTYLESHEET(x) ((IHTMLStyleSheet*) &(x)->lpHTMLStyleSheetVtbl) #define HTMLSTYLESHEETSCOL(x) ((IHTMLStyleSheetsCollection*) &(x)->lpHTMLStyleSheetsCollectionVtbl) diff --git a/include/mshtml.idl b/include/mshtml.idl index e219005..740c6c5 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -92,6 +92,26 @@ typedef enum _SELECTION_TYPE { SELECTION_TYPE_Max = 2147483647 } SELECTION_TYPE; +[ + odl, + oleautomation, + dual, + uuid(3051049b-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLDOMConstructor : IDispatch +{ + [propget, id(DISPID_IHTMLDOMCONSTRUCTOR_CONSTRUCTOR), hidden] + HRESULT constructor([retval, out] IDispatch* * p); + + HRESULT LookupGetter([in] BSTR propname, [retval, out] VARIANT* ppDispHandler); + + HRESULT LookupSetter([in] BSTR propname, [retval, out] VARIANT* ppDispHandler); + + HRESULT DefineGetter([in] BSTR propname, [in] VARIANT* pdispHandler); + + HRESULT DefineSetter([in] BSTR propname, [in] VARIANT* pdispHandler); +} + interface IHTMLDocument2; interface IHTMLStyleSheetsCollection; interface IHTMLFrameBase; @@ -5377,6 +5397,41 @@ interface IHTMLStyleSheetRule : IDispatch HRESULT readOnly([retval, out] VARIANT_BOOL *p); } +[ + hidden, + uuid(3050f50e-98b5-11cf-bb82-00aa00bdce0b) +] +dispinterface DispHTMLStyleSheetRule +{ +properties: +methods: + [propput, id(DISPID_IHTMLSTYLESHEETRULE_SELECTORTEXT)] + void selectorText(BSTR v); + + [propget, id(DISPID_IHTMLSTYLESHEETRULE_SELECTORTEXT)] + BSTR selectorText(); + + [propget, id(DISPID_IHTMLSTYLESHEETRULE_STYLE), nonbrowsable] + IHTMLRuleStyle* style(); + + [propget, id(DISPID_IHTMLSTYLESHEETRULE_READONLY)] + VARIANT_BOOL readOnly(); + + [propget, id(DISPID_IHTMLDOMCONSTRUCTOR_CONSTRUCTOR), hidden] + IDispatch* constructor(); +} + +[ + noncreatable, + uuid(3050f3ce-98b5-11cf-bb82-00aa00bdce0b) +] +coclass HTMLStyleSheetRule +{ + [default] dispinterface DispHTMLStyleSheetRule; + interface IHTMLStyleSheetRule; + interface IHTMLDOMConstructor; +} + /***************************************************************************** * IHTMLStyleSheetRulesCollection interface */ @@ -5398,6 +5453,35 @@ interface IHTMLStyleSheetRulesCollection : IDispatch } [ + hidden, + uuid(3050f52f-98b5-11cf-bb82-00aa00bdce0b) +] +dispinterface DispHTMLStyleSheetRulesCollection +{ +properties: +methods: + [propget, id(DISPID_IHTMLSTYLESHEETRULESCOLLECTION_LENGTH)] + long length(); + + [id(DISPID_IHTMLSTYLESHEETRULESCOLLECTION_ITEM)] + IHTMLStyleSheetRule* item([in] long index); + + [propget, id(DISPID_IHTMLDOMCONSTRUCTOR_CONSTRUCTOR), hidden] + IDispatch* constructor(); +} + +[ + noncreatable, + uuid(3050f3cd-98b5-11cf-bb82-00aa00bdce0b) +] +coclass HTMLStyleSheetRulesCollection +{ + [default] dispinterface DispHTMLStyleSheetRulesCollection; + interface IHTMLStyleSheetRulesCollection; + interface IHTMLDOMConstructor; +} + +[ odl, oleautomation, dual, @@ -5413,6 +5497,34 @@ interface IHTMLStyleSheetPage : IDispatch } [ + hidden, + uuid(3050f540-98b5-11cf-bb82-00aa00bdce0b) +] +dispinterface DispHTMLStyleSheetPage +{ +properties: +methods: + [propget, id(DISPID_IHTMLSTYLESHEETPAGE_SELECTOR)] + BSTR selector(); + + [propget, id(DISPID_IHTMLSTYLESHEETPAGE_PSEUDOCLASS)] + BSTR pseudoClass(); + + [propget, id(DISPID_IHTMLDOMCONSTRUCTOR_CONSTRUCTOR), hidden] + IDispatch* constructor(); +} +[ + noncreatable, + uuid(3050f7ef-98b5-11cf-bb82-00aa00bdce0b) +] +coclass HTMLStyleSheetPage +{ + [default] dispinterface DispHTMLStyleSheetPage; + interface IHTMLStyleSheetPage; + interface IHTMLDOMConstructor; +}; + +[ odl, oleautomation, dual, @@ -5429,6 +5541,35 @@ interface IHTMLStyleSheetPagesCollection : IDispatch [retval, out] IHTMLStyleSheetPage **ppHTMLStyleSheetPage); } +[ + hidden, + uuid(3050f543-98b5-11cf-bb82-00aa00bdce0b) +] +dispinterface DispHTMLStyleSheetPagesCollection +{ +properties: +methods: + [propget, id(DISPID_IHTMLSTYLESHEETPAGESCOLLECTION_LENGTH)] + long length(); + + [id(DISPID_IHTMLSTYLESHEETPAGESCOLLECTION_ITEM)] + IHTMLStyleSheetPage* item([in] long index); + + [propget, id(DISPID_IHTMLDOMCONSTRUCTOR_CONSTRUCTOR), hidden] + IDispatch* constructor(); +} + +[ + noncreatable, + uuid(3050f7f1-98b5-11cf-bb82-00aa00bdce0b) +] +coclass HTMLStyleSheetPagesCollection +{ + [default] dispinterface DispHTMLStyleSheetPagesCollection; + interface IHTMLStyleSheetPagesCollection; + interface IHTMLDOMConstructor; +} + /***************************************************************************** * IHTMLStyleSheet interface */ @@ -9616,6 +9757,21 @@ interface IHTMLOptionElement : IDispatch HRESULT form([retval, out] IHTMLFormElement **p); } +[ + odl, + oleautomation, + dual, + uuid(3050f820-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLOptionElement3 : IDispatch +{ + [propput, id(DISPID_IHTMLOPTIONELEMENT3_LABEL), displaybind, bindable] + HRESULT label([in] BSTR v); + + [propget, id(DISPID_IHTMLOPTIONELEMENT3_LABEL), displaybind, bindable] + HRESULT label([retval, out] BSTR * p); +} + /***************************************************************************** * IHTMLOptionElementFactory interface */ @@ -10527,6 +10683,27 @@ methods: BSTR label(); } +[ + noncreatable, + uuid(3050f24d-98b5-11cf-bb82-00aa00bdce0b) +] +coclass HTMLOptionElement +{ + [default] dispinterface DispHTMLOptionElement; + [source, default] dispinterface HTMLElementEvents; + [source] dispinterface HTMLElementEvents2; + interface IHTMLElement; + interface IHTMLElement2; + interface IHTMLElement3; + interface IHTMLElement4; + interface IHTMLUniqueName; + interface IHTMLDOMNode; + interface IHTMLDOMNode2; + interface IHTMLDatabinding; + interface IHTMLOptionElement; + interface IHTMLOptionElement3; +} + /***************************************************************************** * IHTMLInputElement interface */

1 0