wine-commits June 2008

wine-commits@winehq.org

3 participants
944 discussions

Juan Lang : inetmib1: Use a helper function to get the item and instance of the MIB2 IP address table .
by Alexandre Julliard 25 Jun '08

25 Jun '08

Module: wine Branch: master Commit: 297190fde2ef3d15d5c46ea1b393389668e95bec URL: http://source.winehq.org/git/wine.git/?a=commit;h=297190fde2ef3d15d5c46ea1b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jun 25 09:30:59 2008 -0700 inetmib1: Use a helper function to get the item and instance of the MIB2 IP address table. --- dlls/inetmib1/main.c | 210 +++++++++++++++++++++++++++++-------------------- 1 files changed, 124 insertions(+), 86 deletions(-) diff --git a/dlls/inetmib1/main.c b/dlls/inetmib1/main.c index f97a5ee..b6dea35 100644 --- a/dlls/inetmib1/main.c +++ b/dlls/inetmib1/main.c @@ -311,6 +311,126 @@ static AsnInteger32 getItemFromOid(AsnObjectIdentifier *oid, return ret; } +struct GenericTable +{ + DWORD numEntries; + BYTE entries[1]; +}; + +/* Finds the index in table whose IP address (at offset addressOffset within the + * entry) matches that given the OID, which is assumed to have at least 4 IDs. + */ +static UINT findOIDIPAddressInTable(AsnObjectIdentifier *oid, + struct GenericTable *table, size_t tableEntrySize, size_t addressOffset) +{ + DWORD addr; + UINT i, index = 0; + + /* Map the IDs to an IP address in little-endian order */ + addr = (BYTE)oid->ids[3] << 24 | (BYTE)oid->ids[2] << 16 | + (BYTE)oid->ids[1] << 8 | (BYTE)oid->ids[0]; + /* Find the item whose address matches */ + for (i = 0; !index && i < table->numEntries; i++) + { + DWORD tableAddr = + *(DWORD *)(table->entries + i * tableEntrySize + addressOffset); + + if (addr == tableAddr) + index = i + 1; + } + return index; +} + +/* Given an OID and a base OID that it must begin with, finds the item and + * element of the table whose IP address matches the instance from the OID. + * E.g., given an OID foo.1.2.3.4.5 and a base OID foo, returns item 1 and the + * index of the entry in the table whose IP address is 2.3.4.5. + * If bPduType is not SNMP_PDU_GETNEXT and either the item or instance is + * missing, returns SNMP_ERRORSTATUS_NOSUCHNAME. + * If bPduType is SNMP_PDU_GETNEXT, returns the successor to the item and + * instance, or item 1, instance 1 if either is missing. + */ +static AsnInteger32 getItemAndIpAddressInstanceFromOid(AsnObjectIdentifier *oid, + AsnObjectIdentifier *base, BYTE bPduType, struct GenericTable *table, + size_t tableEntrySize, size_t addressOffset, UINT *item, UINT *instance) +{ + AsnInteger32 ret = SNMP_ERRORSTATUS_NOERROR; + + if (!table) + return SNMP_ERRORSTATUS_NOSUCHNAME; + + switch (bPduType) + { + case SNMP_PDU_GETNEXT: + if (SnmpUtilOidNCmp(oid, base, base->idLength) < 0) + { + /* Return the first item and instance from the table */ + *item = 1; + *instance = 1; + } + else if (!SnmpUtilOidNCmp(oid, base, base->idLength) && + oid->idLength < base->idLength + 5) + { + /* Either the table or an item is specified, but the instance is + * not. + */ + *instance = 1; + if (oid->idLength >= base->idLength + 1) + { + *item = oid->ids[base->idLength]; + if (!*item) + *item = 1; + } + else + *item = 1; + } + else if (!SnmpUtilOidNCmp(oid, base, base->idLength) && + oid->idLength == base->idLength + 5) + { + *item = oid->ids[base->idLength]; + if (!*item) + { + *instance = 1; + *item = 1; + } + else + { + AsnObjectIdentifier ipOid = { 4, oid->ids + base->idLength + 1 + }; + + *instance = findOIDIPAddressInTable(&ipOid, table, + tableEntrySize, addressOffset) + 1; + if (*instance > table->numEntries) + ret = SNMP_ERRORSTATUS_NOSUCHNAME; + } + } + else + ret = SNMP_ERRORSTATUS_NOSUCHNAME; + break; + default: + if (!SnmpUtilOidNCmp(oid, base, base->idLength) && + oid->idLength == base->idLength + 5) + { + *item = oid->ids[base->idLength]; + if (!*item) + ret = SNMP_ERRORSTATUS_NOSUCHNAME; + else + { + AsnObjectIdentifier ipOid = { 4, oid->ids + base->idLength + 1 + }; + + *instance = findOIDIPAddressInTable(&ipOid, table, + tableEntrySize, addressOffset); + if (!*instance) + ret = SNMP_ERRORSTATUS_NOSUCHNAME; + } + } + else + ret = SNMP_ERRORSTATUS_NOSUCHNAME; + } + return ret; +} + static struct structToAsnValue mib2IfEntryMap[] = { { FIELD_OFFSET(MIB_IFROW, dwIndex), copyInt }, { FIELD_OFFSET(MIB_IFROW, dwDescrLen), copyLengthPrecededString }, @@ -516,92 +636,10 @@ static BOOL mib2IpAddrQuery(BYTE bPduType, SnmpVarBind *pVarBind, { case SNMP_PDU_GET: case SNMP_PDU_GETNEXT: - *pErrorStatus = 0; - if (!ipAddrTable) - { - /* There is no address present, so let the caller deal with - * finding the successor. - */ - *pErrorStatus = SNMP_ERRORSTATUS_NOSUCHNAME; - } - else if (!SnmpUtilOidNCmp(&pVarBind->name, &myOid, myOid.idLength) && - pVarBind->name.idLength < myOid.idLength + 5) - { - /* Either the table or an element within the table is specified, - * but the instance is not. - */ - if (bPduType == SNMP_PDU_GET) - { - /* Can't get an interface entry without specifying the - * instance. - */ - *pErrorStatus = SNMP_ERRORSTATUS_NOSUCHNAME; - } - else - { - /* Get the first address */ - tableIndex = 1; - if (pVarBind->name.idLength == myOid.idLength + 1) - item = pVarBind->name.ids[myOid.idLength]; - else - item = 1; - } - } - else if (!SnmpUtilOidNCmp(&pVarBind->name, &myOid, myOid.idLength) && - pVarBind->name.idLength == myOid.idLength + 5) - { - item = pVarBind->name.ids[myOid.idLength]; - if (!item) - { - if (bPduType == SNMP_PDU_GET) - *pErrorStatus = SNMP_ERRORSTATUS_NOSUCHNAME; - else - { - tableIndex = 1; - item = 1; - } - } - else if (item - 1 >= DEFINE_SIZEOF(mib2IpAddrMap)) - *pErrorStatus = SNMP_ERRORSTATUS_NOSUCHNAME; - else - { - DWORD addr; - UINT i; - - /* Map the IDs to an IP address in little-endian order */ - addr = - (BYTE)pVarBind->name.ids[myOid.idLength + 4] << 24 | - (BYTE)pVarBind->name.ids[myOid.idLength + 3] << 16 | - (BYTE)pVarBind->name.ids[myOid.idLength + 2] << 8 | - (BYTE)pVarBind->name.ids[myOid.idLength + 1]; - /* Find the item whose address matches */ - for (i = 0; !tableIndex && i < ipAddrTable->dwNumEntries; i++) - if (addr == ipAddrTable->table[i].dwAddr) - tableIndex = i + 1; - if (bPduType == SNMP_PDU_GETNEXT) - { - if (!tableIndex) - { - /* No address matched, so let caller find successor */ - *pErrorStatus = SNMP_ERRORSTATUS_NOSUCHNAME; - } - else - { - /* We want the successor to the matching address */ - tableIndex++; - } - } - if (tableIndex > ipAddrTable->dwNumEntries) - *pErrorStatus = SNMP_ERRORSTATUS_NOSUCHNAME; - } - } - else - { - /* Some item after the address table was requested, so let the - * caller deal with finding a successor. - */ - *pErrorStatus = SNMP_ERRORSTATUS_NOSUCHNAME; - } + *pErrorStatus = getItemAndIpAddressInstanceFromOid(&pVarBind->name, + &myOid, bPduType, (struct GenericTable *)ipAddrTable, + sizeof(MIB_IPADDRROW), FIELD_OFFSET(MIB_IPADDRROW, dwAddr), &item, + &tableIndex); if (!*pErrorStatus) { assert(tableIndex);

