May 2014 - Wine-Commits - list.winehq.org

Alexandre Julliard : user32: Don' t bother returning a value from the SetWindowRgn driver entry point.
by Alexandre Julliard May 1, 2014

May 1, 2014

Module: wine Branch: master Commit: 6a0f3df68cb22ca341a0ca2dd642d426c74e5cf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a0f3df68cb22ca341a0ca2dd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 1 12:31:14 2014 +0200 user32: Don't bother returning a value from the SetWindowRgn driver entry point. --- dlls/user32/driver.c | 7 +++---- dlls/user32/user_private.h | 2 +- dlls/winemac.drv/window.c | 4 +--- dlls/winex11.drv/window.c | 3 +-- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 672f194..e0bc38c 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -457,9 +457,8 @@ static void CDECL nulldrv_SetParent( HWND hwnd, HWND parent, HWND old_parent ) { } -static int CDECL nulldrv_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw ) +static void CDECL nulldrv_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw ) { - return 1; } static void CDECL nulldrv_SetWindowIcon( HWND hwnd, UINT type, HICON icon ) @@ -757,9 +756,9 @@ static void CDECL loaderdrv_SetLayeredWindowAttributes( HWND hwnd, COLORREF key, load_driver()->pSetLayeredWindowAttributes( hwnd, key, alpha, flags ); } -static int CDECL loaderdrv_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw ) +static void CDECL loaderdrv_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw ) { - return load_driver()->pSetWindowRgn( hwnd, hrgn, redraw ); + load_driver()->pSetWindowRgn( hwnd, hrgn, redraw ); } static BOOL CDECL loaderdrv_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWINFO *info, diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index f2345e8..2bb869a 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -105,7 +105,7 @@ typedef struct tagUSER_DRIVER { void (CDECL *pSetFocus)(HWND); void (CDECL *pSetLayeredWindowAttributes)(HWND,COLORREF,BYTE,DWORD); void (CDECL *pSetParent)(HWND,HWND,HWND); - int (CDECL *pSetWindowRgn)(HWND,HRGN,BOOL); + void (CDECL *pSetWindowRgn)(HWND,HRGN,BOOL); void (CDECL *pSetWindowIcon)(HWND,UINT,HICON); void (CDECL *pSetWindowStyle)(HWND,INT,STYLESTRUCT*); void (CDECL *pSetWindowText)(HWND,LPCWSTR); diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 6ef227c..e61a517 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -1374,7 +1374,7 @@ void CDECL macdrv_SetParent(HWND hwnd, HWND parent, HWND old_parent) * * Assign specified region to window (for non-rectangular windows) */ -int CDECL macdrv_SetWindowRgn(HWND hwnd, HRGN hrgn, BOOL redraw) +void CDECL macdrv_SetWindowRgn(HWND hwnd, HRGN hrgn, BOOL redraw) { struct macdrv_win_data *data; @@ -1393,8 +1393,6 @@ int CDECL macdrv_SetWindowRgn(HWND hwnd, HRGN hrgn, BOOL redraw) if (procid != GetCurrentProcessId()) SendMessageW(hwnd, WM_MACDRV_SET_WIN_REGION, 0, 0); } - - return TRUE; } diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index d98b9f6..77cf304 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2435,7 +2435,7 @@ done: * * Assign specified region to window (for non-rectangular windows) */ -int CDECL X11DRV_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw ) +void CDECL X11DRV_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw ) { struct x11drv_win_data *data; @@ -2448,7 +2448,6 @@ int CDECL X11DRV_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw ) { SendMessageW( hwnd, WM_X11DRV_SET_WIN_REGION, 0, 0 ); } - return TRUE; }

1 0

Thomas Faber : qmgr: Register WINE_REGISTRY resource in DllRegisterServer instead of a nonexistent inf file.
by Alexandre Julliard May 1, 2014

May 1, 2014

