Merge branch 'pure'

Conflicts:
configure

Revert "mshtml: Implement IMarkupServices interface"

This reverts commit 9feae7ae31558096ea0e8d4d1705530f931592d2.

Revert "mshtml: Add ISelectionServices interface"

This reverts commit 5cd9ff8ebc42ca88e2d75f96c26cd0a85fe63df0.

Conflicts:

dlls/mshtml/service.c

Revert "mshtml: Add IHTMLEditServices interface"

This reverts commit 9628b3945b0dfa208c4fada9545db64aa5934e5a.

winemapi: Add attachment support (eterbug #6747).

winebrowser: Add attachment support (eterbug #6747).

winemapi: Address can contain SMTP: (eterbug #6747).

winemapi: Implement MAPIResolveName (eterbug #6747).

Merge branch 'pure'

Conflicts:
configure

Merge branch 'pure'

disable some fixmes

Conflicts:

dlls/advapi32/security.c

mshtml: Implement IMarkupServices interface

Conflicts:

dlls/mshtml/mshtml_private.h

Merge branch 'pure'

Revert "mshtml: Implement IMarkupServices interface"

This reverts commit 1fce703afdf4bac16bdffdb36842549195560805.

Revert "disable some fixmes"

This reverts commit 58b75656cd5ea8ae01bdc87153eb7782f82d8b2e.

Conflicts:

dlls/advapi32/security.c

mshtml: Implement IMarkupServices interface

Conflicts:

dlls/mshtml/mshtml_private.h

Merge branch 'pure'

Revert "mshtml: Implement IMarkupServices interface"

This reverts commit dcd289e5f3d60be3251dcfee72ab31a16e0f71d9.

mshtml: Implement IMarkupServices interface

Conflicts:

dlls/mshtml/mshtml_private.h

Merge branch 'pure'

Revert "mshtml: Implement IMarkupServices interface"

This reverts commit 0371739fc832cee61a77c52ae1b9c3d862616697.

Merge branch 'pure'

Merge branch 'pure'

Merge branch 'pure'

mshtml: Implement IMarkupServices interface

Conflicts:

dlls/mshtml/mshtml_private.h

Merge branch 'pure'

Revert "mshtml: Implement IMarkupServices interface"

This reverts commit e985614104dcba84cd5aee8f884305174e0b70d6.

Merge branch 'pure'

mshtml: Implement IMarkupServices interface

Conflicts:

dlls/mshtml/htmldoc.c
dlls/mshtml/mshtml_private.h

Revert "mshtml: Implement IMarkupServices interface"

This reverts commit 5d7461587bbce3b285215fd8dbd18832dae004f8.

mshtml: Implement IMarkupServices interface

Conflicts:

dlls/mshtml/htmldoc.c
dlls/mshtml/mshtml_private.h

mshtml: remove unused markup.c

Merge branch 'pure'

Conflicts:
dlls/mshtml/mshtml_private.h

Revert "mshtml: Implement IMarkupServices interface"

This reverts commit c2dc420a3f996158db7cd8102294cac3d97c1746.

Conflicts:

dlls/mshtml/Makefile.in
dlls/mshtml/htmldoc.c
dlls/mshtml/markup.c
dlls/mshtml/mshtml_private.h

Revert "mshtml:HTMLDocument_QueryInterface: add support for IProvideClassInfo interface"

This reverts commit 84919e3313cec04b1bd251762a74398c8ff8a092.

Conflicts:

dlls/mshtml/htmldoc.c
dlls/mshtml/mshtml_private.h

Convert unix paths in kernel32.

Do not convert path a second time (eterbug #6748).

New rules for new udev (eterbug #6754).

mshtml: IHTMLDocument2 iface handling clean up (for Etersoft code)

Conflicts:

dlls/mshtml/oleobj.c
dlls/mshtml/persist.c

Revert "mshtml: IHTMLDocument2 iface handling clean up (for Etersoft code)"

This reverts commit 30c3292932f0f02a6ec18fcddbb0fd6295ae5fa8.

Conflicts:

dlls/mshtml/oleobj.c
dlls/mshtml/persist.c

Merge branch 'pure'

Revert "fix bug #1994. Add implementation of IProvideTypeInfo interface."

This reverts commit e396647e6bcb7147795616c3338da4ff150f8717.

mshtml: Add IHTMLEditServices interface

Conflicts:

dlls/mshtml/service.c

Merge branch 'pure'

Revert "mshtml: Add IHTMLEditServices interface"

This reverts commit aebd8b5e8fb9c03ceba8b9009abadaf8a0e61d02.

Merge branch 'pure'

Release 1.3.11.

wined3d: Don't call glPointParameter with a random context.

mshtml: Use inline function instead of macro for BSCallback vtbl implementations.

mshtml: Avoid obj to iface cast in ProtocolFactory_Create.

wininet: Update Traditional Chinese translation.

setupapi: Update Traditional Chinese translation.

wineboot: Update Traditional Chinese translation.

gdi32/tests: Fix System font test for Japanese.

po: Update the English po files.

kernel32: Update the country code for Serbia.

po: Use more standard names for the Serbian locales.

wined3d: Pass an IWineD3DResourceImpl pointer to resource_get_type().

wined3d: Pass an IWineD3DResourceImpl pointer to resource_set_priority().

wined3d: Pass an IWineD3DResourceImpl pointer to resource_get_priority().

wined3d: Pass an IWineD3DResourceImpl pointer to resource_set_private_data().

wineps.drv: Update Korean resource.

winemine: Update Korean resource.

setupapi: Add stub for SetupDiSetSelectedDevice.

shlwapi/tests: COM cleanup for thread.c.

oleaut32/tests: COM cleanup for vartest.c.

msdaps: COM cleanup for the IClassFactory iface.

ole32: COM cleanup for the IMalloc iface.

urlmon: Use an iface instead of a vtbl pointer in ProxyBindStatusCallback.

wrc: Treat empty translation strings as missing.

msxml3: Get rid of xmlnode_transformNodeToObject.

mshtml: Remove some leftover *_THIS undefs.

mshtml: Finish the COM standardization in protocol.c.

dinput/tests: Skip acquire tests when not running in the foreground.

If our window isn't the foreground window, we'll never be able to
successfully Acquire with SetCooperativeLevel DISCL_FOREGROUND in effect.

msi/tests: Mark a test result on some old Wow64 platforms as broken.

wldap32: Convert translations to po files.

winmm: Convert translations to po files.

shdoclc: Convert translations to po files.

oleaut32: Convert translations to po files.

msvidc32: Convert translations to po files.

msrle32: Convert translations to po files.

msi: Convert translations to po files.

mapi32: Convert translations to po files.

localspl: Convert translations to po files.

jscript: Convert translations to po files.

iccvid: Convert translations to po files.

hhctrl: Convert translations to po files.

devenum: Convert translations to po files.

cryptdlg: Convert translations to po files.

crypt32: Convert translations to po files.

po: Add missing entry for No key in en_US translation.

windowscodecs: Use Mac OS X native ICNS support, not libicns.

The ICNS support is only used on Mac OS X and is not anticipated to be used
on any other platform.  So, we can rely on the native frameworks rather than
a third-party dependency.

winemenubuilder: On Mac OS X, keep multiple icon sizes.

ICNS files can store multiple sizes, like ICOs.

wined3d: Pass an IWineD3DResourceImpl pointer to resource_get_private_data().

wined3d: Pass an IWineD3DResourceImpl pointer to resource_free_private_data().

wined3d: Pass an IWineD3DResourceImpl pointer to resource_cleanup().

wined3d: Pass an IWineD3DResourceImpl pointer to resource_init().

winefile: Update Korean resource.

winedbg: Update Korean resource.

shell32: Improved equal ITEMIDLISTs handling in ILIsParent.