1 0

Juan Lang : inetmib1: Use a helper function to get the item from the Oid.
by Alexandre Julliard 25 Jun '08

25 Jun '08

Module: wine Branch: master Commit: 969bc943ac3a2779d95accd99ad44fe2e453122d URL: http://source.winehq.org/git/wine.git/?a=commit;h=969bc943ac3a2779d95accd99… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jun 25 09:29:00 2008 -0700 inetmib1: Use a helper function to get the item from the Oid. --- dlls/inetmib1/main.c | 100 +++++++++++++++++++++++++++++--------------------- 1 files changed, 58 insertions(+), 42 deletions(-) diff --git a/dlls/inetmib1/main.c b/dlls/inetmib1/main.c index 2500fa1..f97a5ee 100644 --- a/dlls/inetmib1/main.c +++ b/dlls/inetmib1/main.c @@ -260,6 +260,57 @@ static AsnInteger32 getItemAndIntegerInstanceFromOid(AsnObjectIdentifier *oid, return ret; } +/* Given an OID and a base OID that it must begin with, finds the item from the + * OID. E.g., given an OID foo.1 and a base OID foo, returns item 1. + * If bPduType is not SNMP_PDU_GETNEXT and the item is missing, returns + * SNMP_ERRORSTATUS_NOSUCHNAME. + * If bPduType is SNMP_PDU_GETNEXT, returns the successor to the item, or item + * 1 if the item is missing. + */ +static AsnInteger32 getItemFromOid(AsnObjectIdentifier *oid, + AsnObjectIdentifier *base, BYTE bPduType, UINT *item) +{ + AsnInteger32 ret = SNMP_ERRORSTATUS_NOERROR; + + switch (bPduType) + { + case SNMP_PDU_GETNEXT: + if (SnmpUtilOidNCmp(oid, base, base->idLength) < 0) + *item = 1; + else if (!SnmpUtilOidNCmp(oid, base, base->idLength)) + { + if (oid->idLength == base->idLength) + { + /* The item is missing, assume the first item */ + *item = 1; + } + else + *item = oid->ids[base->idLength] + 1; + } + else + ret = SNMP_ERRORSTATUS_NOSUCHNAME; + break; + default: + if (!SnmpUtilOidNCmp(oid, base, base->idLength)) + { + if (oid->idLength == base->idLength) + { + /* The item is missing */ + ret = SNMP_ERRORSTATUS_NOSUCHNAME; + } + else + { + *item = oid->ids[base->idLength]; + if (!*item) + ret = SNMP_ERRORSTATUS_NOSUCHNAME; + } + } + else + ret = SNMP_ERRORSTATUS_NOSUCHNAME; + } + return ret; +} + static struct structToAsnValue mib2IfEntryMap[] = { { FIELD_OFFSET(MIB_IFROW, dwIndex), copyInt }, { FIELD_OFFSET(MIB_IFROW, dwDescrLen), copyLengthPrecededString }, @@ -401,30 +452,14 @@ static BOOL mib2IpStatsQuery(BYTE bPduType, SnmpVarBind *pVarBind, switch (bPduType) { case SNMP_PDU_GET: - if (!SnmpUtilOidNCmp(&pVarBind->name, &myOid, myOid.idLength) && - pVarBind->name.idLength == myOid.idLength + 1) - { - item = pVarBind->name.ids[pVarBind->name.idLength - 1]; - *pErrorStatus = mapStructEntryToValue(mib2IpMap, - DEFINE_SIZEOF(mib2IpMap), &ipStats, item, bPduType, pVarBind); - } - else - *pErrorStatus = SNMP_ERRORSTATUS_NOSUCHNAME; - break; case SNMP_PDU_GETNEXT: - if (!SnmpUtilOidCmp(&pVarBind->name, &myOid) || - SnmpUtilOidNCmp(&pVarBind->name, &myOid, myOid.idLength) < 0) - item = 1; - else if (!SnmpUtilOidNCmp(&pVarBind->name, &myOid, myOid.idLength) && - pVarBind->name.idLength == myOid.idLength + 1) - item = pVarBind->name.ids[pVarBind->name.idLength - 1] + 1; - else - *pErrorStatus = SNMP_ERRORSTATUS_NOSUCHNAME; - if (item) + *pErrorStatus = getItemFromOid(&pVarBind->name, &myOid, bPduType, + &item); + if (!*pErrorStatus) { *pErrorStatus = mapStructEntryToValue(mib2IpMap, DEFINE_SIZEOF(mib2IpMap), &ipStats, item, bPduType, pVarBind); - if (!*pErrorStatus) + if (!*pErrorStatus && bPduType == SNMP_PDU_GETNEXT) { AsnObjectIdentifier oid; @@ -434,8 +469,6 @@ static BOOL mib2IpStatsQuery(BYTE bPduType, SnmpVarBind *pVarBind, SnmpUtilOidAppend(&pVarBind->name, &oid); } } - else - *pErrorStatus = SNMP_ERRORSTATUS_NOSUCHNAME; break; case SNMP_PDU_SET: *pErrorStatus = SNMP_ERRORSTATUS_READONLY; @@ -656,27 +689,10 @@ static BOOL mib2IcmpQuery(BYTE bPduType, SnmpVarBind *pVarBind, switch (bPduType) { case SNMP_PDU_GET: - if (!SnmpUtilOidNCmp(&pVarBind->name, &myOid, myOid.idLength) && - pVarBind->name.idLength == myOid.idLength + 1) - { - item = pVarBind->name.ids[pVarBind->name.idLength - 1]; - *pErrorStatus = mapStructEntryToValue(mib2IcmpMap, - DEFINE_SIZEOF(mib2IcmpMap), &icmpStats, item, bPduType, - pVarBind); - } - else - *pErrorStatus = SNMP_ERRORSTATUS_NOSUCHNAME; - break; case SNMP_PDU_GETNEXT: - if (!SnmpUtilOidCmp(&pVarBind->name, &myOid) || - SnmpUtilOidNCmp(&pVarBind->name, &myOid, myOid.idLength) < 0) - item = 1; - else if (!SnmpUtilOidNCmp(&pVarBind->name, &myOid, myOid.idLength) && - pVarBind->name.idLength == myOid.idLength + 1) - item = pVarBind->name.ids[pVarBind->name.idLength - 1] + 1; - else - *pErrorStatus = SNMP_ERRORSTATUS_NOSUCHNAME; - if (item) + *pErrorStatus = getItemFromOid(&pVarBind->name, &myOid, bPduType, + &item); + if (!*pErrorStatus) { *pErrorStatus = mapStructEntryToValue(mib2IcmpMap, DEFINE_SIZEOF(mib2IcmpMap), &icmpStats, item, bPduType,