Module: wine Branch: master Commit: 8365eb8753db51ab078080afe423301885644a9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8365eb8753db51ab078080afe… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Thu May 1 13:48:00 2014 +0200 qmgr: Register WINE_REGISTRY resource in DllRegisterServer instead of a nonexistent inf file. --- dlls/qmgr/qmgr_main.c | 77 ++----------------------------------------------- 1 file changed, 3 insertions(+), 74 deletions(-) diff --git a/dlls/qmgr/qmgr_main.c b/dlls/qmgr/qmgr_main.c index 051c3a5..97c206a 100644 --- a/dlls/qmgr/qmgr_main.c +++ b/dlls/qmgr/qmgr_main.c @@ -28,6 +28,7 @@ #include "winreg.h" #include "advpub.h" #include "olectl.h" +#include "rpcproxy.h" #include "winsvc.h" #include "bits.h" @@ -41,9 +42,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(qmgr); /* Handle to the base address of this DLL */ static HINSTANCE hInst; -/* Other GUIDs used by this module */ -DEFINE_GUID(CLSID_BackgroundCopyQMgr, 0x69AD4AEE, 0x51BE, 0x439b, 0xA9,0x2C, 0x86,0xAE,0x49,0x0E,0x8B,0x30); - /* Entry point for DLL */ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { @@ -62,81 +60,12 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE; } -static HRESULT init_register_strtable(STRTABLEA *strtable) -{ -#define CLSID_EXPANSION_ENTRY(id) { "CLSID_" #id, &CLSID_ ## id } - static const struct { - const char *name; - const CLSID *clsid; - } expns[] = { - CLSID_EXPANSION_ENTRY(BackgroundCopyQMgr), - CLSID_EXPANSION_ENTRY(BackgroundCopyManager) - }; -#undef CLSID_EXPANSION_ENTRY - static STRENTRYA pse[sizeof expns / sizeof expns[0]]; - DWORD i; - - strtable->cEntries = sizeof pse / sizeof pse[0]; - strtable->pse = pse; - for (i = 0; i < strtable->cEntries; i++) { - static const char dummy_sample[] = "{12345678-1234-1234-1234-123456789012}"; - const CLSID *clsid = expns[i].clsid; - pse[i].pszName = qmgr_strdup(expns[i].name); - pse[i].pszValue = HeapAlloc(GetProcessHeap(), 0, sizeof dummy_sample); - if (!pse[i].pszName || !pse[i].pszValue) - return E_OUTOFMEMORY; - sprintf(pse[i].pszValue, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", - clsid->Data1, clsid->Data2, clsid->Data3, clsid->Data4[0], - clsid->Data4[1], clsid->Data4[2], clsid->Data4[3], clsid->Data4[4], - clsid->Data4[5], clsid->Data4[6], clsid->Data4[7]); - } - - return S_OK; -} - -static void cleanup_register_strtable(STRTABLEA *strtable) -{ - DWORD i; - for (i = 0; i < strtable->cEntries; i++) { - HeapFree(GetProcessHeap(), 0, strtable->pse[i].pszName); - HeapFree(GetProcessHeap(), 0, strtable->pse[i].pszValue); - if (!strtable->pse[i].pszName || !strtable->pse[i].pszValue) - return; - } -} - -/* Use an INF file to register or unregister the DLL */ -static HRESULT register_server(BOOL do_register) -{ - HRESULT hr; - STRTABLEA strtable; - HMODULE hAdvpack; - HRESULT (WINAPI *pRegInstall)(HMODULE hm, LPCSTR pszSection, const STRTABLEA* pstTable); - static const WCHAR wszAdvpack[] = {'a','d','v','p','a','c','k','.','d','l','l',0}; - - TRACE("(%x)\n", do_register); - - hAdvpack = LoadLibraryW(wszAdvpack); - pRegInstall = (void *)GetProcAddress(hAdvpack, "RegInstall"); - - hr = init_register_strtable(&strtable); - if (SUCCEEDED(hr)) - hr = pRegInstall(hInst, do_register ? "RegisterDll" : "UnregisterDll", - &strtable); - cleanup_register_strtable(&strtable); - - if (FAILED(hr)) - ERR("RegInstall failed: %08x\n", hr); - - return hr; -} - HRESULT WINAPI DllRegisterServer(void) { - return register_server(TRUE); + return __wine_register_resources(hInst); } HRESULT WINAPI DllUnregisterServer(void) { - return register_server(FALSE); + return __wine_unregister_resources(hInst); }

