mirror of
git://source.winehq.org/git/wine.git
synced 2024-07-21 12:14:10 +00:00
richedit: Fix incorrect GUID values for ITextHost and ITextHost2.
This commit is contained in:
parent
819e1a899a
commit
82da77c0a6
|
@ -1,9 +1,9 @@
|
||||||
2 extern IID_IRichEditOle
|
2 extern IID_IRichEditOle
|
||||||
3 extern IID_IRichEditOleCallback
|
3 extern IID_IRichEditOleCallback
|
||||||
4 stdcall CreateTextServices(ptr ptr ptr) riched20.CreateTextServices
|
4 stdcall CreateTextServices(ptr ptr ptr) riched20.CreateTextServices
|
||||||
5 extern IID_ITextServices
|
5 extern IID_ITextServices riched20.IID_ITextServices
|
||||||
6 extern IID_ITextHost
|
6 extern IID_ITextHost riched20.IID_ITextHost
|
||||||
7 extern IID_ITextHost2
|
7 extern IID_ITextHost2 riched20.IID_ITextHost2
|
||||||
8 stdcall REExtendedRegisterClass() riched20.REExtendedRegisterClass
|
8 stdcall REExtendedRegisterClass() riched20.REExtendedRegisterClass
|
||||||
9 stdcall RichEdit10ANSIWndProc(ptr long long long) riched20.RichEdit10ANSIWndProc
|
9 stdcall RichEdit10ANSIWndProc(ptr long long long) riched20.RichEdit10ANSIWndProc
|
||||||
10 stdcall RichEditANSIWndProc(ptr long long long) riched20.RichEditANSIWndProc
|
10 stdcall RichEditANSIWndProc(ptr long long long) riched20.RichEditANSIWndProc
|
||||||
|
|
|
@ -39,14 +39,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(richedit);
|
||||||
|
|
||||||
/* there is no way to be consistent across different sets of headers - mingw, Wine, Win32 SDK*/
|
/* there is no way to be consistent across different sets of headers - mingw, Wine, Win32 SDK*/
|
||||||
|
|
||||||
/* FIXME: the next 6 lines should be in textserv.h */
|
|
||||||
#include "initguid.h"
|
#include "initguid.h"
|
||||||
#define TEXTSERV_GUID(name, l, w1, w2, b1, b2) \
|
DEFINE_GUID(IID_ITextServices, 0x8d33f740, 0xcf58, 0x11ce, 0xa8, 0x9d, 0x00, 0xaa, 0x00, 0x6c, 0xad, 0xc5);
|
||||||
DEFINE_GUID(name, l, w1, w2, b1, b2, 0x00, 0xaa, 0x00, 0x6c, 0xad, 0xc5)
|
DEFINE_GUID(IID_ITextHost, 0x13e670f4,0x1a5a,0x11cf,0xab,0xeb,0x00,0xaa,0x00,0xb6,0x5e,0xa1);
|
||||||
|
DEFINE_GUID(IID_ITextHost2, 0x13e670f5,0x1a5a,0x11cf,0xab,0xeb,0x00,0xaa,0x00,0xb6,0x5e,0xa1);
|
||||||
TEXTSERV_GUID(IID_ITextServices, 0x8d33f740, 0xcf58, 0x11ce, 0xa8, 0x9d);
|
|
||||||
TEXTSERV_GUID(IID_ITextHost, 0xc5bdd8d0, 0xd26e, 0x11ce, 0xa8, 0x9e);
|
|
||||||
TEXTSERV_GUID(IID_ITextHost2, 0xc5bdd8d0, 0xd26e, 0x11ce, 0xa8, 0x9e);
|
|
||||||
DEFINE_GUID(IID_ITextDocument, 0x8cc497c0, 0xa1df, 0x11ce, 0x80, 0x98, 0x00, 0xaa, 0x00, 0x47, 0xbe, 0x5d);
|
DEFINE_GUID(IID_ITextDocument, 0x8cc497c0, 0xa1df, 0x11ce, 0x80, 0x98, 0x00, 0xaa, 0x00, 0x47, 0xbe, 0x5d);
|
||||||
DEFINE_GUID(IID_ITextRange, 0x8cc497c2, 0xa1df, 0x11ce, 0x80, 0x98, 0x00, 0xaa, 0x00, 0x47, 0xbe, 0x5d);
|
DEFINE_GUID(IID_ITextRange, 0x8cc497c2, 0xa1df, 0x11ce, 0x80, 0x98, 0x00, 0xaa, 0x00, 0x47, 0xbe, 0x5d);
|
||||||
DEFINE_GUID(IID_ITextSelection, 0x8cc497c1, 0xa1df, 0x11ce, 0x80, 0x98, 0x00, 0xaa, 0x00, 0x47, 0xbe, 0x5d);
|
DEFINE_GUID(IID_ITextSelection, 0x8cc497c1, 0xa1df, 0x11ce, 0x80, 0x98, 0x00, 0xaa, 0x00, 0x47, 0xbe, 0x5d);
|
||||||
|
|
|
@ -806,9 +806,9 @@ static void test_IIDs(void)
|
||||||
{
|
{
|
||||||
ok(IsEqualIID(pIID_ITextServices, &expected_iid_itextservices),
|
ok(IsEqualIID(pIID_ITextServices, &expected_iid_itextservices),
|
||||||
"unexpected value for IID_ITextServices: %s\n", debugstr_guid(pIID_ITextServices));
|
"unexpected value for IID_ITextServices: %s\n", debugstr_guid(pIID_ITextServices));
|
||||||
todo_wine ok(IsEqualIID(pIID_ITextHost, &expected_iid_itexthost),
|
ok(IsEqualIID(pIID_ITextHost, &expected_iid_itexthost),
|
||||||
"unexpected value for IID_ITextHost: %s\n", debugstr_guid(pIID_ITextHost));
|
"unexpected value for IID_ITextHost: %s\n", debugstr_guid(pIID_ITextHost));
|
||||||
todo_wine ok(IsEqualIID(pIID_ITextHost2, &expected_iid_itexthost2),
|
ok(IsEqualIID(pIID_ITextHost2, &expected_iid_itexthost2),
|
||||||
"unexpected value for IID_ITextHost2: %s\n", debugstr_guid(pIID_ITextHost2));
|
"unexpected value for IID_ITextHost2: %s\n", debugstr_guid(pIID_ITextHost2));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -23,9 +23,8 @@
|
||||||
extern "C" {
|
extern "C" {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
DEFINE_GUID(IID_ITextServices,0x8d33f740,0xcf58,0x11ce,0xa8,0x9d,0x00,0xaa,0x00,0x6c,0xad,0xc5);
|
EXTERN_C const IID IID_ITextServices;
|
||||||
DEFINE_GUID(IID_ITextHost, 0xc5bdd8d0,0xd26e,0x11ce,0xa8,0x9e,0x00,0xaa,0x00,0x6c,0xad,0xc5);
|
EXTERN_C const IID IID_ITextHost;
|
||||||
DEFINE_GUID(IID_ITextHost2, 0xc5bdd8d0,0xd26e,0x11ce,0xa8,0x9e,0x00,0xaa,0x00,0x6c,0xad,0xc5);
|
|
||||||
|
|
||||||
/*****************************************************************************
|
/*****************************************************************************
|
||||||
* ITextServices interface
|
* ITextServices interface
|
||||||
|
|
Loading…
Reference in a new issue