1 0

Juan Lang : inetmib1: Use a helper function to get the item and instance of the MIB2 interface table .
by Alexandre Julliard 25 Jun '08

25 Jun '08

Module: wine Branch: master Commit: 3aa93652a48cd82abfc135a76031732ea45daedd URL: http://source.winehq.org/git/wine.git/?a=commit;h=3aa93652a48cd82abfc135a76… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jun 25 09:27:53 2008 -0700 inetmib1: Use a helper function to get the item and instance of the MIB2 interface table. --- dlls/inetmib1/main.c | 120 ++++++++++++++++++++++++++++++++------------------ 1 files changed, 77 insertions(+), 43 deletions(-) diff --git a/dlls/inetmib1/main.c b/dlls/inetmib1/main.c index 7263ca5..2500fa1 100644 --- a/dlls/inetmib1/main.c +++ b/dlls/inetmib1/main.c @@ -193,6 +193,73 @@ static void copyOperStatus(AsnAny *value, void *src) }; } +/* Given an OID and a base OID that it must begin with, finds the item and + * integer instance from the OID. E.g., given an OID foo.1.2 and a base OID + * foo, returns item 1 and instance 2. + * If bPduType is not SNMP_PDU_GETNEXT and either the item or instance is + * missing, returns SNMP_ERRORSTATUS_NOSUCHNAME. + * If bPduType is SNMP_PDU_GETNEXT, returns the successor to the item and + * instance, or item 1, instance 1 if either is missing. + */ +static AsnInteger32 getItemAndIntegerInstanceFromOid(AsnObjectIdentifier *oid, + AsnObjectIdentifier *base, BYTE bPduType, UINT *item, UINT *instance) +{ + AsnInteger32 ret = SNMP_ERRORSTATUS_NOERROR; + + switch (bPduType) + { + case SNMP_PDU_GETNEXT: + if (SnmpUtilOidNCmp(oid, base, base->idLength) < 0) + { + *item = 1; + *instance = 1; + } + else if (!SnmpUtilOidNCmp(oid, base, base->idLength)) + { + if (oid->idLength == base->idLength || + oid->idLength == base->idLength + 1) + { + /* Either the table or an item within the table is specified, + * but the instance is not. Get the first instance. + */ + *instance = 1; + if (oid->idLength == base->idLength + 1) + *item = oid->ids[base->idLength]; + else + *item = 1; + } + else + { + *item = oid->ids[base->idLength]; + *instance = oid->ids[base->idLength + 1] + 1; + } + } + else + ret = SNMP_ERRORSTATUS_NOSUCHNAME; + break; + default: + if (!SnmpUtilOidNCmp(oid, base, base->idLength)) + { + if (oid->idLength == base->idLength || + oid->idLength == base->idLength + 1) + { + /* Either the table or an item within the table is specified, + * but the instance is not. + */ + ret = SNMP_ERRORSTATUS_NOSUCHNAME; + } + else + { + *item = oid->ids[base->idLength]; + *instance = oid->ids[base->idLength + 1]; + } + } + else + ret = SNMP_ERRORSTATUS_NOSUCHNAME; + } + return ret; +} + static struct structToAsnValue mib2IfEntryMap[] = { { FIELD_OFFSET(MIB_IFROW, dwIndex), copyInt }, { FIELD_OFFSET(MIB_IFROW, dwDescrLen), copyLengthPrecededString }, @@ -238,44 +305,12 @@ static BOOL mib2IfEntryQuery(BYTE bPduType, SnmpVarBind *pVarBind, */ *pErrorStatus = SNMP_ERRORSTATUS_NOSUCHNAME; } - else if (!SnmpUtilOidNCmp(&pVarBind->name, &entryOid, entryOid.idLength)) + else { UINT tableIndex = 0, item = 0; - *pErrorStatus = 0; - if (pVarBind->name.idLength == entryOid.idLength || - pVarBind->name.idLength == entryOid.idLength + 1) - { - /* Either the table or an element within the table is specified, - * but the instance is not. - */ - if (bPduType == SNMP_PDU_GET) - { - /* Can't get an interface entry without specifying the - * instance. - */ - *pErrorStatus = SNMP_ERRORSTATUS_NOSUCHNAME; - } - else - { - /* Get the first interface */ - tableIndex = 1; - if (pVarBind->name.idLength == entryOid.idLength + 1) - item = pVarBind->name.ids[entryOid.idLength]; - else - item = 1; - } - } - else - { - tableIndex = pVarBind->name.ids[entryOid.idLength + 1]; - item = pVarBind->name.ids[entryOid.idLength]; - if (bPduType == SNMP_PDU_GETNEXT) - { - tableIndex++; - item = 1; - } - } + *pErrorStatus = getItemAndIntegerInstanceFromOid(&pVarBind->name, + &entryOid, bPduType, &item, &tableIndex); if (!*pErrorStatus) { assert(tableIndex); @@ -296,20 +331,19 @@ static BOOL mib2IfEntryQuery(BYTE bPduType, SnmpVarBind *pVarBind, oid.idLength = 1; oid.ids = &item; SnmpUtilOidAppend(&pVarBind->name, &oid); + /* According to RFC1158, the value of the interface + * index must vary between 1 and ifNumber (the number + * of interfaces), so use the 1-based table index + * directly, rather than assuming that IPHlpApi's + * dwIndex will have the correct range. + */ oid.idLength = 1; - oid.ids = &ifTable->table[tableIndex - 1].dwIndex; + oid.ids = &tableIndex; SnmpUtilOidAppend(&pVarBind->name, &oid); } } } } - else - { - *pErrorStatus = SNMP_ERRORSTATUS_NOSUCHNAME; - /* Caller deals with OID if bPduType == SNMP_PDU_GETNEXT, so don't - * need to set it here. - */ - } break; case SNMP_PDU_SET: *pErrorStatus = SNMP_ERRORSTATUS_READONLY;