1 0

Huw Davies : ole32/tests: Fix win8 test failures.
by Alexandre Julliard May 1, 2014

May 1, 2014

Module: wine Branch: master Commit: dcfd901c83a8ac413bf913ada38211d2e60183c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcfd901c83a8ac413bf913ada… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu May 1 11:12:56 2014 +0100 ole32/tests: Fix win8 test failures. --- dlls/ole32/tests/hglobalstream.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/tests/hglobalstream.c b/dlls/ole32/tests/hglobalstream.c index b509fb5..cf9fedf 100644 --- a/dlls/ole32/tests/hglobalstream.c +++ b/dlls/ole32/tests/hglobalstream.c @@ -261,14 +261,17 @@ static void test_streamonhglobal(IStream *pStream) ok(ull.u.LowPart == 0x80000008, "should have set LowPart to 0x80000008 instead of %08x\n", ull.u.LowPart); ok(ull.u.HighPart == 0, "should have set HighPart to 0 instead of %d\n", ull.u.HighPart); - /* IStream_Seek -- seek wraps position/size on integer overflow */ + /* IStream_Seek -- seek wraps position/size on integer overflow, but not on win8 */ ull.u.HighPart = 0xCAFECAFE; ull.u.LowPart = 0xCAFECAFE; ll.u.HighPart = 0; ll.u.LowPart = 0x7FFFFFFF; hr = IStream_Seek(pStream, ll, STREAM_SEEK_CUR, &ull); - ok_ole_success(hr, "IStream_Seek"); - ok(ull.u.LowPart == 0x00000007, "should have set LowPart to 0x00000007 instead of %08x\n", ull.u.LowPart); + ok(hr == S_OK || hr == STG_E_SEEKERROR /* win8 */, "IStream_Seek"); + if (SUCCEEDED(hr)) + ok(ull.u.LowPart == 0x00000007, "should have set LowPart to 0x00000007 instead of %08x\n", ull.u.LowPart); + else + ok(ull.u.LowPart == 0x80000008, "should have set LowPart to 0x80000008 instead of %08x\n", ull.u.LowPart); ok(ull.u.HighPart == 0, "should have set HighPart to 0 instead of %d\n", ull.u.HighPart); hr = IStream_Commit(pStream, STGC_DEFAULT);

1 0

Piotr Caban : oleacc: Add Client_get_accValue implementation.
by Alexandre Julliard May 1, 2014

May 1, 2014

