October 2012 - Wine-Commits

Nikolay Sivov : dwrite: Use proper table field as stretch value.
by Alexandre Julliard Oct. 12, 2012

Oct. 12, 2012

Module: wine Branch: master Commit: ab91abd755b7c7a59ff25aadcbc8bd3d1b6d6e03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab91abd755b7c7a59ff25aadc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 12 08:28:03 2012 -0400 dwrite: Use proper table field as stretch value. --- dlls/dwrite/font.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index c218c25..d91a424 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -610,8 +610,8 @@ static DWRITE_FONT_STRETCH get_font_stretch(HDC hdc) if (GetFontData(hdc, MS_OS2_TAG, 0, &tt_os2, size) != size) return stretch; /* DWRITE_FONT_STRETCH enumeration values directly match font data values */ - if (GET_BE_WORD(tt_os2.usWeightClass) <= DWRITE_FONT_STRETCH_ULTRA_EXPANDED) - stretch = GET_BE_WORD(tt_os2.usWeightClass); + if (GET_BE_WORD(tt_os2.usWidthClass) <= DWRITE_FONT_STRETCH_ULTRA_EXPANDED) + stretch = GET_BE_WORD(tt_os2.usWidthClass); return stretch; }

1 0

Marcus Meissner : regedit: FIXME() on printing.
by Alexandre Julliard Oct. 12, 2012

Oct. 12, 2012

Module: wine Branch: master Commit: 443e196e082a8d113b11bd1849dca9a110f5d0d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=443e196e082a8d113b11bd184… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri Oct 12 14:38:24 2012 +0200 regedit: FIXME() on printing. --- programs/regedit/framewnd.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index b3ca594..2e28670 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -30,8 +30,11 @@ #include "main.h" #include "regproc.h" +#include "wine/debug.h" #include "wine/unicode.h" +WINE_DEFAULT_DEBUG_CHANNEL(regedit); + /******************************************************************************** * Global and Local Variables: */ @@ -408,6 +411,7 @@ static BOOL PrintRegistryHive(HWND hWnd, LPCWSTR path) pd.nMinPage = 1; pd.nMaxPage = 0xFFFF; if (PrintDlgW(&pd)) { + FIXME("printing is not yet implemented.\n"); /* GDI calls to render output. */ DeleteDC(pd.hDC); /* Delete DC when done.*/ } @@ -420,11 +424,13 @@ static BOOL PrintRegistryHive(HWND hWnd, LPCWSTR path) switch (pd.dwResultAction) { case PD_RESULT_APPLY: /*The user clicked the Apply button and later clicked the Cancel button. This indicates that the user wants to apply the changes made in the property sheet, but does not yet want to print. The PRINTDLGEX structure contains the information specified by the user at the time the Apply button was clicked. */ + FIXME("printing is not yet implemented.\n"); break; case PD_RESULT_CANCEL: /*The user clicked the Cancel button. The information in the PRINTDLGEX structure is unchanged. */ break; case PD_RESULT_PRINT: + FIXME("printing is not yet implemented.\n"); /*The user clicked the Print button. The PRINTDLGEX structure contains the information specified by the user. */ break; default:

1 0

Henri Verbeet : wined3d: Add support for SM4 relative addressing.
by Alexandre Julliard Oct. 12, 2012

Oct. 12, 2012

Module: wine Branch: master Commit: fc185f9baeba656178839b8a0cc8d12eac4afad7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc185f9baeba656178839b8a0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 12 13:03:58 2012 +0200 wined3d: Add support for SM4 relative addressing. --- dlls/wined3d/shader.c | 24 +++--- dlls/wined3d/shader_sm4.c | 157 ++++++++++++++++++++++++++++++++++------ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 149 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fc185f9baeba656178839…

1 0

Hans Leidekker : wbemprox: Implement class methods StdRegProv. EnumKey and StdRegProv.EnumValues.
by Alexandre Julliard Oct. 12, 2012

Oct. 12, 2012