1 0

Rob Shearman : include: Add more interfaces and types to msinkaut.idl.
by Alexandre Julliard 25 Jun '08

25 Jun '08

Module: wine Branch: master Commit: 60945cd6c5275a82e7fc99e12c3f3f5c668ac954 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60945cd6c5275a82e7fc99e12… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Wed Jun 25 18:29:14 2008 +0100 include: Add more interfaces and types to msinkaut.idl. --- include/msinkaut.idl | 376 +++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 344 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=60945cd6c5275a82e7fc9…

1 0

Rob Shearman : include: Don't import files in control.idl that aren' t imported on Windows.
by Alexandre Julliard 25 Jun '08

25 Jun '08

Module: wine Branch: master Commit: 088b3748d4903c892f793c1f3c64cc9fdc7f8c4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=088b3748d4903c892f793c1f3… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Wed Jun 25 18:29:06 2008 +0100 include: Don't import files in control.idl that aren't imported on Windows. --- include/axcore.idl | 4 ++++ include/control.idl | 10 ++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/include/axcore.idl b/include/axcore.idl index bb9f5e7..52e6959 100644 --- a/include/axcore.idl +++ b/include/axcore.idl @@ -48,7 +48,11 @@ cpp_quote("#define MAX_PIN_NAME 128") cpp_quote("#define MAX_FILTER_NAME 128") typedef LONGLONG REFERENCE_TIME; + +cpp_quote("#ifndef REFTIME_DEFINED") +cpp_quote("#define REFTIME_DEFINED") typedef DOUBLE REFTIME; +cpp_quote("#endif") typedef DWORD_PTR HSEMAPHORE; typedef DWORD_PTR HEVENT; diff --git a/include/control.idl b/include/control.idl index af8a2f9..ddb5279 100644 --- a/include/control.idl +++ b/include/control.idl @@ -17,10 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -cpp_quote("#if 0") /* FIXME: these files are not included on Windows */ -import "shldisp.idl"; -import "strmif.idl"; -cpp_quote("#endif") +import "oaidl.idl"; interface IMediaControl; interface IBasicAudio; @@ -34,6 +31,11 @@ typedef long OAFilterState; typedef LONG_PTR OAHWND; typedef LONG_PTR OAEVENT; +cpp_quote("#ifndef REFTIME_DEFINED") +cpp_quote("#define REFTIME_DEFINED") +typedef DOUBLE REFTIME; +cpp_quote("#endif") + /***************************************************************************** * IMediaControl interface */