Module: wine Branch: master Commit: 5224f093713e2231dcb77a8050bea8bc9aec2485 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5224f093713e2231dcb77a805… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 1 16:14:31 2014 +0200 oleacc: Add Client_get_accValue implementation. --- dlls/oleacc/client.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index 30673d3..e16d3f8 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -170,8 +170,13 @@ static HRESULT WINAPI Client_get_accName(IAccessible *iface, VARIANT varID, BSTR static HRESULT WINAPI Client_get_accValue(IAccessible *iface, VARIANT varID, BSTR *pszValue) { Client *This = impl_from_Client(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_variant(&varID), pszValue); - return E_NOTIMPL; + + TRACE("(%p)->(%s %p)\n", This, debugstr_variant(&varID), pszValue); + + *pszValue = NULL; + if(convert_child_id(&varID) != CHILDID_SELF) + return E_INVALIDARG; + return S_FALSE; } static HRESULT WINAPI Client_get_accDescription(IAccessible *iface,

1 0

Piotr Caban : oleacc: Add Client_get_accDescription implementation.
by Alexandre Julliard May 1, 2014

May 1, 2014

Module: wine Branch: master Commit: 1eb9d7e703930ae99ec920a5ce58eb774563eed2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1eb9d7e703930ae99ec920a5c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 1 16:14:37 2014 +0200 oleacc: Add Client_get_accDescription implementation. --- dlls/oleacc/client.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index e16d3f8..48c8d1c 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -183,8 +183,13 @@ static HRESULT WINAPI Client_get_accDescription(IAccessible *iface, VARIANT varID, BSTR *pszDescription) { Client *This = impl_from_Client(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_variant(&varID), pszDescription); - return E_NOTIMPL; + + TRACE("(%p)->(%s %p)\n", This, debugstr_variant(&varID), pszDescription); + + *pszDescription = NULL; + if(convert_child_id(&varID) != CHILDID_SELF) + return E_INVALIDARG; + return S_FALSE; } static HRESULT WINAPI Client_get_accRole(IAccessible *iface, VARIANT varID, VARIANT *pvarRole)

1 0

Piotr Caban : oleacc: Add Client_get_accRole implementation.
by Alexandre Julliard May 1, 2014

May 1, 2014

Module: wine Branch: master Commit: 2c8bb773b6e750f5696b48cfee44a2aaee977090 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c8bb773b6e750f5696b48cfe… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 1 16:14:42 2014 +0200 oleacc: Add Client_get_accRole implementation. --- dlls/oleacc/client.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index 48c8d1c..7af5c38 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -195,8 +195,17 @@ static HRESULT WINAPI Client_get_accDescription(IAccessible *iface, static HRESULT WINAPI Client_get_accRole(IAccessible *iface, VARIANT varID, VARIANT *pvarRole) { Client *This = impl_from_Client(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_variant(&varID), pvarRole); - return E_NOTIMPL; + + TRACE("(%p)->(%s %p)\n", This, debugstr_variant(&varID), pvarRole); + + if(convert_child_id(&varID) != CHILDID_SELF) { + V_VT(pvarRole) = VT_EMPTY; + return E_INVALIDARG; + } + + V_VT(pvarRole) = VT_I4; + V_I4(pvarRole) = ROLE_SYSTEM_CLIENT; + return S_OK; } static HRESULT WINAPI Client_get_accState(IAccessible *iface, VARIANT varID, VARIANT *pvarState)

1 0

Piotr Caban : oleacc: Add Client_get_accHelpTopic implementation.
by Alexandre Julliard May 1, 2014

May 1, 2014

Module: wine Branch: master Commit: f196551a4d465f726f19ecbc4e74a22d9ee51975 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f196551a4d465f726f19ecbc4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 1 16:14:58 2014 +0200 oleacc: Add Client_get_accHelpTopic implementation. --- dlls/oleacc/client.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index 88009f3..a60ec24 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -238,9 +238,31 @@ static HRESULT WINAPI Client_get_accHelpTopic(IAccessible *iface, static HRESULT WINAPI Client_get_accKeyboardShortcut(IAccessible *iface, VARIANT varID, BSTR *pszKeyboardShortcut) { + static const WCHAR shortcut_fmt[] = {'A','l','t','+','!',0}; Client *This = impl_from_Client(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_variant(&varID), pszKeyboardShortcut); - return E_NOTIMPL; + WCHAR name[1024]; + UINT i, len; + + TRACE("(%p)->(%s %p)\n", This, debugstr_variant(&varID), pszKeyboardShortcut); + + *pszKeyboardShortcut = NULL; + if(convert_child_id(&varID) != CHILDID_SELF) + return E_INVALIDARG; + + len = SendMessageW(This->hwnd, WM_GETTEXT, sizeof(name)/sizeof(WCHAR), (LPARAM)name); + for(i=0; i<len; i++) { + if(name[i] == '&') + break; + } + if(i+1 >= len) + return S_FALSE; + + *pszKeyboardShortcut = SysAllocString(shortcut_fmt); + if(!*pszKeyboardShortcut) + return E_OUTOFMEMORY; + + (*pszKeyboardShortcut)[4] = name[i+1]; + return S_OK; } static HRESULT WINAPI Client_get_accFocus(IAccessible *iface, VARIANT *pvarID)

1 0

Piotr Caban : oleacc: Add Client_get_accRole implementaiton.
by Alexandre Julliard May 1, 2014

May 1, 2014

Module: wine Branch: master Commit: 0793010063a0714ec523438f675412aeeb59480c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0793010063a0714ec523438f6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 1 16:15:03 2014 +0200 oleacc: Add Client_get_accRole implementaiton. --- dlls/oleacc/client.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index a60ec24..e768657 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -211,8 +211,28 @@ static HRESULT WINAPI Client_get_accRole(IAccessible *iface, VARIANT varID, VARI static HRESULT WINAPI Client_get_accState(IAccessible *iface, VARIANT varID, VARIANT *pvarState) { Client *This = impl_from_Client(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_variant(&varID), pvarState); - return E_NOTIMPL; + LONG style; + + TRACE("(%p)->(%s %p)\n", This, debugstr_variant(&varID), pvarState); + + if(convert_child_id(&varID) != CHILDID_SELF) { + V_VT(pvarState) = VT_EMPTY; + return E_INVALIDARG; + } + + V_VT(pvarState) = VT_I4; + V_I4(pvarState) = 0; + + style = GetWindowLongW(This->hwnd, GWL_STYLE); + if(style & WS_DISABLED) + V_I4(pvarState) |= STATE_SYSTEM_UNAVAILABLE; + else if(IsWindow(This->hwnd)) + V_I4(pvarState) |= STATE_SYSTEM_FOCUSABLE; + if(GetFocus() == This->hwnd) + V_I4(pvarState) |= STATE_SYSTEM_FOCUSED; + if(!(style & WS_VISIBLE)) + V_I4(pvarState) |= STATE_SYSTEM_INVISIBLE; + return S_OK; } static HRESULT WINAPI Client_get_accHelp(IAccessible *iface, VARIANT varID, BSTR *pszHelp)

1 0

Piotr Caban : oleacc: Add Client_get_accDefaultAction implementation.
by Alexandre Julliard May 1, 2014

May 1, 2014

Module: wine Branch: master Commit: acc45124d630f0c315c0f8841e6c3f021eff050e URL: http://source.winehq.org/git/wine.git/?a=commit;h=acc45124d630f0c315c0f8841… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 1 16:14:53 2014 +0200 oleacc: Add Client_get_accDefaultAction implementation. --- dlls/oleacc/client.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index 104ebdb..88009f3 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -261,8 +261,13 @@ static HRESULT WINAPI Client_get_accDefaultAction(IAccessible *iface, VARIANT varID, BSTR *pszDefaultAction) { Client *This = impl_from_Client(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_variant(&varID), pszDefaultAction); - return E_NOTIMPL; + + TRACE("(%p)->(%s %p)\n", This, debugstr_variant(&varID), pszDefaultAction); + + *pszDefaultAction = NULL; + if(convert_child_id(&varID) != CHILDID_SELF) + return E_INVALIDARG; + return S_FALSE; } static HRESULT WINAPI Client_accSelect(IAccessible *iface, LONG flagsSelect, VARIANT varID)

1 0

Piotr Caban : oleacc: Add Client_get_accHelp implementation.
by Alexandre Julliard May 1, 2014

May 1, 2014

Module: wine Branch: master Commit: 4ecee6f7d824e4d734b5b93f3448ccb1ffe05cae URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ecee6f7d824e4d734b5b93f3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 1 16:14:48 2014 +0200 oleacc: Add Client_get_accHelp implementation. --- dlls/oleacc/client.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index 7af5c38..104ebdb 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -218,8 +218,13 @@ static HRESULT WINAPI Client_get_accState(IAccessible *iface, VARIANT varID, VAR static HRESULT WINAPI Client_get_accHelp(IAccessible *iface, VARIANT varID, BSTR *pszHelp) { Client *This = impl_from_Client(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_variant(&varID), pszHelp); - return E_NOTIMPL; + + TRACE("(%p)->(%s %p)\n", This, debugstr_variant(&varID), pszHelp); + + *pszHelp = NULL; + if(convert_child_id(&varID) != CHILDID_SELF) + return E_INVALIDARG; + return S_FALSE; } static HRESULT WINAPI Client_get_accHelpTopic(IAccessible *iface,

1 0