Module: wine Branch: master Commit: 71fbae963e7e5750116c3f245f8452dd576aed42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71fbae963e7e5750116c3f245… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Oct 12 14:26:12 2012 +0200 wbemprox: Implement class methods StdRegProv.EnumKey and StdRegProv.EnumValues. --- dlls/wbemprox/Makefile.in | 1 + dlls/wbemprox/builtin.c | 33 +----- dlls/wbemprox/class.c | 4 +- dlls/wbemprox/query.c | 2 +- dlls/wbemprox/reg.c | 268 ++++++++++++++++++++++++++++++++++++++ dlls/wbemprox/wbemprox_private.h | 17 +++ 6 files changed, 291 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=71fbae963e7e5750116c3…

1 0

Marcus Meissner : crypt32: Initialize bytesNeeded (Coverity).
by Alexandre Julliard Oct. 12, 2012

Oct. 12, 2012

Module: wine Branch: master Commit: 9a51a9926a03097a85ba627623dcccddb8c7abb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a51a9926a03097a85ba62762… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu Oct 11 22:58:33 2012 +0200 crypt32: Initialize bytesNeeded (Coverity). --- dlls/crypt32/decode.c | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index bfd61d0..a4934a7 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -1912,7 +1912,7 @@ static BOOL WINAPI CRYPT_AsnDecodeName(DWORD dwCertEncodingType, sizeof(CERT_NAME_INFO), CRYPT_AsnDecodeRdn, sizeof(CERT_RDN), TRUE, offsetof(CERT_RDN, rgRDNAttr) }; - DWORD bytesNeeded; + DWORD bytesNeeded = 0; ret = CRYPT_AsnDecodeArray(&arrayDesc, pbEncoded, cbEncoded, dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, NULL, NULL, &bytesNeeded, @@ -2009,7 +2009,7 @@ static BOOL WINAPI CRYPT_AsnDecodeUnicodeName(DWORD dwCertEncodingType, sizeof(CERT_NAME_INFO), CRYPT_AsnDecodeUnicodeRdn, sizeof(CERT_RDN), TRUE, offsetof(CERT_RDN, rgRDNAttr) }; - DWORD bytesNeeded; + DWORD bytesNeeded = 0; ret = CRYPT_AsnDecodeArray(&arrayDesc, pbEncoded, cbEncoded, dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, NULL, NULL, &bytesNeeded, @@ -2455,7 +2455,7 @@ static BOOL CRYPT_AsnDecodeNoticeReference(const BYTE *pbEncoded, FALSE, TRUE, offsetof(CERT_POLICY_QUALIFIER_NOTICE_REFERENCE, rgNoticeNumbers), 0 }, }; - DWORD bytesNeeded; + DWORD bytesNeeded = 0; TRACE("%p, %d, %08x, %p, %d\n", pbEncoded, cbEncoded, dwFlags, pvStructInfo, pvStructInfo ? *pcbStructInfo : 0); @@ -2672,7 +2672,7 @@ static BOOL WINAPI CRYPT_AsnDecodePolicyQualifierUserNotice( __TRY { - DWORD bytesNeeded; + DWORD bytesNeeded = 0; ret = CRYPT_AsnDecodePolicyQualifierUserNoticeInternal(pbEncoded, cbEncoded, dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, NULL, &bytesNeeded, @@ -2766,7 +2766,7 @@ static BOOL WINAPI CRYPT_AsnDecodePKCSAttribute(DWORD dwCertEncodingType, __TRY { - DWORD bytesNeeded; + DWORD bytesNeeded = 0; ret = CRYPT_AsnDecodePKCSAttributeInternal(pbEncoded, cbEncoded, dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, NULL, &bytesNeeded, NULL); @@ -2907,7 +2907,7 @@ static BOOL WINAPI CRYPT_AsnDecodePubKeyInfo(DWORD dwCertEncodingType, __TRY { - DWORD bytesNeeded; + DWORD bytesNeeded = 0; if ((ret = CRYPT_AsnDecodePubKeyInfoInternal(pbEncoded, cbEncoded, dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, NULL, &bytesNeeded, NULL))) @@ -3409,7 +3409,7 @@ static BOOL WINAPI CRYPT_AsnDecodeAltName(DWORD dwCertEncodingType, __TRY { - DWORD bytesNeeded; + DWORD bytesNeeded = 0; if ((ret = CRYPT_AsnDecodeAltNameInternal(pbEncoded, cbEncoded, dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, NULL, &bytesNeeded, NULL))) @@ -3997,7 +3997,7 @@ static BOOL WINAPI CRYPT_AsnDecodeOctets(DWORD dwCertEncodingType, __TRY { - DWORD bytesNeeded; + DWORD bytesNeeded = 0; if (!cbEncoded) { @@ -4106,7 +4106,7 @@ static BOOL WINAPI CRYPT_AsnDecodeBits(DWORD dwCertEncodingType, __TRY { - DWORD bytesNeeded; + DWORD bytesNeeded = 0; if (!cbEncoded) { @@ -4200,7 +4200,7 @@ static BOOL WINAPI CRYPT_AsnDecodeInt(DWORD dwCertEncodingType, __TRY { - DWORD bytesNeeded; + DWORD bytesNeeded = 0; if (!cbEncoded) { @@ -4293,7 +4293,7 @@ static BOOL WINAPI CRYPT_AsnDecodeInteger(DWORD dwCertEncodingType, __TRY { - DWORD bytesNeeded; + DWORD bytesNeeded = 0; if (pbEncoded[0] != ASN_INTEGER) { @@ -4401,7 +4401,7 @@ static BOOL WINAPI CRYPT_AsnDecodeUnsignedInteger(DWORD dwCertEncodingType, __TRY { - DWORD bytesNeeded; + DWORD bytesNeeded = 0; if ((ret = CRYPT_AsnDecodeUnsignedIntegerInternal(pbEncoded, cbEncoded, dwFlags & ~CRYPT_ENCODE_ALLOC_FLAG, NULL, &bytesNeeded, NULL))) @@ -4657,7 +4657,7 @@ static BOOL WINAPI CRYPT_AsnDecodeUtcTime(DWORD dwCertEncodingType, __TRY { - DWORD bytesNeeded; + DWORD bytesNeeded = 0; ret = CRYPT_AsnDecodeUtcTimeInternal(pbEncoded, cbEncoded, dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, NULL, &bytesNeeded, NULL); @@ -4788,7 +4788,7 @@ static BOOL WINAPI CRYPT_AsnDecodeChoiceOfTime(DWORD dwCertEncodingType, __TRY { - DWORD bytesNeeded; + DWORD bytesNeeded = 0; ret = CRYPT_AsnDecodeChoiceOfTimeInternal(pbEncoded, cbEncoded, dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, NULL, &bytesNeeded, NULL); @@ -4933,7 +4933,7 @@ static BOOL CRYPT_AsnDecodeDistPointName(const BYTE *pbEncoded, if (pbEncoded[0] == (ASN_CONTEXT | ASN_CONSTRUCTOR | 0)) { - DWORD bytesNeeded, dataLen; + DWORD bytesNeeded = 0, dataLen; if ((ret = CRYPT_GetLen(pbEncoded, cbEncoded, &dataLen))) {

1 0

Henri Verbeet : wined3d: Implement WINED3DSIH_IMUL in the GLSL shader backend.
by Alexandre Julliard Oct. 12, 2012

Oct. 12, 2012

Module: wine Branch: master Commit: 2324ce6efb8e0689318933a310baf1de3d2529dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=2324ce6efb8e0689318933a31… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 12 13:03:57 2012 +0200 wined3d: Implement WINED3DSIH_IMUL in the GLSL shader backend. --- dlls/wined3d/glsl_shader.c | 25 ++++++++++++++++++++++++- 1 files changed, 24 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ff0cdc7..1f269f0 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2268,6 +2268,29 @@ static void shader_glsl_relop(const struct wined3d_shader_instruction *ins) } } +static void shader_glsl_imul(const struct wined3d_shader_instruction *ins) +{ + struct wined3d_shader_buffer *buffer = ins->ctx->buffer; + struct glsl_src_param src0_param; + struct glsl_src_param src1_param; + DWORD write_mask; + + /* If we have ARB_gpu_shader5 or GLSL 4.0, we can use imulExtended(). If + * not, we can emulate it. */ + if (ins->dst[0].reg.type != WINED3DSPR_NULL) + FIXME("64-bit integer multiplies not implemented.\n"); + + if (ins->dst[1].reg.type != WINED3DSPR_NULL) + { + write_mask = shader_glsl_append_dst_ext(buffer, ins, &ins->dst[1]); + shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src0_param); + shader_glsl_add_src_param(ins, &ins->src[1], write_mask, &src1_param); + + shader_addline(ins->ctx->buffer, "%s * %s);\n", + src0_param.param_str, src1_param.param_str); + } +} + /* Process the WINED3DSIO_MOV opcode using GLSL (dst = src) */ static void shader_glsl_mov(const struct wined3d_shader_instruction *ins) { @@ -5318,7 +5341,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_IF */ shader_glsl_if, /* WINED3DSIH_IFC */ shader_glsl_ifc, /* WINED3DSIH_IGE */ shader_glsl_relop, - /* WINED3DSIH_IMUL */ NULL, + /* WINED3DSIH_IMUL */ shader_glsl_imul, /* WINED3DSIH_ITOF */ shader_glsl_to_float, /* WINED3DSIH_LABEL */ shader_glsl_label, /* WINED3DSIH_LD */ NULL,

1 0

Hans Leidekker : wbemprox: Implement Win32_LogicalDisk.Name.
by Alexandre Julliard Oct. 12, 2012

Oct. 12, 2012

Module: wine Branch: master Commit: dca427fded76dfc7c95c49df1a36ccb96e5d81bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=dca427fded76dfc7c95c49df1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Oct 12 14:24:54 2012 +0200 wbemprox: Implement Win32_LogicalDisk.Name. --- dlls/wbemprox/builtin.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 5be3b2c..063c16d 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -247,6 +247,7 @@ static const struct column col_logicaldisk[] = { prop_drivetypeW, CIM_UINT32, VT_I4 }, { prop_filesystemW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_freespaceW, CIM_UINT64 }, + { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_sizeW, CIM_UINT64 } }; static const struct column col_networkadapter[] = @@ -421,6 +422,7 @@ struct record_logicaldisk UINT32 drivetype; const WCHAR *filesystem; UINT64 freespace; + const WCHAR *name; UINT64 size; }; struct record_networkadapter @@ -681,6 +683,7 @@ static void fill_logicaldisk( struct table *table ) rec->drivetype = type; rec->filesystem = get_filesystem( root ); rec->freespace = get_freespace( root, &size ); + rec->name = heap_strdupW( device_id ); rec->size = size; offset += sizeof(*rec); num_rows++;

1 0

Vincas Miliūnas : kernel32: Added implementation for OpenFileById.
by Alexandre Julliard Oct. 12, 2012

Oct. 12, 2012

Module: wine Branch: master Commit: aba4619dfe3ed96a12c2df19e3ec30208671351d URL: http://source.winehq.org/git/wine.git/?a=commit;h=aba4619dfe3ed96a12c2df19e… Author: Vincas Miliūnas <vincas.miliunas(a)gmail.com> Date: Fri Oct 12 13:35:37 2012 +0300 kernel32: Added implementation for OpenFileById. --- dlls/kernel32/file.c | 51 +++++++++++++++++++++++++++++++++++++++++++ dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/tests/file.c | 2 - 3 files changed, 52 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index cac1e98..41abe49 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -2601,6 +2601,57 @@ error: /* We get here if there was an error opening the file */ return HFILE_ERROR; } + +/*********************************************************************** + * OpenFileById (KERNEL32.@) + */ +HANDLE WINAPI OpenFileById( HANDLE handle, LPFILE_ID_DESCRIPTOR id, DWORD access, + DWORD share, LPSECURITY_ATTRIBUTES sec_attr, DWORD flags ) +{ + UINT options; + HANDLE result; + OBJECT_ATTRIBUTES attr; + NTSTATUS status; + IO_STATUS_BLOCK io; + UNICODE_STRING objectName; + + if (!id) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return INVALID_HANDLE_VALUE; + } + + options = FILE_OPEN_BY_FILE_ID; + if (flags & FILE_FLAG_BACKUP_SEMANTICS) + options |= FILE_OPEN_FOR_BACKUP_INTENT; + else + options |= FILE_NON_DIRECTORY_FILE; + if (flags & FILE_FLAG_NO_BUFFERING) options |= FILE_NO_INTERMEDIATE_BUFFERING; + if (!(flags & FILE_FLAG_OVERLAPPED)) options |= FILE_SYNCHRONOUS_IO_NONALERT; + if (flags & FILE_FLAG_RANDOM_ACCESS) options |= FILE_RANDOM_ACCESS; + flags &= FILE_ATTRIBUTE_VALID_FLAGS; + + objectName.Length = sizeof(ULONGLONG); + objectName.Buffer = (WCHAR *)&id->u.FileId; + attr.Length = sizeof(attr); + attr.RootDirectory = handle; + attr.Attributes = 0; + attr.ObjectName = &objectName; + attr.SecurityDescriptor = sec_attr ? sec_attr->lpSecurityDescriptor : NULL; + attr.SecurityQualityOfService = NULL; + if (sec_attr && sec_attr->bInheritHandle) attr.Attributes |= OBJ_INHERIT; + + status = NtCreateFile( &result, access, &attr, &io, NULL, flags, + share, OPEN_EXISTING, options, NULL, 0 ); + if (status != STATUS_SUCCESS) + { + SetLastError( RtlNtStatusToDosError( status ) ); + return INVALID_HANDLE_VALUE; + } + return result; +} + + /*********************************************************************** * K32EnumDeviceDrivers (KERNEL32.@) */ diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 57f7aff..b7efa0f 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -886,6 +886,7 @@ @ stdcall OpenEventA(long long str) @ stdcall OpenEventW(long long wstr) @ stdcall OpenFile(str ptr long) +@ stdcall OpenFileById(long ptr long long ptr long) @ stdcall OpenFileMappingA(long long str) @ stdcall OpenFileMappingW(long long wstr) @ stdcall OpenJobObjectA(long long str) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 6cc79c0..11e0044 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -3419,7 +3419,6 @@ static void test_OpenFileById(void) SetLastError(0xdeadbeef); handle = pOpenFileById(directory, NULL, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, NULL, 0); - todo_wine ok(handle == INVALID_HANDLE_VALUE && GetLastError() == ERROR_INVALID_PARAMETER, "OpenFileById: expected ERROR_INVALID_PARAMETER, got error %u.\n", GetLastError()); @@ -3427,7 +3426,6 @@ static void test_OpenFileById(void) fileIdDescr.Type = FileIdType; U(fileIdDescr).FileId = bothDirInfo->FileId; handle = pOpenFileById(directory, &fileIdDescr, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, NULL, 0); - todo_wine ok(handle != INVALID_HANDLE_VALUE, "OpenFileById: failed to open the file, got error %u.\n", GetLastError()); ret = ReadFile(handle, buffer, sizeof(buffer), &count, NULL);

1 0

Henri Verbeet : wined3d: Implement WINED3DSIH_UTOF in the GLSL shader backend.
by Alexandre Julliard Oct. 12, 2012

Oct. 12, 2012

Module: wine Branch: master Commit: ad1a1ee4fe87b250ab69f7650110a28a44df9eee URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad1a1ee4fe87b250ab69f7650… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 12 13:03:56 2012 +0200 wined3d: Implement WINED3DSIH_UTOF in the GLSL shader backend. --- dlls/wined3d/glsl_shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index dd1c8e0..ff0cdc7 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5383,7 +5383,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_TEXREG2RGB */ shader_glsl_texreg2rgb, /* WINED3DSIH_UDIV */ NULL, /* WINED3DSIH_USHR */ NULL, - /* WINED3DSIH_UTOF */ NULL, + /* WINED3DSIH_UTOF */ shader_glsl_to_float, /* WINED3DSIH_XOR */ shader_glsl_binop, };

1 0

Jacek Caban : mshtml.idl: Added IHTMLLinkElement* declarations.
by Alexandre Julliard Oct. 12, 2012

Oct. 12, 2012

Module: wine Branch: master Commit: df9355301e8bc4bb56582cedd386c54b372330f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df9355301e8bc4bb56582cedd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 12 14:49:47 2012 +0200 mshtml.idl: Added IHTMLLinkElement* declarations. --- include/mshtmdid.h | 23 ++++++ include/mshtml.idl | 215 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 238 insertions(+), 0 deletions(-) diff --git a/include/mshtmdid.h b/include/mshtmdid.h index 9e33845..d885ee3 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -2224,6 +2224,29 @@ #define DISPID_IHTMLDOMNODE_PREVIOUSSIBLING DISPID_ELEMENT+78 #define DISPID_IHTMLDOMNODE_NEXTSIBLING DISPID_ELEMENT+79 +/* IHTMLLinkElement */ +#define DISPID_IHTMLLINKELEMENT_HREF DISPID_HEDELEMS+5 +#define DISPID_IHTMLLINKELEMENT_REL DISPID_HEDELEMS+6 +#define DISPID_IHTMLLINKELEMENT_REV DISPID_HEDELEMS+7 +#define DISPID_IHTMLLINKELEMENT_TYPE DISPID_HEDELEMS+8 +#define DISPID_IHTMLLINKELEMENT_READYSTATE DISPID_A_READYSTATE +#define DISPID_IHTMLLINKELEMENT_ONREADYSTATECHANGE DISPID_EVPROP_ONREADYSTATECHANGE +#define DISPID_IHTMLLINKELEMENT_ONLOAD DISPID_EVPROP_ONLOAD +#define DISPID_IHTMLLINKELEMENT_ONERROR DISPID_EVPROP_ONERROR +#define DISPID_IHTMLLINKELEMENT_STYLESHEET DISPID_HEDELEMS+14 +#define DISPID_IHTMLLINKELEMENT_DISABLED STDPROPID_XOBJ_DISABLED +#define DISPID_IHTMLLINKELEMENT_MEDIA DISPID_HEDELEMS+16 + +/* IHTMLLinkElement2 */ +#define DISPID_IHTMLLINKELEMENT2_TARGET DISPID_HEDELEMS+17 + +/* IHTMLLinkElement3 */ +#define DISPID_IHTMLLINKELEMENT3_CHARSET DISPID_HEDELEMS+18 +#define DISPID_IHTMLLINKELEMENT3_HREFLANG DISPID_HEDELEMS+19 + +/* IHTMLLinkElement4 */ +#define DISPID_IHTMLLINKELEMENT4_IE8_HREF DISPID_IE8_LINK + /* IHTMLDOMNode2 */ #define DISPID_IHTMLDOMNODE2_OWNERDOCUMENT DISPID_ELEMENT+113 diff --git a/include/mshtml.idl b/include/mshtml.idl index f71ecac..502b286 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -6788,6 +6788,221 @@ methods: } /***************************************************************************** + * IHTMLLinkElement interface + */ +[ + odl, + oleautomation, + dual, + uuid(3050f205-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLLinkElement : IDispatch +{ + [propput, id(DISPID_IHTMLLINKELEMENT_HREF), displaybind, bindable] + HRESULT href([in] BSTR v); + + [propget, id(DISPID_IHTMLLINKELEMENT_HREF), displaybind, bindable] + HRESULT href([out, retval] BSTR *p); + + [propput, id(DISPID_IHTMLLINKELEMENT_REL), displaybind, bindable] + HRESULT rel([in] BSTR v); + + [propget, id(DISPID_IHTMLLINKELEMENT_REL), displaybind, bindable] + HRESULT rel([out, retval] BSTR *p); + + [propput, id(DISPID_IHTMLLINKELEMENT_REV), displaybind, bindable] + HRESULT rev([in] BSTR v); + + [propget, id(DISPID_IHTMLLINKELEMENT_REV), displaybind, bindable] + HRESULT rev([out, retval] BSTR *p); + + [propput, id(DISPID_IHTMLLINKELEMENT_TYPE), displaybind, bindable] + HRESULT type([in] BSTR v); + + [propget, id(DISPID_IHTMLLINKELEMENT_TYPE), displaybind, bindable] + HRESULT type([out, retval] BSTR *p); + + [propget, id(DISPID_IHTMLLINKELEMENT_READYSTATE)] + HRESULT readyState([out, retval] BSTR *p); + + [propput, id(DISPID_IHTMLLINKELEMENT_ONREADYSTATECHANGE), displaybind, bindable] + HRESULT onreadystatechange([in] VARIANT v); + + [propget, id(DISPID_IHTMLLINKELEMENT_ONREADYSTATECHANGE), displaybind, bindable] + HRESULT onreadystatechange([out, retval] VARIANT *p); + + [propput, id(DISPID_IHTMLLINKELEMENT_ONLOAD), displaybind, bindable] + HRESULT onload([in] VARIANT v); + + [propget, id(DISPID_IHTMLLINKELEMENT_ONLOAD), displaybind, bindable] + HRESULT onload([out, retval] VARIANT *p); + + [propput, id(DISPID_IHTMLLINKELEMENT_ONERROR), displaybind, bindable] + HRESULT onerror([in] VARIANT v); + + [propget, id(DISPID_IHTMLLINKELEMENT_ONERROR), displaybind, bindable] + HRESULT onerror([out, retval] VARIANT *p); + + [propget, id(DISPID_IHTMLLINKELEMENT_STYLESHEET)] + HRESULT styleSheet([out, retval] IHTMLStyleSheet **p); + + [propput, id(DISPID_IHTMLLINKELEMENT_DISABLED), displaybind, bindable] + HRESULT disabled([in] VARIANT_BOOL v); + + [propget, id(DISPID_IHTMLLINKELEMENT_DISABLED), displaybind, bindable] + HRESULT disabled([out, retval] VARIANT_BOOL *p); + + [propput, id(DISPID_IHTMLLINKELEMENT_MEDIA), displaybind, bindable] + HRESULT media([in] BSTR v); + + [propget, id(DISPID_IHTMLLINKELEMENT_MEDIA), displaybind, bindable]\ + HRESULT media([out, retval] BSTR *p); +} + +/***************************************************************************** + * IHTMLLinkElement2 interface + */ +[ + odl, + oleautomation, + dual, + uuid(3050f4e5-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLLinkElement2 : IDispatch +{ + [propput, id(DISPID_IHTMLLINKELEMENT2_TARGET), displaybind, bindable] + HRESULT target([in] BSTR v); + + [propget, id(DISPID_IHTMLLINKELEMENT2_TARGET), displaybind, bindable] + HRESULT target([out, retval] BSTR *p); +} + +/***************************************************************************** + * IHTMLLinkElement3 interface + */ +[ + odl, + oleautomation, + dual, + uuid(3050f81e-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLLinkElement3 : IDispatch +{ + [propput, id(DISPID_IHTMLLINKELEMENT3_CHARSET), displaybind, bindable] + HRESULT charset([in] BSTR v); + + [propget, id(DISPID_IHTMLLINKELEMENT3_CHARSET), displaybind, bindable] + HRESULT charset([out, retval] BSTR *p); + + [propput, id(DISPID_IHTMLLINKELEMENT3_HREFLANG), displaybind, bindable] + HRESULT hreflang([in] BSTR v); + + [propget, id(DISPID_IHTMLLINKELEMENT3_HREFLANG), displaybind, bindable] + HRESULT hreflang([out, retval] BSTR *p); +} + +/***************************************************************************** + * IHTMLLinkElement4 interface + */ +[ + odl, + oleautomation, + dual, + uuid(3051043a-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLLinkElement4 : IDispatch +{ + [propput, id(DISPID_IHTMLLINKELEMENT4_IE8_HREF)] + HRESULT href([in] BSTR v); + + [propget, id(DISPID_IHTMLLINKELEMENT4_IE8_HREF)] + HRESULT href([retval, out] BSTR * p); +} + +/***************************************************************************** + * DispHTMLLinkElement dispinterface + */ +[ + hidden, + uuid(3050f524-98b5-11cf-bb82-00aa00bdce0b) +] +dispinterface DispHTMLLinkElement +{ +properties: +methods: + WINE_HTMLELEMENT_DISPINTERFACE_DECL; + + [propput, id(DISPID_IHTMLLINKELEMENT_HREF), displaybind, bindable] + void href(BSTR v); + + [propget, id(DISPID_IHTMLLINKELEMENT_HREF), displaybind, bindable] + BSTR href(); + + [propput, id(DISPID_IHTMLLINKELEMENT_REL), displaybind, bindable] + void rel(BSTR v); + + [propget, id(DISPID_IHTMLLINKELEMENT_REL), displaybind, bindable] + BSTR rel(); + + [propput, id(DISPID_IHTMLLINKELEMENT_REV), displaybind, bindable] + void rev(BSTR v); + + [propget, id(DISPID_IHTMLLINKELEMENT_REV), displaybind, bindable] + BSTR rev(); + + [propput, id(DISPID_IHTMLLINKELEMENT_TYPE), displaybind, bindable] + void type(BSTR v); + + [propget, id(DISPID_IHTMLLINKELEMENT_TYPE), displaybind, bindable] + BSTR type(); + + [propput, id(DISPID_IHTMLLINKELEMENT_ONLOAD), displaybind, bindable] + void onload(VARIANT v); + + [propget, id(DISPID_IHTMLLINKELEMENT_ONLOAD), displaybind, bindable] + VARIANT onload(); + + [propput, id(DISPID_IHTMLLINKELEMENT_ONERROR), displaybind, bindable] + void onerror(VARIANT v); + + [propget, id(DISPID_IHTMLLINKELEMENT_ONERROR), displaybind, bindable] + VARIANT onerror(); + + [propget, id(DISPID_IHTMLLINKELEMENT_STYLESHEET)] + IHTMLStyleSheet *styleSheet(); + + [propput, id(DISPID_IHTMLLINKELEMENT_MEDIA), displaybind, bindable] + void media(BSTR v); + + [propget, id(DISPID_IHTMLLINKELEMENT_MEDIA), displaybind, bindable] + BSTR media(); + + [propput, id(DISPID_IHTMLLINKELEMENT2_TARGET), displaybind, bindable] + void target(BSTR v); + + [propget, id(DISPID_IHTMLLINKELEMENT2_TARGET), displaybind, bindable] + BSTR target(); + + [propput, id(DISPID_IHTMLLINKELEMENT3_CHARSET), displaybind, bindable] + void charset(BSTR v); + + [propget, id(DISPID_IHTMLLINKELEMENT3_CHARSET), displaybind, bindable] + BSTR charset(); + + [propput, id(DISPID_IHTMLLINKELEMENT3_HREFLANG), displaybind, bindable] + void hreflang(BSTR v); + + [propget, id(DISPID_IHTMLLINKELEMENT3_HREFLANG), displaybind, bindable] + BSTR hreflang(); + + [propput, id(DISPID_IHTMLLINKELEMENT4_IE8_HREF)] + void ie8_href(BSTR v); + + [propget, id(DISPID_IHTMLLINKELEMENT4_IE8_HREF)] + BSTR ie8_href(); +} + +/***************************************************************************** * IHTMLTxtRange interface */ [

1 0