1 0

Rob Shearman : include: Add more IXMLDOMNotation, IXMLDOMEntity, IXMLDOMEntityReference and IXMLDOMImplementation interfaces to xmldom.idl.
by Alexandre Julliard 25 Jun '08

25 Jun '08

Module: wine Branch: master Commit: 8d0699e03b161769afe34db5556266cc2fe01bbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d0699e03b161769afe34db55… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Wed Jun 25 18:28:59 2008 +0100 include: Add more IXMLDOMNotation, IXMLDOMEntity, IXMLDOMEntityReference and IXMLDOMImplementation interfaces to xmldom.idl. --- include/xmldom.idl | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++ include/xmldomdid.h | 15 ++++++++++ 2 files changed, 87 insertions(+), 0 deletions(-) diff --git a/include/xmldom.idl b/include/xmldom.idl index 1aac0ba..bf85acf 100644 --- a/include/xmldom.idl +++ b/include/xmldom.idl @@ -591,6 +591,7 @@ interface IXMLDOMCDATASection : IXMLDOMText { /* empty */ } + [ local, object, @@ -618,6 +619,77 @@ local, object, odl, dual, +nonextensible, +oleautomation, +uuid(2933bf8c-7b36-11d2-b20e-00c04f983e60), +pointer_default(unique) +] +interface IXMLDOMNotation : IXMLDOMNode +{ + [propget, id(DISPID_DOM_NOTATION_PUBLICID)] + HRESULT publicId([out, retval] VARIANT *publicId); + + [propget, id(DISPID_DOM_NOTATION_SYSTEMID)] + HRESULT systemId([out, retval] VARIANT *systemId); +} + +[ +local, +object, +odl, +dual, +nonextensible, +oleautomation, +uuid(2933bf8d-7b36-11d2-b20e-00c04f983e60), +pointer_default(unique) +] +interface IXMLDOMEntity : IXMLDOMNode +{ + [propget, id(DISPID_DOM_ENTITY_PUBLICID)] + HRESULT publicId([out, retval] VARIANT *publicId); + + [propget, id(DISPID_DOM_ENTITY_SYSTEMID)] + HRESULT systemId([out, retval] VARIANT *systemId); + + [propget, id(DISPID_DOM_ENTITY_NOTATIONNAME)] + HRESULT notationName([out, retval] BSTR *name); +} + +[ +local, +object, +odl, +dual, +nonextensible, +oleautomation, +uuid(2933bf8e-7b36-11d2-b20e-00c04f983e60), +pointer_default(unique) +] +interface IXMLDOMEntityReference : IXMLDOMNode +{ +} + +[ +local, +object, +odl, +dual, +nonextensible, +oleautomation, +uuid(2933bf8f-7b36-11d2-b20e-00c04f983e60), +pointer_default(unique) +] +interface IXMLDOMImplementation : IDispatch +{ + [id(DISPID_DOM_IMPLEMENTATION_HASFEATURE)] + HRESULT hasFeature([in] BSTR feature, [in] BSTR version, [out, retval] VARIANT_BOOL *pbool); +} + +[ +local, +object, +odl, +dual, oleautomation, /*nonextensible,*/ helpstring("structure for reporting parse errors"), diff --git a/include/xmldomdid.h b/include/xmldomdid.h index 4e8dc85..a299157 100644 --- a/include/xmldomdid.h +++ b/include/xmldomdid.h @@ -171,6 +171,21 @@ #define DISPID_DOM_DOCUMENTTYPE_NOTATIONS 131 #define DISPID_DOM_DOCUMENTTYPE__TOP 132 +#define DISPID_DOM_NOTATION 133 +#define DISPID_DOM_NOTATION_PUBLICID 134 +#define DISPID_DOM_NOTATION_SYSTEMID 135 +#define DISPID_DOM_NOTATION__TOP 136 + +#define DISPID_DOM_ENTITY 137 +#define DISPID_DOM_ENTITY_PUBLICID 138 +#define DISPID_DOM_ENTITY_SYSTEMID 139 +#define DISPID_DOM_ENTITY_NOTATIONNAME 140 +#define DISPID_DOM_ENTITY__TOP 141 + +#define DISPID_DOM_IMPLEMENTATION 142 +#define DISPID_DOM_IMPLEMENTATION_HASFEATURE 143 +#define DISPID_DOM_IMPLEMENTATION__TOP 144 + #define DISPID_DOM_ERROR 0x000000b0 #define DISPID_DOM_ERROR_ERRORCODE 0x000000b1

1 0

Adam Petaccia : gdiplus: Tests for new font functions.
by Alexandre Julliard 25 Jun '08

25 Jun '08

Module: wine Branch: master Commit: fe3d38d1a0e19e503048f8338f8f26cd0668d364 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe3d38d1a0e19e503048f8338… Author: Adam Petaccia <adam(a)tpetaccia.com> Date: Sat Jun 21 13:02:56 2008 -0400 gdiplus: Tests for new font functions. --- dlls/gdiplus/tests/font.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 41 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 5cc9bc2..93efbc4 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -38,6 +38,46 @@ static const char *debugstr_w(LPCWSTR str) return buf; } + +static void test_createfont(void) +{ + GpFontFamily* fontfamily = NULL; + GpFont* font = NULL; + GpStatus stat; + Unit unit; + UINT i; + REAL size; + + stat = GdipCreateFontFamilyFromName(nonexistant, NULL, &fontfamily); + expect (FontFamilyNotFound, stat); + stat = GdipDeleteFont(font); + expect (InvalidParameter, stat); + stat = GdipCreateFontFamilyFromName(arial, NULL, &fontfamily); + expect (Ok, stat); + stat = GdipCreateFont(fontfamily, 12, FontStyleRegular, UnitPoint, &font); + expect (Ok, stat); + stat = GdipGetFontUnit (font, &unit); + expect (Ok, stat); + expect (UnitPoint, unit); + + /* Test to see if returned size is based on unit (its not) */ + GdipGetFontSize(font, &size); + ok (size == 12, "Expected 12, got %f\n", size); + GdipDeleteFont(font); + + /* Make sure everything is converted correctly for all Units */ + for (i = UnitWorld; i <=UnitMillimeter; i++) + { + if (i == UnitDisplay) continue; /* Crashes WindowsXP, wtf? */ + GdipCreateFont(fontfamily, 24, FontStyleRegular, i, &font); + GdipGetFontSize (font, &size); + ok (size == 24, "Expected 24, got %f (with unit: %d)\n", size, i); + GdipGetFontUnit (font, &unit); + expect (i, unit); + GdipDeleteFont(font); + } +} + static void test_logfont(void) { LOGFONTW lfw, lfw2; @@ -207,6 +247,7 @@ START_TEST(font) GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); + test_createfont(); test_logfont(); test_fontfamily(); test_getgenerics();

1 0

Adam Petaccia : gdiplus: Implement GdipGetFontSize.
by Alexandre Julliard 25 Jun '08

25 Jun '08

Module: wine Branch: master Commit: 082529b1bf0849aaa9d74d5441b2d8672c4878a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=082529b1bf0849aaa9d74d544… Author: Adam Petaccia <adam(a)tpetaccia.com> Date: Sat Jun 21 13:02:55 2008 -0400 gdiplus: Implement GdipGetFontSize. --- dlls/gdiplus/font.c | 25 +++++++++++++++++++++++++ dlls/gdiplus/gdiplus.spec | 2 +- include/gdiplusflat.h | 1 + 3 files changed, 27 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index cdfd7f2..0bb9fc7 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -236,6 +236,31 @@ GpStatus WINGDIPAPI GdipCreateFontFromDC(HDC hdc, GpFont **font) return GdipCreateFontFromLogfontW(hdc, &lfw, font); } +/****************************************************************************** + * GdipGetFontSize [GDIPLUS.@] + * + * Returns the size of the font in Units + * + * PARAMS + * *font [I] The font to retrieve size from + * *size [O] Pointer to hold retrieved value + * + * RETURNS + * SUCCESS: Ok + * FAILURE: InvalidParamter (font or size was NULL) + * + * NOTES + * Size returned is actually emSize -- not internal size used for drawing. + */ +GpStatus WINGDIPAPI GdipGetFontSize(GpFont *font, REAL *size) +{ + if (!(font && size)) return InvalidParameter; + + *size = font->emSize; + + return Ok; +} + /******************************************************************************* * GdipGetFontUnit [GDIPLUS.@] * diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 9950c0f..dd98c50 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -269,7 +269,7 @@ @ stub GdipGetFontCollectionFamilyList @ stub GdipGetFontHeight @ stub GdipGetFontHeightGivenDPI -@ stub GdipGetFontSize +@ stdcall GdipGetFontSize(ptr ptr) @ stub GdipGetFontStyle @ stdcall GdipGetFontUnit(ptr ptr) @ stdcall GdipGetGenericFontFamilyMonospace(ptr) diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index a3a12f3..b615094 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -350,6 +350,7 @@ GpStatus WINGDIPAPI GdipDeleteFont(GpFont*); GpStatus WINGDIPAPI GdipGetLogFontW(GpFont*,GpGraphics*,LOGFONTW*); GpStatus WINGDIPAPI GdipCloneFont(GpFont*,GpFont**); GpStatus WINGDIPAPI GdipGetFontUnit(GpFont*, Unit*); +GpStatus WINGDIPAPI GdipGetFontSize(GpFont*, REAL*); GpStatus WINGDIPAPI GdipCreateFontFamilyFromName(GDIPCONST WCHAR*, GpFontCollection*, GpFontFamily**);

1 0

Adam Petaccia : gdiplus: Implement GdipGetFontUnit.
by Alexandre Julliard 25 Jun '08

25 Jun '08

Module: wine Branch: master Commit: 1919b124a2ab49182bb96f2ecd4b43e870d1ab93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1919b124a2ab49182bb96f2ec… Author: Adam Petaccia <adam(a)tpetaccia.com> Date: Sat Jun 21 13:02:54 2008 -0400 gdiplus: Implement GdipGetFontUnit. --- dlls/gdiplus/font.c | 20 ++++++++++++++++++++ dlls/gdiplus/gdiplus.spec | 2 +- include/gdiplusflat.h | 1 + 3 files changed, 22 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 9762356..cdfd7f2 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -236,6 +236,26 @@ GpStatus WINGDIPAPI GdipCreateFontFromDC(HDC hdc, GpFont **font) return GdipCreateFontFromLogfontW(hdc, &lfw, font); } +/******************************************************************************* + * GdipGetFontUnit [GDIPLUS.@] + * + * PARAMS + * font [I] Font to retrieve from + * unit [O] Return value + * + * RETURNS + * FAILURE: font or unit was NULL + * OK: otherwise + */ +GpStatus WINGDIPAPI GdipGetFontUnit(GpFont *font, Unit *unit) +{ + if (!(font && unit)) return InvalidParameter; + + *unit = font->unit; + + return Ok; +} + /* FIXME: use graphics */ GpStatus WINGDIPAPI GdipGetLogFontW(GpFont *font, GpGraphics *graphics, LOGFONTW *lfw) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index f43a63e..9950c0f 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -271,7 +271,7 @@ @ stub GdipGetFontHeightGivenDPI @ stub GdipGetFontSize @ stub GdipGetFontStyle -@ stub GdipGetFontUnit +@ stdcall GdipGetFontUnit(ptr ptr) @ stdcall GdipGetGenericFontFamilyMonospace(ptr) @ stdcall GdipGetGenericFontFamilySansSerif(ptr) @ stdcall GdipGetGenericFontFamilySerif(ptr) diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index a8caf9b..a3a12f3 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -349,6 +349,7 @@ GpStatus WINGDIPAPI GdipCreateFontFromLogfontW(HDC,GDIPCONST LOGFONTW*,GpFont**) GpStatus WINGDIPAPI GdipDeleteFont(GpFont*); GpStatus WINGDIPAPI GdipGetLogFontW(GpFont*,GpGraphics*,LOGFONTW*); GpStatus WINGDIPAPI GdipCloneFont(GpFont*,GpFont**); +GpStatus WINGDIPAPI GdipGetFontUnit(GpFont*, Unit*); GpStatus WINGDIPAPI GdipCreateFontFamilyFromName(GDIPCONST WCHAR*, GpFontCollection*, GpFontFamily**);

