Skip to content

W
wine-cw
Commit 67389533 authored by Michael Stefaniuc's avatar Michael Stefaniuc Committed by Alexandre Julliard
Browse files
Options

riched20/tests: Get the CreateTextServices() pointer only once.

parent 74c5d202
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
dlls/riched20/tests/txtsrv.c
View file @ 67389533
...@@ -38,6 +38,7 @@ static HMODULE hmoduleRichEdit; ...@@ -38,6 +38,7 @@ static HMODULE hmoduleRichEdit;
static IID *pIID_ITextServices; static IID *pIID_ITextServices;
static IID *pIID_ITextHost; static IID *pIID_ITextHost;
static IID *pIID_ITextHost2; static IID *pIID_ITextHost2;
static PCreateTextServices pCreateTextServices;
static const char *debugstr_guid(REFIID riid) static const char *debugstr_guid(REFIID riid)
{ {
...@@ -620,7 +621,6 @@ static BOOL init_texthost(void) ...@@ -620,7 +621,6 @@ static BOOL init_texthost(void)
{ {
IUnknown *init; IUnknown *init;
HRESULT result; HRESULT result;
PCreateTextServices pCreateTextServices;
dummyTextHost = CoTaskMemAlloc(sizeof(*dummyTextHost)); dummyTextHost = CoTaskMemAlloc(sizeof(*dummyTextHost));
if (dummyTextHost == NULL) { if (dummyTextHost == NULL) {
...@@ -633,7 +633,6 @@ static BOOL init_texthost(void) ...@@ -633,7 +633,6 @@ static BOOL init_texthost(void)
/* MSDN states that an IUnknown object is returned by /* MSDN states that an IUnknown object is returned by
CreateTextServices which is then queried to obtain a CreateTextServices which is then queried to obtain a
ITextServices object. */ ITextServices object. */
pCreateTextServices = (void*)GetProcAddress(hmoduleRichEdit, "CreateTextServices");
result = (*pCreateTextServices)(NULL, &dummyTextHost->ITextHost_iface, &init); result = (*pCreateTextServices)(NULL, &dummyTextHost->ITextHost_iface, &init);
ok(result == S_OK, "Did not return S_OK when created (result = %x)\n", result); ok(result == S_OK, "Did not return S_OK when created (result = %x)\n", result);
if (result != S_OK) { if (result != S_OK) {
...@@ -825,6 +824,8 @@ START_TEST( txtsrv ) ...@@ -825,6 +824,8 @@ START_TEST( txtsrv )
pIID_ITextServices = (IID*)GetProcAddress(hmoduleRichEdit, "IID_ITextServices"); pIID_ITextServices = (IID*)GetProcAddress(hmoduleRichEdit, "IID_ITextServices");
pIID_ITextHost = (IID*)GetProcAddress(hmoduleRichEdit, "IID_ITextHost"); pIID_ITextHost = (IID*)GetProcAddress(hmoduleRichEdit, "IID_ITextHost");
pIID_ITextHost2 = (IID*)GetProcAddress(hmoduleRichEdit, "IID_ITextHost2"); pIID_ITextHost2 = (IID*)GetProcAddress(hmoduleRichEdit, "IID_ITextHost2");
pCreateTextServices = (void*)GetProcAddress(hmoduleRichEdit, "CreateTextServices");
test_IIDs(); test_IIDs();
if (init_texthost()) if (init_texthost())
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment