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

Piotr Caban : oleacc: Add WindowFromAccessibleObject implementation.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 6bd87c6bdbd91fb16fc6db746544adbfe57aa896 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bd87c6bdbd91fb16fc6db746… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 15 17:53:43 2014 +0200 oleacc: Add WindowFromAccessibleObject implementation. --- dlls/oleacc/main.c | 34 ++++++++++++++++++++++++++++++++++ dlls/oleacc/oleacc.spec | 2 +- dlls/oleacc/tests/main.c | 3 +++ 3 files changed, 38 insertions(+), 1 deletion(-) diff --git a/dlls/oleacc/main.c b/dlls/oleacc/main.c index 37d2269..9d5320e 100644 --- a/dlls/oleacc/main.c +++ b/dlls/oleacc/main.c @@ -295,6 +295,40 @@ HRESULT WINAPI AccessibleObjectFromWindow( HWND hwnd, DWORD dwObjectID, return CreateStdAccessibleObject(hwnd, dwObjectID, riid, ppvObject); } +HRESULT WINAPI WindowFromAccessibleObject(IAccessible *acc, HWND *phwnd) +{ + IDispatch *parent; + IOleWindow *ow; + HRESULT hres; + + TRACE("%p %p\n", acc, phwnd); + + IAccessible_AddRef(acc); + while(1) { + hres = IAccessible_QueryInterface(acc, &IID_IOleWindow, (void**)&ow); + if(SUCCEEDED(hres)) { + hres = IOleWindow_GetWindow(ow, phwnd); + IOleWindow_Release(ow); + IAccessible_Release(acc); + return hres; + } + + hres = IAccessible_get_accParent(acc, &parent); + IAccessible_Release(acc); + if(FAILED(hres)) + return hres; + if(hres!=S_OK || !parent) { + *phwnd = NULL; + return hres; + } + + hres = IDispatch_QueryInterface(parent, &IID_IAccessible, (void**)&acc); + IDispatch_Release(parent); + if(FAILED(hres)) + return hres; + } +} + BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { diff --git a/dlls/oleacc/oleacc.spec b/dlls/oleacc/oleacc.spec index 679ba1a..caeb6d3 100644 --- a/dlls/oleacc/oleacc.spec +++ b/dlls/oleacc/oleacc.spec @@ -19,4 +19,4 @@ @ stub LIBID_Accessibility @ stdcall LresultFromObject(ptr long ptr) @ stdcall ObjectFromLresult(long ptr long ptr) -@ stub WindowFromAccessibleObject +@ stdcall WindowFromAccessibleObject(ptr ptr) diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index dde2786..dbe8706 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -410,6 +410,9 @@ static void test_default_client_accessible_object(void) hr = IOleWindow_GetWindow(ow, &hwnd2); ok(hr == S_OK, "got %x\n", hr); ok(hwnd == hwnd2, "hwnd2 = %p, expected %p\n", hwnd2, hwnd); + hr = WindowFromAccessibleObject(acc, &hwnd2); + ok(hr == S_OK, "got %x\n", hr); + ok(hwnd == hwnd2, "hwnd2 = %p, expected %p\n", hwnd2, hwnd); IOleWindow_Release(ow); hr = IAccessible_get_accChildCount(acc, &l);

1 0

Jacek Caban : urlmon: Avoid ProtocolHandler being destroyed in Terminate call.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 54bf34f1e7cd916cfee8b4c383d7552296ae9a4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=54bf34f1e7cd916cfee8b4c38… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 15 18:56:51 2014 +0200 urlmon: Avoid ProtocolHandler being destroyed in Terminate call. --- dlls/urlmon/bindprot.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index 7f2bea1..1efb74c 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -698,6 +698,9 @@ static HRESULT WINAPI ProtocolHandler_Terminate(IInternetProtocol *iface, DWORD if(!This->reported_result) return E_FAIL; + /* This may get released in Terminate call. */ + IInternetProtocolEx_AddRef(&This->IInternetProtocolEx_iface); + IInternetProtocol_Terminate(This->protocol, 0); set_binding_sink(This, NULL, NULL); @@ -707,6 +710,7 @@ static HRESULT WINAPI ProtocolHandler_Terminate(IInternetProtocol *iface, DWORD This->bind_info = NULL; } + IInternetProtocolEx_Release(&This->IInternetProtocolEx_iface); return S_OK; }

1 0

Jacek Caban : mshtml/tests: Fixed a few more IE11 test failures.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 810d8c71408686a2deabb9ac07a13a2790372c9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=810d8c71408686a2deabb9ac0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 15 18:32:32 2014 +0200 mshtml/tests: Fixed a few more IE11 test failures. --- dlls/mshtml/tests/htmldoc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 24c6cac..11015e7 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -2983,6 +2983,7 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID case 143: /* TODO */ case 144: /* TODO */ case 178: + case 179: return E_NOTIMPL; default: @@ -3162,7 +3163,9 @@ static HRESULT WINAPI Dispatch_Invoke(IDispatch *iface, DISPID dispIdMember, REF ok(puArgErr != NULL, "puArgErr == NULL\n"); ok(V_VT(pVarResult) == 0, "V_VT(pVarResult)=%d, expected 0\n", V_VT(pVarResult)); ok(wFlags == DISPATCH_PROPERTYGET, "wFlags=%08x, expected DISPATCH_PROPERTYGET\n", wFlags); - test_readyState(NULL); + + if(dispIdMember != DISPID_AMBIENT_SILENT && dispIdMember != DISPID_AMBIENT_OFFLINEIFNOTCONNECTED) + test_readyState(NULL); switch(dispIdMember) { case DISPID_AMBIENT_USERMODE:

1 0

Piotr Caban : oleacc: Add IOleWindow interface stub to default client accessible object.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 8c808f3ee90966a86c0f9ca17e78b1fbe4662378 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c808f3ee90966a86c0f9ca17… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 15 17:53:13 2014 +0200 oleacc: Add IOleWindow interface stub to default client accessible object. --- dlls/oleacc/client.c | 58 +++++++++++++++++++++++++++++++++++++++++++--- dlls/oleacc/tests/main.c | 5 ++++ 2 files changed, 60 insertions(+), 3 deletions(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index 8a48b36..8c3f011 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -27,6 +27,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(oleacc); typedef struct { IAccessible IAccessible_iface; + IOleWindow IOleWindow_iface; LONG ref; @@ -48,11 +49,16 @@ static HRESULT WINAPI Client_QueryInterface(IAccessible *iface, REFIID riid, voi IsEqualIID(riid, &IID_IDispatch) || IsEqualIID(riid, &IID_IUnknown)) { *ppv = iface; - IAccessible_AddRef(iface); - return S_OK; + }else if(IsEqualIID(riid, &IID_IOleWindow)) { + *ppv = &This->IOleWindow_iface; + }else { + WARN("no interface: %s\n", debugstr_guid(riid)); + *ppv = NULL; + return E_NOINTERFACE; } - return E_NOINTERFACE; + IAccessible_AddRef(iface); + return S_OK; } static ULONG WINAPI Client_AddRef(IAccessible *iface) @@ -439,6 +445,51 @@ static const IAccessibleVtbl ClientVtbl = { Client_put_accValue }; +static inline Client* impl_from_Client_OleWindow(IOleWindow *iface) +{ + return CONTAINING_RECORD(iface, Client, IOleWindow_iface); +} + +static HRESULT WINAPI Client_OleWindow_QueryInterface(IOleWindow *iface, REFIID riid, void **ppv) +{ + Client *This = impl_from_Client_OleWindow(iface); + return IAccessible_QueryInterface(&This->IAccessible_iface, riid, ppv); +} + +static ULONG WINAPI Client_OleWindow_AddRef(IOleWindow *iface) +{ + Client *This = impl_from_Client_OleWindow(iface); + return IAccessible_AddRef(&This->IAccessible_iface); +} + +static ULONG WINAPI Client_OleWindow_Release(IOleWindow *iface) +{ + Client *This = impl_from_Client_OleWindow(iface); + return IAccessible_Release(&This->IAccessible_iface); +} + +static HRESULT WINAPI Client_OleWindow_GetWindow(IOleWindow *iface, HWND *phwnd) +{ + Client *This = impl_from_Client_OleWindow(iface); + FIXME("(%p)->(%p)\n", This, phwnd); + return E_NOTIMPL; +} + +static HRESULT WINAPI Client_OleWindow_ContextSensitiveHelp(IOleWindow *iface, BOOL fEnterMode) +{ + Client *This = impl_from_Client_OleWindow(iface); + FIXME("(%p)->(%x)\n", This, fEnterMode); + return E_NOTIMPL; +} + +static const IOleWindowVtbl ClientOleWindowVtbl = { + Client_OleWindow_QueryInterface, + Client_OleWindow_AddRef, + Client_OleWindow_Release, + Client_OleWindow_GetWindow, + Client_OleWindow_ContextSensitiveHelp +}; + HRESULT create_client_object(HWND hwnd, const IID *iid, void **obj) { Client *client; @@ -452,6 +503,7 @@ HRESULT create_client_object(HWND hwnd, const IID *iid, void **obj) return E_OUTOFMEMORY; client->IAccessible_iface.lpVtbl = &ClientVtbl; + client->IOleWindow_iface.lpVtbl = &ClientOleWindowVtbl; client->ref = 1; client->hwnd = hwnd; diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index d76dc79..3783d36 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -383,6 +383,7 @@ static void test_default_client_accessible_object(void) IAccessible *acc; IDispatch *disp; + IOleWindow *ow; HWND chld, hwnd; HRESULT hr; VARIANT vid, v; @@ -404,6 +405,10 @@ static void test_default_client_accessible_object(void) hr = CreateStdAccessibleObject(hwnd, OBJID_CLIENT, &IID_IAccessible, (void**)&acc); ok(hr == S_OK, "got %x\n", hr); + hr = IAccessible_QueryInterface(acc, &IID_IOleWindow, (void**)&ow); + ok(hr == S_OK, "got %x\n", hr); + IOleWindow_Release(ow); + hr = IAccessible_get_accChildCount(acc, &l); ok(hr == S_OK, "got %x\n", hr); ok(l == 1, "l = %d\n", l);

1 0

Piotr Caban : oleacc: Disable tests on old oleacc.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 94b721000a371668fcc12f80ebde01260155a943 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94b721000a371668fcc12f80e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 15 17:53:04 2014 +0200 oleacc: Disable tests on old oleacc. --- dlls/oleacc/tests/main.c | 71 ++++++++++++++++++++-------------------------- 1 file changed, 31 insertions(+), 40 deletions(-) diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index be30da3..d76dc79 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -26,6 +26,21 @@ #include "initguid.h" #include <oleacc.h> +static HANDLE (WINAPI *pGetProcessHandleFromHwnd)(HWND); + +static BOOL init(void) +{ + HMODULE oleacc = GetModuleHandleA("oleacc.dll"); + + pGetProcessHandleFromHwnd = (void*)GetProcAddress(oleacc, "GetProcessHandleFromHwnd"); + if(!pGetProcessHandleFromHwnd) { + win_skip("GetProcessHandleFromHwnd not available\n"); + return FALSE; + } + + return TRUE; +} + static void test_getroletext(void) { INT ret, role; @@ -38,9 +53,7 @@ static void test_getroletext(void) buf[0] = '*'; ret = GetRoleTextA(-1, buf, 2); ok(ret == 0, "GetRoleTextA doesn't return zero on wrong role number, got %d\n", ret); - ok(buf[0] == 0 || - broken(buf[0] == '*'), /* Win98 and WinMe */ - "GetRoleTextA modified buffer on wrong role number\n"); + ok(buf[0] == 0, "GetRoleTextA doesn't return NULL char on wrong role number\n"); buf[0] = '*'; ret = GetRoleTextA(-1, buf, 0); ok(ret == 0, "GetRoleTextA doesn't return zero on wrong role number, got %d\n", ret); @@ -51,9 +64,7 @@ static void test_getroletext(void) bufW[0] = '*'; ret = GetRoleTextW(-1, bufW, 2); ok(ret == 0, "GetRoleTextW doesn't return zero on wrong role number, got %d\n", ret); - ok(bufW[0] == '\0' || - broken(bufW[0] == '*'), /* Win98 and WinMe */ - "GetRoleTextW doesn't return NULL char on wrong role number\n"); + ok(bufW[0] == '\0', "GetRoleTextW doesn't return NULL char on wrong role number\n"); bufW[0] = '*'; ret = GetRoleTextW(-1, bufW, 0); ok(ret == 0, "GetRoleTextW doesn't return zero on wrong role number, got %d\n", ret); @@ -89,14 +100,9 @@ static void test_getroletext(void) ok(buf[0] == '\0', "GetRoleTextA returned not zero-length buffer\n"); buf[0] = '*'; ret = GetRoleTextA(ROLE_SYSTEM_TITLEBAR, buf, 2); - ok(broken(ret == 1) || - ret == 0, /* Vista and W2K8 */ - "GetRoleTextA returned wrong length, got %d, expected 0 or 1\n", ret); - if (ret == 0) { - ok(!buf[0] || - broken(buf[0]!='*') /* WinXP */, - "GetRoleTextA returned not zero-length buffer : (%c)\n", buf[0]); - } + ok(!ret, "GetRoleTextA returned wrong length, got %d, expected 0\n", ret); + ok(!buf[0] || broken(buf[0]!='*') /* WinXP */, + "GetRoleTextA returned not zero-length buffer : (%c)\n", buf[0]); bufW[0] = '*'; ret = GetRoleTextW(ROLE_SYSTEM_TITLEBAR, bufW, 1); @@ -131,11 +137,7 @@ static void test_getroletext(void) memset(buff2, 0, sizeof(buff2)); ret = GetRoleTextA(role, NULL, 0); - /* Win98 up to W2K miss some of the roles */ - if (role >= ROLE_SYSTEM_SPLITBUTTON) - ok(ret > 0 || broken(ret == 0), "Expected the role %d to be present\n", role); - else - ok(ret > 0, "Expected the role to be present\n"); + ok(ret > 0, "Expected the role to be present\n"); GetRoleTextA(role, buff2, sizeof(buff2)); ok(ret == lstrlenA(buff2), @@ -176,12 +178,10 @@ static void test_GetStateText(void) ok(!ret, "got %d, expected 0\n", ret); ok(!buf[0], "buf[0] = '%c'\n", buf[0]); - for(i=0; i<30; i++) { + for(i=0; i<31; i++) { ret = GetStateTextW(1<<i, buf, 1024); ok(ret, "%d) GetStateText failed\n", i); } - ret = GetStateTextW(1<<30, buf, 1024); - ok(ret || broken(!ret), "30) GetStateText failed\n"); ret = GetStateTextW(1<<31, buf, 1024); ok(!ret, "31) GetStateText succeeded: %d\n", ret); @@ -211,12 +211,10 @@ static void test_GetStateText(void) ok(!ret, "got %d, expected 0\n", ret); ok(!bufa[0], "bufa[0] = '%c'\n", bufa[0]); - for(i=0; i<30; i++) { + for(i=0; i<31; i++) { ret = GetStateTextA(1<<i, bufa, 1024); ok(ret, "%d) GetStateText failed\n", i); } - ret = GetStateTextA(1<<30, bufa, 1024); - ok(ret || broken(!ret), "30) GetStateText failed\n"); ret = GetStateTextA(1<<31, bufa, 1024); ok(!ret, "31) GetStateText succeeded: %d\n", ret); } @@ -263,11 +261,9 @@ static void test_LresultFromObject(const char *name) ok(lres == E_INVALIDARG, "got %lx\n", lres); hres = ObjectFromLresult(0, &IID_IUnknown, 0, (void**)&unk); - ok(hres==MAKE_HRESULT(SEVERITY_ERROR,FACILITY_WIN32,ERROR_INVALID_ADDRESS) - || hres==E_FAIL, "got %x\n", hres); + ok(hres == E_FAIL, "got %x\n", hres); hres = ObjectFromLresult(0x10000, &IID_IUnknown, 0, (void**)&unk); - ok(hres==MAKE_HRESULT(SEVERITY_ERROR,FACILITY_WIN32,ERROR_INVALID_ADDRESS) - || hres==E_FAIL, "got %x\n", hres); + ok(hres == E_FAIL, "got %x\n", hres); ok(Object_ref == 1, "Object_ref = %d\n", Object_ref); lres = LresultFromObject(&IID_IUnknown, 0, &Object); @@ -301,7 +297,7 @@ static LRESULT WINAPI test_window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARA return 0; } - ok(wparam==0xffffffff || broken(wparam==0x8000), "wparam = %lx\n", wparam); + ok(wparam==0xffffffff, "wparam = %lx\n", wparam); if(lparam == (DWORD)OBJID_CURSOR) return E_UNEXPECTED; if(lparam == (DWORD)OBJID_CLIENT) @@ -364,17 +360,9 @@ static void test_AccessibleObjectFromWindow(void) static void test_GetProcessHandleFromHwnd(void) { - HANDLE (WINAPI *pGetProcessHandleFromHwnd)(HWND); HANDLE proc; HWND hwnd; - pGetProcessHandleFromHwnd = (void*)GetProcAddress( - GetModuleHandleA("oleacc.dll"), "GetProcessHandleFromHwnd"); - if(!pGetProcessHandleFromHwnd) { - win_skip("GetProcessHandleFromHwnd not available\n"); - return; - } - proc = pGetProcessHandleFromHwnd(NULL); ok(!proc, "proc = %p\n", proc); @@ -456,8 +444,8 @@ static void test_default_client_accessible_object(void) hr = IAccessible_get_accState(acc, vid, &v); ok(hr == S_OK, "got %x\n", hr); ok(V_VT(&v) == VT_I4, "V_VT(&v) = %d\n", V_VT(&v)); - ok(V_I4(&v) == (STATE_SYSTEM_FOCUSABLE|STATE_SYSTEM_INVISIBLE) || - broken(V_I4(&v) == STATE_SYSTEM_INVISIBLE), "V_I4(&v) = %x\n", V_I4(&v)); + ok(V_I4(&v) == (STATE_SYSTEM_FOCUSABLE|STATE_SYSTEM_INVISIBLE), + "V_I4(&v) = %x\n", V_I4(&v)); str = (void*)0xdeadbeef; hr = IAccessible_get_accHelp(acc, vid, &str); @@ -580,6 +568,9 @@ START_TEST(main) int argc; char **argv; + if(!init()) + return; + CoInitializeEx(NULL, COINIT_MULTITHREADED); argc = winetest_get_mainargs(&argv);

1 0

Piotr Caban : oleacc: Add IOleWindow interface stub to default window accessible object.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 69ab9da0da71e880bf8f7908f575009d0cd65cf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69ab9da0da71e880bf8f7908f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 15 17:53:24 2014 +0200 oleacc: Add IOleWindow interface stub to default window accessible object. --- dlls/oleacc/window.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 55 insertions(+), 3 deletions(-) diff --git a/dlls/oleacc/window.c b/dlls/oleacc/window.c index 45c53fc..f8090b5 100644 --- a/dlls/oleacc/window.c +++ b/dlls/oleacc/window.c @@ -27,6 +27,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(oleacc); typedef struct { IAccessible IAccessible_iface; + IOleWindow IOleWindow_iface; LONG ref; } Window; @@ -46,11 +47,16 @@ static HRESULT WINAPI Window_QueryInterface(IAccessible *iface, REFIID riid, voi IsEqualIID(riid, &IID_IDispatch) || IsEqualIID(riid, &IID_IUnknown)) { *ppv = iface; - IAccessible_AddRef(iface); - return S_OK; + }else if(IsEqualIID(riid, &IID_IOleWindow)) { + *ppv = &This->IOleWindow_iface; + }else { + WARN("no interface: %s\n", debugstr_guid(riid)); + *ppv = NULL; + return E_NOINTERFACE; } - return E_NOINTERFACE; + IAccessible_AddRef(iface); + return S_OK; } static ULONG WINAPI Window_AddRef(IAccessible *iface) @@ -295,6 +301,51 @@ static const IAccessibleVtbl WindowVtbl = { Window_put_accValue }; +static inline Window* impl_from_Window_OleWindow(IOleWindow *iface) +{ + return CONTAINING_RECORD(iface, Window, IOleWindow_iface); +} + +static HRESULT WINAPI Window_OleWindow_QueryInterface(IOleWindow *iface, REFIID riid, void **ppv) +{ + Window *This = impl_from_Window_OleWindow(iface); + return IAccessible_QueryInterface(&This->IAccessible_iface, riid, ppv); +} + +static ULONG WINAPI Window_OleWindow_AddRef(IOleWindow *iface) +{ + Window *This = impl_from_Window_OleWindow(iface); + return IAccessible_AddRef(&This->IAccessible_iface); +} + +static ULONG WINAPI Window_OleWindow_Release(IOleWindow *iface) +{ + Window *This = impl_from_Window_OleWindow(iface); + return IAccessible_Release(&This->IAccessible_iface); +} + +static HRESULT WINAPI Window_OleWindow_GetWindow(IOleWindow *iface, HWND *phwnd) +{ + Window *This = impl_from_Window_OleWindow(iface); + FIXME("(%p)->(%p)\n", This, phwnd); + return E_NOTIMPL; +} + +static HRESULT WINAPI Window_OleWindow_ContextSensitiveHelp(IOleWindow *iface, BOOL fEnterMode) +{ + Window *This = impl_from_Window_OleWindow(iface); + FIXME("(%p)->(%x)\n", This, fEnterMode); + return E_NOTIMPL; +} + +static const IOleWindowVtbl WindowOleWindowVtbl = { + Window_OleWindow_QueryInterface, + Window_OleWindow_AddRef, + Window_OleWindow_Release, + Window_OleWindow_GetWindow, + Window_OleWindow_ContextSensitiveHelp +}; + HRESULT create_window_object(HWND hwnd, const IID *iid, void **obj) { Window *window; @@ -308,6 +359,7 @@ HRESULT create_window_object(HWND hwnd, const IID *iid, void **obj) return E_OUTOFMEMORY; window->IAccessible_iface.lpVtbl = &WindowVtbl; + window->IOleWindow_iface.lpVtbl = &WindowOleWindowVtbl; window->ref = 1; hres = IAccessible_QueryInterface(&window->IAccessible_iface, iid, obj);

1 0

Piotr Caban : oleacc: Add IOleWindow:: GetWindow implementation in default client accessible object.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 25312a10d35e9b45c485dba78c9c36fb79abb32a URL: http://source.winehq.org/git/wine.git/?a=commit;h=25312a10d35e9b45c485dba78… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 15 17:53:37 2014 +0200 oleacc: Add IOleWindow::GetWindow implementation in default client accessible object. --- dlls/oleacc/client.c | 7 +++++-- dlls/oleacc/tests/main.c | 5 ++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index 8c3f011..cc7b53a 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -471,8 +471,11 @@ static ULONG WINAPI Client_OleWindow_Release(IOleWindow *iface) static HRESULT WINAPI Client_OleWindow_GetWindow(IOleWindow *iface, HWND *phwnd) { Client *This = impl_from_Client_OleWindow(iface); - FIXME("(%p)->(%p)\n", This, phwnd); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, phwnd); + + *phwnd = This->hwnd; + return S_OK; } static HRESULT WINAPI Client_OleWindow_ContextSensitiveHelp(IOleWindow *iface, BOOL fEnterMode) diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index 3783d36..dde2786 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -384,7 +384,7 @@ static void test_default_client_accessible_object(void) IAccessible *acc; IDispatch *disp; IOleWindow *ow; - HWND chld, hwnd; + HWND chld, hwnd, hwnd2; HRESULT hr; VARIANT vid, v; BSTR str; @@ -407,6 +407,9 @@ static void test_default_client_accessible_object(void) hr = IAccessible_QueryInterface(acc, &IID_IOleWindow, (void**)&ow); ok(hr == S_OK, "got %x\n", hr); + hr = IOleWindow_GetWindow(ow, &hwnd2); + ok(hr == S_OK, "got %x\n", hr); + ok(hwnd == hwnd2, "hwnd2 = %p, expected %p\n", hwnd2, hwnd); IOleWindow_Release(ow); hr = IAccessible_get_accChildCount(acc, &l);

1 0

Jacek Caban : msctf: Added IEnumTfInputProcessorProfiles interface stub implementation.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 645cdf9dc31c226caa3b1cb6b7a8d881979e122d URL: http://source.winehq.org/git/wine.git/?a=commit;h=645cdf9dc31c226caa3b1cb6b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 15 16:52:30 2014 +0200 msctf: Added IEnumTfInputProcessorProfiles interface stub implementation. --- dlls/msctf/inputprocessor.c | 113 ++++++++++++++++++++++++++++++++++++- dlls/msctf/tests/inputprocessor.c | 11 +++- 2 files changed, 119 insertions(+), 5 deletions(-) diff --git a/dlls/msctf/inputprocessor.c b/dlls/msctf/inputprocessor.c index f1595f8..89eb746 100644 --- a/dlls/msctf/inputprocessor.c +++ b/dlls/msctf/inputprocessor.c @@ -97,9 +97,107 @@ typedef struct tagEnumTfLanguageProfiles { ITfCategoryMgr *catmgr; } EnumTfLanguageProfiles; +typedef struct { + IEnumTfInputProcessorProfiles IEnumTfInputProcessorProfiles_iface; + LONG ref; +} EnumTfInputProcessorProfiles; + static HRESULT ProfilesEnumGuid_Constructor(IEnumGUID **ppOut); static HRESULT EnumTfLanguageProfiles_Constructor(LANGID langid, IEnumTfLanguageProfiles **ppOut); +static inline EnumTfInputProcessorProfiles *impl_from_IEnumTfInputProcessorProfiles(IEnumTfInputProcessorProfiles *iface) +{ + return CONTAINING_RECORD(iface, EnumTfInputProcessorProfiles, IEnumTfInputProcessorProfiles_iface); +} + +static HRESULT WINAPI EnumTfInputProcessorProfiles_QueryInterface(IEnumTfInputProcessorProfiles *iface, + REFIID riid, void **ppv) +{ + EnumTfInputProcessorProfiles *This = impl_from_IEnumTfInputProcessorProfiles(iface); + + if(IsEqualGUID(riid, &IID_IUnknown)) { + TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); + *ppv = &This->IEnumTfInputProcessorProfiles_iface; + }else if(IsEqualGUID(riid, &IID_IEnumTfInputProcessorProfiles)) { + TRACE("(%p)->(IID_IEnumTfInputProcessorProfiles %p)\n", This, ppv); + *ppv = &This->IEnumTfInputProcessorProfiles_iface; + }else { + *ppv = NULL; + WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI EnumTfInputProcessorProfiles_AddRef(IEnumTfInputProcessorProfiles *iface) +{ + EnumTfInputProcessorProfiles *This = impl_from_IEnumTfInputProcessorProfiles(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI EnumTfInputProcessorProfiles_Release(IEnumTfInputProcessorProfiles *iface) +{ + EnumTfInputProcessorProfiles *This = impl_from_IEnumTfInputProcessorProfiles(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) + HeapFree(GetProcessHeap(), 0, This); + + return ref; +} + +static HRESULT WINAPI EnumTfInputProcessorProfiles_Clone(IEnumTfInputProcessorProfiles *iface, + IEnumTfInputProcessorProfiles **ret) +{ + EnumTfInputProcessorProfiles *This = impl_from_IEnumTfInputProcessorProfiles(iface); + FIXME("(%p)->(%p)\n", This, ret); + return E_NOTIMPL; +} + +static HRESULT WINAPI EnumTfInputProcessorProfiles_Next(IEnumTfInputProcessorProfiles *iface, ULONG count, + TF_INPUTPROCESSORPROFILE *profile, ULONG *fetch) +{ + EnumTfInputProcessorProfiles *This = impl_from_IEnumTfInputProcessorProfiles(iface); + + FIXME("(%p)->(%u %p %p)\n", This, count, profile, fetch); + + if(fetch) + *fetch = 0; + return S_FALSE; +} + +static HRESULT WINAPI EnumTfInputProcessorProfiles_Reset(IEnumTfInputProcessorProfiles *iface) +{ + EnumTfInputProcessorProfiles *This = impl_from_IEnumTfInputProcessorProfiles(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI EnumTfInputProcessorProfiles_Skip(IEnumTfInputProcessorProfiles *iface, ULONG count) +{ + EnumTfInputProcessorProfiles *This = impl_from_IEnumTfInputProcessorProfiles(iface); + FIXME("(%p)->(%u)\n", This, count); + return E_NOTIMPL; +} + +static const IEnumTfInputProcessorProfilesVtbl EnumTfInputProcessorProfilesVtbl = { + EnumTfInputProcessorProfiles_QueryInterface, + EnumTfInputProcessorProfiles_AddRef, + EnumTfInputProcessorProfiles_Release, + EnumTfInputProcessorProfiles_Clone, + EnumTfInputProcessorProfiles_Next, + EnumTfInputProcessorProfiles_Reset, + EnumTfInputProcessorProfiles_Skip +}; + static inline InputProcessorProfiles *impl_from_ITfInputProcessorProfiles(ITfInputProcessorProfiles *iface) { return CONTAINING_RECORD(iface, InputProcessorProfiles, ITfInputProcessorProfiles_iface); @@ -742,8 +840,19 @@ static HRESULT WINAPI InputProcessorProfileMgr_EnumProfiles(ITfInputProcessorPro IEnumTfInputProcessorProfiles **ppEnum) { InputProcessorProfiles *This = impl_from_ITfInputProcessorProfileMgr(iface); - FIXME("(%p)->(%x %p)\n", This, langid, ppEnum); - return E_NOTIMPL; + EnumTfInputProcessorProfiles *enum_profiles; + + TRACE("(%p)->(%x %p)\n", This, langid, ppEnum); + + enum_profiles = HeapAlloc(GetProcessHeap(), 0, sizeof(*enum_profiles)); + if(!enum_profiles) + return E_OUTOFMEMORY; + + enum_profiles->IEnumTfInputProcessorProfiles_iface.lpVtbl = &EnumTfInputProcessorProfilesVtbl; + enum_profiles->ref = 1; + + *ppEnum = &enum_profiles->IEnumTfInputProcessorProfiles_iface; + return S_OK; } static HRESULT WINAPI InputProcessorProfileMgr_ReleaseInputProcessor(ITfInputProcessorProfileMgr *iface, REFCLSID rclsid, diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index f457dbb..8a052b3 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -2186,15 +2186,20 @@ static void test_AssociateFocus(void) sink_check_ok(&test_OnPopContext,"OnPopContext"); } -static void test_QI(void) +static void test_profile_mgr(void) { + IEnumTfInputProcessorProfiles *enum_profiles; ITfInputProcessorProfileMgr *ipp_mgr; HRESULT hres; - /* A trivial test, probably worth moving once more will be added. */ hres = ITfInputProcessorProfiles_QueryInterface(g_ipp, &IID_ITfInputProcessorProfileMgr, (void**)&ipp_mgr); ok(hres == S_OK, "Could not get ITfInputProcessorProfileMgr iface: %08x\n", hres); + hres = ITfInputProcessorProfileMgr_EnumProfiles(ipp_mgr, 0, &enum_profiles); + ok(hres == S_OK, "EnumProfiles failed: %08x\n", hres); + + IEnumTfInputProcessorProfiles_Release(enum_profiles); + ITfInputProcessorProfileMgr_Release(ipp_mgr); } @@ -2224,7 +2229,7 @@ START_TEST(inputprocessor) test_ThreadMgrUnadviseSinks(); test_UnregisterCategory(); test_Unregister(); - test_QI(); + test_profile_mgr(); } else skip("Unable to create InputProcessor\n");

1 0

Martin Storsjo : ntdll: Align FILE_*_DIRECTORY_INFORMATION structs to 8 bytes.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 8cb42d41351377415749008de2b6f00593309b54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cb42d41351377415749008de… Author: Martin Storsjo <martin(a)martin.st> Date: Thu May 15 15:25:05 2014 +0300 ntdll: Align FILE_*_DIRECTORY_INFORMATION structs to 8 bytes. --- dlls/ntdll/directory.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 50bf66a..04a5b75 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -228,15 +228,15 @@ static inline unsigned int dir_info_size( FILE_INFORMATION_CLASS class, unsigned switch (class) { case FileDirectoryInformation: - return (FIELD_OFFSET( FILE_DIRECTORY_INFORMATION, FileName[len] ) + 3) & ~3; + return (FIELD_OFFSET( FILE_DIRECTORY_INFORMATION, FileName[len] ) + 7) & ~7; case FileBothDirectoryInformation: - return (FIELD_OFFSET( FILE_BOTH_DIRECTORY_INFORMATION, FileName[len] ) + 3) & ~3; + return (FIELD_OFFSET( FILE_BOTH_DIRECTORY_INFORMATION, FileName[len] ) + 7) & ~7; case FileFullDirectoryInformation: - return (FIELD_OFFSET( FILE_FULL_DIRECTORY_INFORMATION, FileName[len] ) + 3) & ~3; + return (FIELD_OFFSET( FILE_FULL_DIRECTORY_INFORMATION, FileName[len] ) + 7) & ~7; case FileIdBothDirectoryInformation: - return (FIELD_OFFSET( FILE_ID_BOTH_DIRECTORY_INFORMATION, FileName[len] ) + 3) & ~3; + return (FIELD_OFFSET( FILE_ID_BOTH_DIRECTORY_INFORMATION, FileName[len] ) + 7) & ~7; case FileIdFullDirectoryInformation: - return (FIELD_OFFSET( FILE_ID_FULL_DIRECTORY_INFORMATION, FileName[len] ) + 3) & ~3; + return (FIELD_OFFSET( FILE_ID_FULL_DIRECTORY_INFORMATION, FileName[len] ) + 7) & ~7; default: assert(0); return 0;

1 0

Alexandre Julliard : d3d10: Remove unnecessary DllMain implementation.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 29fcb82b94d584939c11f757c4514f8d5e8074c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29fcb82b94d584939c11f757c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 15 14:38:23 2014 +0200 d3d10: Remove unnecessary DllMain implementation. --- dlls/d3d10/d3d10_main.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/dlls/d3d10/d3d10_main.c b/dlls/d3d10/d3d10_main.c index 6d4d626..12c97ce 100644 --- a/dlls/d3d10/d3d10_main.c +++ b/dlls/d3d10/d3d10_main.c @@ -27,18 +27,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d10); -BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) -{ - switch (reason) - { - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(inst); - break; - } - - return TRUE; -} - HRESULT WINAPI D3D10CreateDevice(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver_type, HMODULE swrast, UINT flags, UINT sdk_version, ID3D10Device **device) {

1 0