June 2013 - Wine-Commits - list.winehq.org

Christian Costa : d3dx9_36: Set compilation_errors to NULL when no error encountered + tests.
by Alexandre Julliard June 13, 2013

June 13, 2013

Module: wine Branch: master Commit: fcb72f399d7df43934012fbb10ac339de73a67f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcb72f399d7df43934012fbb1… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu Jun 13 09:00:50 2013 +0200 d3dx9_36: Set compilation_errors to NULL when no error encountered + tests. --- dlls/d3dx9_36/effect.c | 3 +++ dlls/d3dx9_36/tests/effect.c | 21 +++++++++++++++++++++ 2 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 1924c07..8ab1067 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -5768,6 +5768,9 @@ HRESULT WINAPI D3DXCreateEffectEx(struct IDirect3DDevice9 *device, const void *s FIXME("(%p, %p, %u, %p, %p, %p, %#x, %p, %p, %p): semi-stub\n", device, srcdata, srcdatalen, defines, include, skip_constants, flags, pool, effect, compilation_errors); + if (compilation_errors) + *compilation_errors = NULL; + if (!device || !srcdata) return D3DERR_INVALIDCALL; diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 7f238be..c67e863 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -2662,6 +2662,26 @@ static void test_effect_variable_names(IDirect3DDevice9 *device) ok(!count, "Release failed %u\n", count); } +static void test_effect_compilation_errors(IDirect3DDevice9 *device) +{ + ID3DXEffect *effect; + ID3DXBuffer *compilation_errors; + HRESULT hr; + + /* Test binary effect */ + compilation_errors = (ID3DXBuffer*)0xdeadbeef; + hr = D3DXCreateEffect(NULL, NULL, 0, NULL, NULL, 0, NULL, NULL, &compilation_errors); + ok(hr == D3DERR_INVALIDCALL, "D3DXCreateEffect failed, got %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + ok(!compilation_errors, "Returned %p\n", compilation_errors); + + compilation_errors = (ID3DXBuffer*)0xdeadbeef; + hr = D3DXCreateEffect(device, test_effect_variable_names_blob, + sizeof(test_effect_variable_names_blob), NULL, NULL, 0, NULL, &effect, &compilation_errors); + ok(hr == D3D_OK, "D3DXCreateEffect failed, got %#x, expected %#x\n", hr, D3D_OK); + ok(!compilation_errors, "Returned %p\n", compilation_errors); + effect->lpVtbl->Release(effect); +} + START_TEST(effect) { HWND wnd; @@ -2698,6 +2718,7 @@ START_TEST(effect) test_create_effect_compiler(); test_effect_parameter_value(device); test_effect_variable_names(device); + test_effect_compilation_errors(device); count = IDirect3DDevice9_Release(device); ok(count == 0, "The device was not properly freed: refcount %u\n", count);

1 0

André Hentschel : winemaker: Don' t destroy relative paths.
by Alexandre Julliard June 13, 2013

June 13, 2013

Module: wine Branch: master Commit: 7bd49ab2df7db6b33f4043ec4fc3b0d2b1cad3d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bd49ab2df7db6b33f4043ec4… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jun 12 23:00:10 2013 +0200 winemaker: Don't destroy relative paths. --- tools/winemaker | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index c3921a1..3ddd834 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -1862,7 +1862,6 @@ sub search_from($$) my $path=$_[1]; my $real_path=""; - $dirname =~ s/(\.\/)+//; if ($dirname eq "" or $dirname eq "." or $dirname eq "./") { $dirname=cwd; } elsif ($dirname !~ m+^/+) {

1 0

Dmitry Timoshkov : oleaut32: Do not rely on vtable placement in the implementation structure.
by Alexandre Julliard June 13, 2013

June 13, 2013

Module: wine Branch: master Commit: eca18b515264be5017e0e62a69807757e6cac298 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eca18b515264be5017e0e62a6… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jun 13 11:28:21 2013 +0900 oleaut32: Do not rely on vtable placement in the implementation structure. --- dlls/oleaut32/typelib.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 024df0d..9502b3c 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -8358,13 +8358,13 @@ HRESULT WINAPI CreateTypeLib2(SYSKIND syskind, LPCOLESTR szFile, This->path = heap_alloc((lstrlenW(szFile) + 1) * sizeof(WCHAR)); if (!This->path) { - ITypeLib2_Release((ITypeLib2*)This); + ITypeLib2_Release(&This->ITypeLib2_iface); return E_OUTOFMEMORY; } lstrcpyW(This->path, szFile); - hres = ITypeLib2_QueryInterface((ITypeLib2*)This, &IID_ICreateTypeLib2, (LPVOID*)ppctlib); - ITypeLib2_Release((ITypeLib2*)This); + hres = ITypeLib2_QueryInterface(&This->ITypeLib2_iface, &IID_ICreateTypeLib2, (LPVOID*)ppctlib); + ITypeLib2_Release(&This->ITypeLib2_iface); return hres; } @@ -8373,21 +8373,21 @@ static HRESULT WINAPI ICreateTypeLib2_fnQueryInterface(ICreateTypeLib2 *iface, { ITypeLibImpl *This = impl_from_ICreateTypeLib2(iface); - return ITypeLib2_QueryInterface((ITypeLib2*)This, riid, object); + return ITypeLib2_QueryInterface(&This->ITypeLib2_iface, riid, object); } static ULONG WINAPI ICreateTypeLib2_fnAddRef(ICreateTypeLib2 *iface) { ITypeLibImpl *This = impl_from_ICreateTypeLib2(iface); - return ITypeLib2_AddRef((ITypeLib2*)This); + return ITypeLib2_AddRef(&This->ITypeLib2_iface); } static ULONG WINAPI ICreateTypeLib2_fnRelease(ICreateTypeLib2 *iface) { ITypeLibImpl *This = impl_from_ICreateTypeLib2(iface); - return ITypeLib2_Release((ITypeLib2*)This); + return ITypeLib2_Release(&This->ITypeLib2_iface); } static HRESULT WINAPI ICreateTypeLib2_fnCreateTypeInfo(ICreateTypeLib2 *iface, @@ -9883,21 +9883,21 @@ static HRESULT WINAPI ICreateTypeInfo2_fnQueryInterface(ICreateTypeInfo2 *iface, { ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface); - return ITypeInfo2_QueryInterface((ITypeInfo2*)This, riid, object); + return ITypeInfo2_QueryInterface(&This->ITypeInfo2_iface, riid, object); } static ULONG WINAPI ICreateTypeInfo2_fnAddRef(ICreateTypeInfo2 *iface) { ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface); - return ITypeInfo2_AddRef((ITypeInfo2*)This); + return ITypeInfo2_AddRef(&This->ITypeInfo2_iface); } static ULONG WINAPI ICreateTypeInfo2_fnRelease(ICreateTypeInfo2 *iface) { ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface); - return ITypeInfo2_Release((ITypeInfo2*)This); + return ITypeInfo2_Release(&This->ITypeInfo2_iface); } static HRESULT WINAPI ICreateTypeInfo2_fnSetGuid(ICreateTypeInfo2 *iface,

1 0

André Hentschel : winemaker: Try to find the real case of a given filename or path from project files.
by Alexandre Julliard June 13, 2013

June 13, 2013

Module: wine Branch: master Commit: 1337726318e6c6bf14287198f57f63d72086b8a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1337726318e6c6bf14287198f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jun 12 23:00:45 2013 +0200 winemaker: Try to find the real case of a given filename or path from project files. --- tools/winemaker | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index 611a490..dc94f7d 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -21,7 +21,7 @@ use strict; # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA # -my $version="0.8.3"; +my $version="0.8.4"; use Cwd; use File::Basename; @@ -683,6 +683,11 @@ sub source_scan_project_file($$$) # Additional Include Directories $sfilet=$1; $sfilet=~s/\\/\//g; + my @compinc=split /\/+/, $sfilet; + my $realinc=search_from($path, \@compinc); + if (defined $realinc) { + $sfilet=$realinc; + } if ($sfilet=~/^\w:/) { print STDERR "warning: Can't fix path $sfilet\n" } else { @@ -894,6 +899,11 @@ sub source_scan_project_file($$$) $sfilet=~s/\\\\/\\/g; #remove double backslash $sfilet=~s/^\.\\//; #remove starting 'this directory' $sfilet=~s/\\/\//g; #make slashes out of backslashes + my @compsrc=split(/\/+/, $sfilet); + my $realsrc=search_from($path, \@compsrc); + if (defined $realsrc) { + $sfilet=$realsrc; + } if ($sfilet =~ /\.c$/i and $sfilet !~ /\.(dbg|spec)\.c$/) { push @sources_c,$sfilet; } elsif ($sfilet =~ /\.cpp$/i) { @@ -961,6 +971,11 @@ sub source_scan_project_file($$$) $configt=~s/\\/\//g; my @addincl = split(/\s*;\s*/, $configt); foreach $configt (@addincl) { + my @compinc=split(/\/+/, $configt); + my $realinc=search_from($path, \@compinc); + if (defined $realinc) { + $configt=$realinc; + } push @{@$project_settings[$T_INCLUDE_PATH]},"-I".$configt; } }

1 0

Alexandre Julliard : wininet/tests: Use test.winehq. com for invalid certs tests.
by Alexandre Julliard June 13, 2013

June 13, 2013

Module: wine Branch: master Commit: df17007af7322fb6b379ffcc199eca53ca52a82a URL: http://source.winehq.org/git/wine.git/?a=commit;h=df17007af7322fb6b379ffcc1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 13 15:20:10 2013 +0200 wininet/tests: Use test.winehq.com for invalid certs tests. --- dlls/wininet/tests/http.c | 31 +++++++++++++++++-------------- 1 files changed, 17 insertions(+), 14 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 5d4c28a..b8b34e2 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -3629,16 +3629,19 @@ static void test_cert_struct(HINTERNET req) BOOL res; static const char ex_subject[] = - "0mJuv1t-1CFypQkyTZwfvjHHBAbnUndG\r\n" - "GT98380011\r\n" - "See www.rapidssl.com/resources/cps (c)13\r\n" - "Domain Control Validated - RapidSSL(R)\r\n" - "*.winehq.org"; + "US\r\n" + "Minnesota\r\n" + "Saint Paul\r\n" + "WineHQ\r\n" + "test.winehq.com\r\n" + "webmaster(a)winehq.org"; static const char ex_issuer[] = "US\r\n" - "\"GeoTrust, Inc.\"\r\n" - "RapidSSL CA"; + "Minnesota\r\n" + "WineHQ\r\n" + "test.winehq.com\r\n" + "webmaster(a)winehq.org"; memset(&info, 0x5, sizeof(info)); @@ -3731,7 +3734,7 @@ static void test_security_flags(void) pInternetSetStatusCallbackA(ses, &callback); SET_EXPECT(INTERNET_STATUS_HANDLE_CREATED); - conn = InternetConnectA(ses, "test.winehq.org", INTERNET_DEFAULT_HTTPS_PORT, + conn = InternetConnectA(ses, "test.winehq.com", INTERNET_DEFAULT_HTTPS_PORT, NULL, NULL, INTERNET_SERVICE_HTTP, INTERNET_FLAG_SECURE, 0xdeadbeef); ok(conn != NULL, "InternetConnect failed with error %u\n", GetLastError()); CHECK_NOTIFIED(INTERNET_STATUS_HANDLE_CREATED); @@ -3755,7 +3758,7 @@ static void test_security_flags(void) } test_secflags_option(req, 0); - test_security_info("https://test.winehq.org/data/some_file.html?q", ERROR_INTERNET_ITEM_NOT_FOUND, 0); + test_security_info("https://test.winehq.com/data/some_file.html?q", ERROR_INTERNET_ITEM_NOT_FOUND, 0); set_secflags(req, TRUE, SECURITY_FLAG_IGNORE_REVOCATION); test_secflags_option(req, SECURITY_FLAG_IGNORE_REVOCATION); @@ -3788,8 +3791,8 @@ static void test_security_flags(void) WaitForSingleObject(hCompleteEvent, INFINITE); ok(req_error == ERROR_SUCCESS, "req_error = %d\n", req_error); - todo_wine CHECK_NOT_NOTIFIED(INTERNET_STATUS_RESOLVING_NAME); - todo_wine CHECK_NOT_NOTIFIED(INTERNET_STATUS_NAME_RESOLVED); + CHECK_NOTIFIED(INTERNET_STATUS_RESOLVING_NAME); + CHECK_NOTIFIED(INTERNET_STATUS_NAME_RESOLVED); CHECK_NOTIFIED(INTERNET_STATUS_CONNECTING_TO_SERVER); CHECK_NOTIFIED(INTERNET_STATUS_CONNECTED_TO_SERVER); CHECK_NOTIFIED(INTERNET_STATUS_SENDING_REQUEST); @@ -3926,7 +3929,7 @@ static void test_security_flags(void) |SECURITY_FLAG_STRENGTH_STRONG|0x1800000); test_cert_struct(req); - test_security_info("https://test.winehq.org/data/some_file.html?q", 0, 0x1800000); + test_security_info("https://test.winehq.com/data/some_file.html?q", 0, 0x1800000); res = InternetReadFile(req, buf, sizeof(buf), &size); ok(res, "InternetReadFile failed: %u\n", GetLastError()); @@ -3946,7 +3949,7 @@ static void test_security_flags(void) pInternetSetStatusCallbackA(ses, &callback); SET_EXPECT(INTERNET_STATUS_HANDLE_CREATED); - conn = InternetConnectA(ses, "test.winehq.org", INTERNET_DEFAULT_HTTPS_PORT, + conn = InternetConnectA(ses, "test.winehq.com", INTERNET_DEFAULT_HTTPS_PORT, NULL, NULL, INTERNET_SERVICE_HTTP, INTERNET_FLAG_SECURE, 0xdeadbeef); ok(conn != NULL, "InternetConnect failed with error %u\n", GetLastError()); CHECK_NOTIFIED(INTERNET_STATUS_HANDLE_CREATED); @@ -3998,7 +4001,7 @@ static void test_security_flags(void) CloseHandle(hCompleteEvent); - test_security_info("http://test.winehq.org/data/some_file.html?q", ERROR_INTERNET_ITEM_NOT_FOUND, 0); + test_security_info("http://test.winehq.com/data/some_file.html?q", ERROR_INTERNET_ITEM_NOT_FOUND, 0); test_security_info("file:///c:/dir/file.txt", ERROR_INTERNET_ITEM_NOT_FOUND, 0); test_security_info("xxx:///c:/dir/file.txt", ERROR_INTERNET_ITEM_NOT_FOUND, 0); }

1 0

Alexandre Julliard : wine.inf: Explicitly register the 32-bit stdole2. tlb under SysWOW64.
by Alexandre Julliard June 12, 2013

June 12, 2013

Module: wine Branch: master Commit: dbecee55ce8bdebab20611a49a163882c5f0b82b URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbecee55ce8bdebab20611a49… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 12 16:01:38 2013 +0200 wine.inf: Explicitly register the 32-bit stdole2.tlb under SysWOW64. --- tools/wine.inf.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 45fca8f..22c9df0 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2478,6 +2478,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,mui, 11,gecko\plugin,npmshtml.dll 11,wbem,mofcomp.exe +10,syswow64,stdole2.tlb 11,,iexplore.exe 11,,winetest.exe,- 12,,mountmgr.sys,-

1 0

Hans Leidekker : wininet/tests: Avoid proxy test failures on old wininet.
by Alexandre Julliard June 12, 2013

June 12, 2013

Module: wine Branch: master Commit: 697cbc3605f0ea4b9ab1787e26663341ee6cf6dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=697cbc3605f0ea4b9ab1787e2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 12 11:08:42 2013 +0200 wininet/tests: Avoid proxy test failures on old wininet. --- dlls/wininet/tests/http.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 1682b05..5d4c28a 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2465,6 +2465,11 @@ static void test_proxy_direct(int port) ok(sz == lstrlenW(passwordW), "got %u\n", sz); r = HttpSendRequest(hr, NULL, 0, NULL, 0); + if (!r) + { + win_skip("skipping proxy tests on broken wininet\n"); + goto done; + } ok(r, "HttpSendRequest failed %u\n", GetLastError()); sz = sizeof buffer; r = HttpQueryInfo(hr, HTTP_QUERY_STATUS_CODE, buffer, &sz, NULL);

1 0

Nikolay Sivov : xmllite: It' s acceptable to have NULL length pointer in GetLocalName().
by Alexandre Julliard June 12, 2013

June 12, 2013

Module: wine Branch: master Commit: 9997ef3fbcac33f4005c91174c2a4e600dbef08d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9997ef3fbcac33f4005c91174… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 12 13:06:24 2013 +0400 xmllite: It's acceptable to have NULL length pointer in GetLocalName(). --- dlls/xmllite/reader.c | 2 +- dlls/xmllite/tests/reader.c | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 8276b85..5256c35 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -2256,7 +2256,7 @@ static HRESULT WINAPI xmlreader_GetLocalName(IXmlReader* iface, LPCWSTR *name, U TRACE("(%p)->(%p %p)\n", This, name, len); *name = This->strvalues[StringValue_LocalName].str; - *len = This->strvalues[StringValue_LocalName].len; + if (len) *len = This->strvalues[StringValue_LocalName].len; return S_OK; } diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index fad3d41..46c6edd 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -1364,13 +1364,20 @@ static void test_read_cdata(void) ok(type == XmlNodeType_CDATA, "got %d for %s\n", type, test->xml); + str_exp = a2w(test->name); + len = 1; str = NULL; hr = IXmlReader_GetLocalName(reader, &str, &len); ok(hr == S_OK, "got 0x%08x\n", hr); ok(len == strlen(test->name), "got %u\n", len); - str_exp = a2w(test->name); ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); + + str = NULL; + hr = IXmlReader_GetLocalName(reader, &str, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); + free_str(str_exp); len = 1;

1 0

Hans Leidekker : wbemprox/tests: Mark a test result as broken.
by Alexandre Julliard June 12, 2013

June 12, 2013

Module: wine Branch: master Commit: 97cc8bfcc7a6117667168e40ab47941b2c977419 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97cc8bfcc7a6117667168e40a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 12 11:09:06 2013 +0200 wbemprox/tests: Mark a test result as broken. --- dlls/wbemprox/tests/query.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 15fe6f8..f09da91 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -586,7 +586,7 @@ static void test_notification_query_async( IWbemServices *services ) ok( sink_refs > prev_sink_refs, "got %u refs\n", sink_refs ); hr = IWbemServices_CancelAsyncCall( services, &sink ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK || broken(hr == WBEM_E_NOT_FOUND), "got %08x\n", hr ); SysFreeString( wql ); SysFreeString( query );

1 0

Nikolay Sivov : riched20: Use helpers from header instead of internal functions.
by Alexandre Julliard June 12, 2013

June 12, 2013

Module: wine Branch: master Commit: ed673ff947a330ed5755ac543816df09696ec028 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed673ff947a330ed5755ac543… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 8 16:53:45 2013 +0400 riched20: Use helpers from header instead of internal functions. --- dlls/riched20/richole.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 9c74cfe..6805873 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -300,7 +300,7 @@ IRichEditOle_fnGetClientSite(IRichEditOle *me, if(!lplpolesite) return E_INVALIDARG; *lplpolesite = &This->clientSite->IOleClientSite_iface; - IOleClientSite_fnAddRef(*lplpolesite); + IOleClientSite_AddRef(*lplpolesite); return S_OK; } @@ -448,21 +448,21 @@ ITextDocument_fnQueryInterface(ITextDocument* me, REFIID riid, void** ppvObject) { IRichEditOleImpl *This = impl_from_ITextDocument(me); - return IRichEditOle_fnQueryInterface(&This->IRichEditOle_iface, riid, ppvObject); + return IRichEditOle_QueryInterface(&This->IRichEditOle_iface, riid, ppvObject); } static ULONG WINAPI ITextDocument_fnAddRef(ITextDocument* me) { IRichEditOleImpl *This = impl_from_ITextDocument(me); - return IRichEditOle_fnAddRef(&This->IRichEditOle_iface); + return IRichEditOle_AddRef(&This->IRichEditOle_iface); } static ULONG WINAPI ITextDocument_fnRelease(ITextDocument* me) { IRichEditOleImpl *This = impl_from_ITextDocument(me); - return IRichEditOle_fnRelease(&This->IRichEditOle_iface); + return IRichEditOle_Release(&This->IRichEditOle_iface); } static HRESULT WINAPI

1 0