1 0

Adam Petaccia : gdiplus: Implement GdipCreateFont.
by Alexandre Julliard 25 Jun '08

25 Jun '08

Module: wine Branch: master Commit: b0b1588ab6520ad018ea8694d3373969a7c43c84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0b1588ab6520ad018ea8694d… Author: Adam Petaccia <adam(a)tpetaccia.com> Date: Sat Jun 21 13:02:53 2008 -0400 gdiplus: Implement GdipCreateFont. --- dlls/gdiplus/font.c | 126 ++++++++++++++++++++++++++++++++++++++++ dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/gdiplus_private.h | 2 + include/gdiplusenums.h | 11 ++++ include/gdiplusflat.h | 2 + 5 files changed, 142 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index fe514a3..9762356 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -22,6 +22,7 @@ #include "winbase.h" #include "wingdi.h" #include "winnls.h" +#include "winreg.h" #include "wine/debug.h" #include "wine/unicode.h" @@ -32,6 +33,128 @@ WINE_DEFAULT_DEBUG_CHANNEL (gdiplus); #include "gdiplus.h" #include "gdiplus_private.h" +static const REAL mm_per_pixel = 25.4; + +static inline REAL get_dpi (void) +{ + REAL dpi; + GpGraphics *graphics; + HDC hdc = GetDC(0); + GdipCreateFromHDC (hdc, &graphics); + GdipGetDpiX(graphics, &dpi); + ReleaseDC (0, hdc); + + return dpi; +} + +static inline REAL point_to_pixel (REAL point) +{ + return point * 1.5; +} + +static inline REAL inch_to_pixel (REAL inch) +{ + return inch * get_dpi(); +} + +static inline REAL document_to_pixel (REAL doc) +{ + return doc * (get_dpi() / 300.0); /* Per MSDN */ +} + +static inline REAL mm_to_pixel (REAL mm) +{ + return mm * (get_dpi() / mm_per_pixel); +} + +/******************************************************************************* + * GdipCreateFont [GDIPLUS.@] + * + * Create a new font based off of a FontFamily + * + * PARAMS + * *fontFamily [I] Family to base the font off of + * emSize [I] Size of the font + * style [I] Bitwise OR of FontStyle enumeration + * unit [I] Unit emSize is measured in + * **font [I] the resulting Font object + * + * RETURNS + * SUCCESS: Ok + * FAILURE: InvalidParameter if fontfamily or font is NULL. + * FAILURE: FontFamilyNotFound if an invalid FontFamily is given + * + * NOTES + * UnitDisplay is unsupported. + * emSize is stored separately from lfHeight, to hold the fraction. + */ +GpStatus WINGDIPAPI GdipCreateFont(GDIPCONST GpFontFamily *fontFamily, + REAL emSize, INT style, Unit unit, GpFont **font) +{ + WCHAR facename[LF_FACESIZE]; + LOGFONTW* lfw; + TEXTMETRICW* tmw; + GpStatus stat; + + if ((!fontFamily && fontFamily->FamilyName && font)) + return InvalidParameter; + + TRACE("%p (%s), %f, %d, %d, %p\n", fontFamily, + debugstr_w(fontFamily->FamilyName), emSize, style, unit, font); + + stat = GdipGetFamilyName (fontFamily, facename, 0); + if (stat != Ok) return stat; + *font = GdipAlloc(sizeof(GpFont)); + + tmw = fontFamily->tmw; + lfw = &((*font)->lfw); + ZeroMemory(&(*lfw), sizeof(*lfw)); + + lfw->lfWeight = tmw->tmWeight; + lfw->lfItalic = tmw->tmItalic; + lfw->lfUnderline = tmw->tmUnderlined; + lfw->lfStrikeOut = tmw->tmStruckOut; + lfw->lfCharSet = tmw->tmCharSet; + lfw->lfPitchAndFamily = tmw->tmPitchAndFamily; + lstrcpynW((lfw->lfFaceName), facename, sizeof(WCHAR) * LF_FACESIZE); + + switch (unit) + { + case UnitWorld: + /* FIXME: Figure out when World != Pixel */ + lfw->lfHeight = emSize; break; + case UnitDisplay: + FIXME("Unknown behavior for UnitDisplay! Please report!\n"); + /* FIXME: Figure out how this works... + * MSDN says that if "DISPLAY" is a monitor, then pixel should be + * used. That's not what I got. Tests on Windows revealed no output, + * and the tests in tests/font crash windows */ + lfw->lfHeight = 0; break; + case UnitPixel: + lfw->lfHeight = emSize; break; + case UnitPoint: + lfw->lfHeight = point_to_pixel(emSize); break; + case UnitInch: + lfw->lfHeight = inch_to_pixel(emSize); break; + case UnitDocument: + lfw->lfHeight = document_to_pixel(emSize); break; + case UnitMillimeter: + lfw->lfHeight = mm_to_pixel(emSize); break; + } + + lfw->lfHeight *= -1; + + lfw->lfWeight = style & FontStyleBold ? 700 : 400; + lfw->lfItalic = style & FontStyleItalic; + lfw->lfUnderline = style & FontStyleUnderline; + lfw->lfStrikeOut = style & FontStyleStrikeout; + + (*font)->unit = unit; + (*font)->emSize = emSize; + + return Ok; +} + GpStatus WINGDIPAPI GdipCreateFontFromLogfontW(HDC hdc, GDIPCONST LOGFONTW *logfont, GpFont **font) { @@ -51,6 +174,9 @@ GpStatus WINGDIPAPI GdipCreateFontFromLogfontW(HDC hdc, (*font)->lfw.lfUnderline = logfont->lfUnderline; (*font)->lfw.lfStrikeOut = logfont->lfStrikeOut; + (*font)->emSize = logfont->lfHeight; + (*font)->unit = UnitPixel; + hfont = CreateFontIndirectW(&(*font)->lfw); oldfont = SelectObject(hdc, hfont); GetTextMetricsW(hdc, &textmet); diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 7b71fc8..f43a63e 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -84,7 +84,7 @@ @ stub GdipCreateCachedBitmap @ stdcall GdipCreateCustomLineCap(ptr ptr long long ptr) @ stub GdipCreateEffect -@ stub GdipCreateFont +@ stdcall GdipCreateFont(ptr long long long ptr) @ stdcall GdipCreateFontFamilyFromName(wstr ptr ptr) @ stdcall GdipCreateFontFromDC(long ptr) @ stdcall GdipCreateFontFromLogfontA(long ptr ptr) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index acda374..6042835 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -174,6 +174,8 @@ struct GpImageAttributes{ struct GpFont{ LOGFONTW lfw; + REAL emSize; + Unit unit; }; struct GpStringFormat{ diff --git a/include/gdiplusenums.h b/include/gdiplusenums.h index a27ed5e..8e1148d 100644 --- a/include/gdiplusenums.h +++ b/include/gdiplusenums.h @@ -250,6 +250,16 @@ enum StringTrimming StringTrimmingEllipsisPath = 5 }; +enum FontStyle +{ + FontStyleRegular = 0, + FontStyleBold = 1, + FontStyleItalic = 2, + FontStyleBoldItalic = 3, + FontStyleUnderline = 4, + FontStyleStrikeout = 8 +}; + enum HotkeyPrefix { HotkeyPrefixNone = 0, @@ -330,6 +340,7 @@ typedef enum CompositingMode CompositingMode; typedef enum TextRenderingHint TextRenderingHint; typedef enum StringAlignment StringAlignment; typedef enum StringTrimming StringTrimming; +typedef enum FontStyle FontStyle; typedef enum StringFormatFlags StringFormatFlags; typedef enum HotkeyPrefix HotkeyPrefix; typedef enum PenAlignment GpPenAlignment; diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index b4cde21..a8caf9b 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -341,6 +341,8 @@ GpStatus WINGDIPAPI GdipSetImageAttributesColorMatrix(GpImageAttributes*, GpStatus WINGDIPAPI GdipSetImageAttributesWrapMode(GpImageAttributes*,WrapMode, ARGB,BOOL); +GpStatus WINGDIPAPI GdipCreateFont(GDIPCONST GpFontFamily*, REAL, INT, Unit, + GpFont**); GpStatus WINGDIPAPI GdipCreateFontFromDC(HDC,GpFont**); GpStatus WINGDIPAPI GdipCreateFontFromLogfontA(HDC,GDIPCONST LOGFONTA*,GpFont**); GpStatus WINGDIPAPI GdipCreateFontFromLogfontW(HDC,GDIPCONST LOGFONTW*,GpFont**);

1 0

← Newer
1
...
17
18
19
20
21
22
23
...
95
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2008