June 2007 - Wine-commits - list.winehq.org

Andrew Talbot : msi: Fix use of uninitialized variable (Coverity).
by Alexandre Julliard 25 Jun '07

25 Jun '07

Module: wine Branch: master Commit: 0e4ccb822caaa5885a6bd441b9609723c8d0ee39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e4ccb822caaa5885a6bd441b… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Jun 23 17:28:50 2007 +0100 msi: Fix use of uninitialized variable (Coverity). --- dlls/msi/action.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index ab3c914..820d91d 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -4648,7 +4648,7 @@ static UINT ITERATE_WriteEnvironmentString( MSIRECORD *rec, LPVOID param ) LPWSTR deformatted, ptr; DWORD flags, type, size; LONG res; - HKEY env, root = HKEY_CURRENT_USER; + HKEY env = NULL, root = HKEY_CURRENT_USER; static const WCHAR environment[] = {'S','y','s','t','e','m','\\', @@ -4759,7 +4759,7 @@ static UINT ITERATE_WriteEnvironmentString( MSIRECORD *rec, LPVOID param ) res = RegSetValueExW(env, name, 0, type, (LPVOID)newval, size); done: - RegCloseKey(env); + if (env) RegCloseKey(env); msi_free(deformatted); msi_free(data); msi_free(newval);

1 0

Andrew Talbot : d3d9/tests: Fix use of uninitialized variable (Coverity).
by Alexandre Julliard 25 Jun '07

25 Jun '07

Module: wine Branch: master Commit: 7a8455094d56497d29f3d5f55735b77b7af85cd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a8455094d56497d29f3d5f55… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Jun 23 15:40:48 2007 +0100 d3d9/tests: Fix use of uninitialized variable (Coverity). --- dlls/d3d9/tests/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 710ec46..ec54ea4 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -1263,7 +1263,7 @@ static void test_draw_indexed(void) IDirect3DVertexBuffer9 *vertex_buffer = NULL; IDirect3DIndexBuffer9 *index_buffer = NULL; D3DPRESENT_PARAMETERS present_parameters; - IDirect3DDevice9 *device; + IDirect3DDevice9 *device = NULL; IDirect3D9 *d3d9; HRESULT hr; HWND hwnd;

1 0

Paul Vriens : wintrust/tests: Add tests for CryptCATAdminCalcHashFromFileHandle.
by Alexandre Julliard 25 Jun '07

25 Jun '07

Module: wine Branch: master Commit: 361280b22b5d74c9c4b17389d4930eb28c512f01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=361280b22b5d74c9c4b17389d… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Sun Jun 24 19:27:48 2007 +0200 wintrust/tests: Add tests for CryptCATAdminCalcHashFromFileHandle. --- dlls/wintrust/tests/crypt.c | 135 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 135 insertions(+), 0 deletions(-) diff --git a/dlls/wintrust/tests/crypt.c b/dlls/wintrust/tests/crypt.c index a4f1b70..600299a 100644 --- a/dlls/wintrust/tests/crypt.c +++ b/dlls/wintrust/tests/crypt.c @@ -26,10 +26,15 @@ #include "wine/test.h" +static char selfname[MAX_PATH]; + +static CHAR CURR_DIR[MAX_PATH]; + static HMODULE hWintrust = 0; static BOOL (WINAPI * pCryptCATAdminAcquireContext)(HCATADMIN*, const GUID*, DWORD); static BOOL (WINAPI * pCryptCATAdminReleaseContext)(HCATADMIN, DWORD); +static BOOL (WINAPI * pCryptCATAdminCalcHashFromFileHandle)(HANDLE hFile, DWORD*, BYTE*, DWORD); #define WINTRUST_GET_PROC(func) \ p ## func = (void*)GetProcAddress(hWintrust, #func); \ @@ -49,6 +54,7 @@ static BOOL InitFunctionPtrs(void) WINTRUST_GET_PROC(CryptCATAdminAcquireContext) WINTRUST_GET_PROC(CryptCATAdminReleaseContext) + WINTRUST_GET_PROC(CryptCATAdminCalcHashFromFileHandle) return TRUE; } @@ -159,12 +165,141 @@ static void test_context(void) ok(ret, "Expected success\n"); } +/* TODO: Check whether SHA-1 is the algorithm that's always used */ +static void test_calchash(void) +{ + BOOL ret; + HANDLE file; + DWORD hashsize = 0; + BYTE* hash; + BYTE expectedhash[20] = {0x3a,0xa1,0x19,0x08,0xec,0xa6,0x0d,0x2e,0x7e,0xcc,0x7a,0xca,0xf5,0xb8,0x2e,0x62,0x6a,0xda,0xf0,0x19}; + CHAR temp[MAX_PATH]; + DWORD written; + + if (!pCryptCATAdminCalcHashFromFileHandle) + { + skip("CryptCATAdminCalcHashFromFileHandle is not available\n"); + return; + } + + /* All NULL */ + SetLastError(0xdeadbeef); + ret = pCryptCATAdminCalcHashFromFileHandle(NULL, NULL, NULL, 0); + todo_wine + { + ok(!ret, "Expected failure\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + } + + /* NULL filehandle, rest is legal */ + SetLastError(0xdeadbeef); + ret = pCryptCATAdminCalcHashFromFileHandle(NULL, &hashsize, NULL, 0); + todo_wine + { + ok(!ret, "Expected failure\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + } + + /* Correct filehandle, rest is NULL */ + file = CreateFileA(selfname, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL); + SetLastError(0xdeadbeef); + ret = pCryptCATAdminCalcHashFromFileHandle(file, NULL, NULL, 0); + todo_wine + { + ok(!ret, "Expected failure\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + } + CloseHandle(file); + + /* All OK, but dwFlags set to 1 */ + file = CreateFileA(selfname, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL); + SetLastError(0xdeadbeef); + ret = pCryptCATAdminCalcHashFromFileHandle(file, &hashsize, NULL, 1); + todo_wine + { + ok(!ret, "Expected failure\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + } + CloseHandle(file); + + /* All OK, requesting the size of the hash */ + file = CreateFileA(selfname, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL); + SetLastError(0xdeadbeef); + ret = pCryptCATAdminCalcHashFromFileHandle(file, &hashsize, NULL, 0); + ok(ret, "Expected success\n"); + todo_wine + { + ok(hashsize == 20," Expected a hash size of 20, got %d\n", hashsize); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); + } + CloseHandle(file); + + /* All OK, retrieve the hash + * Double the hash buffer to see what happens to the size parameter + */ + file = CreateFileA(selfname, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL); + hashsize *= 2; + hash = HeapAlloc(GetProcessHeap(), 0, hashsize); + SetLastError(0xdeadbeef); + ret = pCryptCATAdminCalcHashFromFileHandle(file, &hashsize, hash, 0); + ok(ret, "Expected success\n"); + todo_wine + { + ok(hashsize == 20," Expected a hash size of 20, got %d\n", hashsize); + ok(GetLastError() == ERROR_SUCCESS, + "Expected ERROR_SUCCESS, got %d\n", GetLastError()); + } + CloseHandle(file); + HeapFree(GetProcessHeap(), 0, hash); + + /* Do the same test with a file created and filled by ourselves (and we thus + * have a known hash for). + */ + GetTempFileNameA(CURR_DIR, "hsh", 0, temp); + file = CreateFileA(temp, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL); + WriteFile(file, "Text in this file is needed to create a know hash", 49, &written, NULL); + CloseHandle(file); + + /* All OK, first request the size and then retrieve the hash */ + file = CreateFileA(temp, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL); + hashsize = 0; + pCryptCATAdminCalcHashFromFileHandle(file, &hashsize, NULL, 0); + hash = HeapAlloc(GetProcessHeap(), 0, hashsize); + SetLastError(0xdeadbeef); + ret = pCryptCATAdminCalcHashFromFileHandle(file, &hashsize, hash, 0); + ok(ret, "Expected success\n"); + todo_wine + { + ok(GetLastError() == ERROR_SUCCESS, + "Expected ERROR_SUCCESS, got %d\n", GetLastError()); + ok(!memcmp(hash, expectedhash, sizeof(expectedhash)), "Hashes didn't match\n"); + } + CloseHandle(file); + + HeapFree(GetProcessHeap(), 0, hash); + DeleteFileA(temp); +} + START_TEST(crypt) { + int myARGC; + char** myARGV; + if(!InitFunctionPtrs()) return; + myARGC = winetest_get_mainargs(&myARGV); + strcpy(selfname, myARGV[0]); + + GetCurrentDirectoryA(MAX_PATH, CURR_DIR); + test_context(); + test_calchash(); FreeLibrary(hWintrust); }

1 0

Paul Vriens : kernel32/tests: Don't crash (on Vista).
by Alexandre Julliard 25 Jun '07

25 Jun '07

Module: wine Branch: master Commit: d40233a44800458e568b829dad88715d0f3de231 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d40233a44800458e568b829da… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Sat Jun 23 16:44:36 2007 +0200 kernel32/tests: Don't crash (on Vista). --- dlls/kernel32/tests/loader.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index cb23299..8d2c7aa 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -328,6 +328,13 @@ START_TEST(loader) ok(hlib != 0, "%d: LoadLibrary error %d\n", i, GetLastError()); + /* No point in crashing. Test crashes on Vista with some of the given files */ + if (hlib == 0) + { + skip("Failed to load dll number %d\n", i); + goto endloop; + } + SetLastError(0xdeadbeef); ok(VirtualQuery(hlib, &info, sizeof(info)) == sizeof(info), "%d: VirtualQuery error %d\n", i, GetLastError()); @@ -467,6 +474,7 @@ START_TEST(loader) i, td[i].error, GetLastError()); } +endloop: SetLastError(0xdeadbeef); ok(DeleteFile(dll_name), "DeleteFile error %d\n", GetLastError()); }

1 0

Paul Vriens : kernel32/tests: Don't crash on Vista.
by Alexandre Julliard 25 Jun '07

25 Jun '07

Module: wine Branch: master Commit: 71054631b29d4ff5219fe9c016d9a20538d7ea14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71054631b29d4ff5219fe9c01… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Sat Jun 23 16:40:58 2007 +0200 kernel32/tests: Don't crash on Vista. --- dlls/kernel32/tests/environ.c | 21 ++++++++++++--------- 1 files changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/tests/environ.c b/dlls/kernel32/tests/environ.c index bb9f745..3e65e92 100644 --- a/dlls/kernel32/tests/environ.c +++ b/dlls/kernel32/tests/environ.c @@ -201,15 +201,18 @@ static void test_GetSetEnvironmentVariableW(void) "should not find variable but ret_size=%d GetLastError=%d\n", ret_size, GetLastError()); - ret_size = GetEnvironmentVariableW(NULL, buf, lstrlenW(value) + 1); - ok(ret_size == 0 && GetLastError() == ERROR_ENVVAR_NOT_FOUND, - "should not find variable but ret_size=%d GetLastError=%d\n", - ret_size, GetLastError()); - - ret = SetEnvironmentVariableW(NULL, NULL); - ok(ret == FALSE && (GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == ERROR_ENVVAR_NOT_FOUND), - "should fail with NULL, NULL but ret=%d and GetLastError=%d\n", - ret, GetLastError()); + if (0) /* Both tests crash on Vista */ + { + ret_size = GetEnvironmentVariableW(NULL, buf, lstrlenW(value) + 1); + ok(ret_size == 0 && GetLastError() == ERROR_ENVVAR_NOT_FOUND, + "should not find variable but ret_size=%d GetLastError=%d\n", + ret_size, GetLastError()); + + ret = SetEnvironmentVariableW(NULL, NULL); + ok(ret == FALSE && (GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == ERROR_ENVVAR_NOT_FOUND), + "should fail with NULL, NULL but ret=%d and GetLastError=%d\n", + ret, GetLastError()); + } } static void test_ExpandEnvironmentStringsA(void)

1 0

Jacek Caban : mshtml: Better test of QueryInterface.
by Alexandre Julliard 25 Jun '07

25 Jun '07

Module: wine Branch: master Commit: e429e039b05a3772fdfef36761e1c37c271215ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=e429e039b05a3772fdfef3676… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 22 23:54:06 2007 +0200 mshtml: Better test of QueryInterface. --- dlls/mshtml/tests/htmldoc.c | 37 +++++++++++++++++++++++++++++-------- 1 files changed, 29 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 10eec0c..caf3f19 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -21,6 +21,7 @@ #include <wine/test.h> #include <stdarg.h> +#include <stdio.h> #include "windef.h" #include "winbase.h" @@ -165,6 +166,18 @@ static const WCHAR wszTimesNewRoman[] = static const WCHAR wszArial[] = {'A','r','i','a','l',0}; +static const char *debugstr_guid(REFIID riid) +{ + static char buf[50]; + + sprintf(buf, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", + riid->Data1, riid->Data2, riid->Data3, riid->Data4[0], + riid->Data4[1], riid->Data4[2], riid->Data4[3], riid->Data4[4], + riid->Data4[5], riid->Data4[6], riid->Data4[7]); + + return buf; +} + #define EXPECT_UPDATEUI 1 #define EXPECT_SETTITLE 2 @@ -2178,6 +2191,10 @@ static const IServiceProviderVtbl ServiceProviderVtbl = { static IServiceProvider ServiceProvider = { &ServiceProviderVtbl }; +DEFINE_GUID(IID_unk1, 0xD48A6EC6,0x6A4A,0x11CF,0x94,0xA7,0x44,0x45,0x53,0x54,0x00,0x00); /* HTMLWindow2 ? */ +DEFINE_GUID(IID_unk2, 0x7BB0B520,0xB1A7,0x11D2,0xBB,0x23,0x00,0xC0,0x4F,0x79,0xAB,0xCD); +DEFINE_GUID(IID_unk3, 0x000670BA,0x0000,0x0000,0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); + static HRESULT QueryInterface(REFIID riid, void **ppv) { *ppv = NULL; @@ -2200,16 +2217,20 @@ static HRESULT QueryInterface(REFIID riid, void **ppv) *ppv = &Dispatch; else if(IsEqualGUID(&IID_IServiceProvider, riid)) *ppv = &ServiceProvider; - else if(ipsex && IsEqualGUID(&IID_IOleInPlaceSiteEx, riid)) - *ppv = &InPlaceSiteEx; + else if(IsEqualGUID(&IID_IOleInPlaceSiteEx, riid)) + *ppv = ipsex ? &InPlaceSiteEx : NULL; else if(IsEqualGUID(&IID_IOleControlSite, riid)) *ppv = &OleControlSite; - - /* TODO: - * {D48A6EC6-6A4A-11CF-94A7-444553540000} - * {7BB0B520-B1A7-11D2-BB23-00C04F79ABCD} - * {000670BA-0000-0000-C000-000000000046} - */ + else if(IsEqualGUID(&IID_IDocHostShowUI, riid)) + return E_NOINTERFACE; /* TODO */ + else if(IsEqualGUID(&IID_unk1, riid)) + return E_NOINTERFACE; /* HTMLWindow2 ? */ + else if(IsEqualGUID(&IID_unk2, riid)) + return E_NOINTERFACE; /* ? */ + else if(IsEqualGUID(&IID_unk3, riid)) + return E_NOINTERFACE; /* ? */ + else + ok(0, "unexpected riid %s\n", debugstr_guid(riid)); if(*ppv) return S_OK;

1 0

Jacek Caban : mshtml: Added IOleInPlaceUIWindow tests.
by Alexandre Julliard 25 Jun '07

25 Jun '07

Module: wine Branch: master Commit: b09f5c319e79b91121b517e1825510324ce348d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b09f5c319e79b91121b517e18… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 22 23:55:05 2007 +0200 mshtml: Added IOleInPlaceUIWindow tests. --- dlls/mshtml/tests/htmldoc.c | 28 ++++++++++++++++++++++++---- 1 files changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index caf3f19..8d3237a 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -1073,7 +1073,8 @@ static IOleContainer OleContainer = { &OleContainerVtbl }; static HRESULT WINAPI InPlaceFrame_QueryInterface(IOleInPlaceFrame *iface, REFIID riid, void **ppv) { - return QueryInterface(riid, ppv); + ok(0, "unexpected call\n"); + return E_NOINTERFACE; } static ULONG WINAPI InPlaceFrame_AddRef(IOleInPlaceFrame *iface) @@ -1118,6 +1119,13 @@ static HRESULT WINAPI InPlaceFrame_SetBorderSpace(IOleInPlaceFrame *iface, return E_NOTIMPL; } +static HRESULT WINAPI InPlaceUIWindow_SetActiveObject(IOleInPlaceFrame *iface, + IOleInPlaceActiveObject *pActiveObject, LPCOLESTR pszObjName) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + static HRESULT WINAPI InPlaceFrame_SetActiveObject(IOleInPlaceFrame *iface, IOleInPlaceActiveObject *pActiveObject, LPCOLESTR pszObjName) { @@ -1198,6 +1206,20 @@ static const IOleInPlaceFrameVtbl InPlaceFrameVtbl = { static IOleInPlaceFrame InPlaceFrame = { &InPlaceFrameVtbl }; +static const IOleInPlaceFrameVtbl InPlaceUIWindowVtbl = { + InPlaceFrame_QueryInterface, + InPlaceFrame_AddRef, + InPlaceFrame_Release, + InPlaceFrame_GetWindow, + InPlaceFrame_ContextSensitiveHelp, + InPlaceFrame_GetBorder, + InPlaceFrame_RequestBorderSpace, + InPlaceFrame_SetBorderSpace, + InPlaceUIWindow_SetActiveObject, +}; + +static IOleInPlaceFrame InPlaceUIWindow = { &InPlaceUIWindowVtbl }; + static HRESULT WINAPI InPlaceSite_QueryInterface(IOleInPlaceSiteEx *iface, REFIID riid, void **ppv) { return QueryInterface(riid, ppv); @@ -1258,7 +1280,7 @@ static HRESULT WINAPI InPlaceSite_GetWindowContext(IOleInPlaceSiteEx *iface, *ppFrame = &InPlaceFrame; ok(ppDoc != NULL, "ppDoc = NULL\n"); if(ppDoc) - *ppDoc = NULL; + *ppDoc = (IOleInPlaceUIWindow*)&InPlaceUIWindow; ok(lprcPosRect != NULL, "lprcPosRect = NULL\n"); if(lprcPosRect) memcpy(lprcPosRect, &rect, sizeof(RECT)); @@ -2209,8 +2231,6 @@ static HRESULT QueryInterface(REFIID riid, void **ppv) *ppv = &OleContainer; else if(IsEqualGUID(&IID_IOleWindow, riid) || IsEqualGUID(&IID_IOleInPlaceSite, riid)) *ppv = &InPlaceSiteEx; - else if(IsEqualGUID(&IID_IOleInPlaceUIWindow, riid) || IsEqualGUID(&IID_IOleInPlaceFrame, riid)) - *ppv = &InPlaceFrame; else if(IsEqualGUID(&IID_IOleCommandTarget , riid)) *ppv = &OleCommandTarget; else if(IsEqualGUID(&IID_IDispatch, riid))

1 0

Jacek Caban : mshtml: Set focus to FALSE in InPlaceDeactivate.
by Alexandre Julliard 25 Jun '07

25 Jun '07

Module: wine Branch: master Commit: dc2260468cc766c23005712e228a092133572b18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc2260468cc766c23005712e2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 22 23:33:41 2007 +0200 mshtml: Set focus to FALSE in InPlaceDeactivate. --- dlls/mshtml/olewnd.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/olewnd.c b/dlls/mshtml/olewnd.c index 8fe6091..5ce3209 100644 --- a/dlls/mshtml/olewnd.c +++ b/dlls/mshtml/olewnd.c @@ -201,6 +201,9 @@ static HRESULT WINAPI OleInPlaceObjectWindowless_InPlaceDeactivate(IOleInPlaceOb SetWindowPos(This->hwnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE); } + This->focus = FALSE; + notif_focus(This); + This->in_place_active = FALSE; if(This->ipsite) { IOleInPlaceSiteEx *ipsiteex;

1 0

Jacek Caban : mshtml: Added IOleControlSite tests.
by Alexandre Julliard 25 Jun '07

25 Jun '07

Module: wine Branch: master Commit: 0cf10bb15645f93450f2c6638f982b5f882d32d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cf10bb15645f93450f2c6638… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 22 23:35:09 2007 +0200 mshtml: Added IOleControlSite tests. --- dlls/mshtml/tests/htmldoc.c | 88 ++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 86 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 90b0295..10eec0c 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -121,6 +121,9 @@ DEFINE_EXPECT(Terminate); DEFINE_EXPECT(Protocol_Read); DEFINE_EXPECT(LockRequest); DEFINE_EXPECT(UnlockRequest); +DEFINE_EXPECT(OnFocus_TRUE); +DEFINE_EXPECT(OnFocus_FALSE); +DEFINE_EXPECT(RequestUIActivate); static IUnknown *doc_unk; static BOOL expect_LockContainer_fLock; @@ -1320,8 +1323,8 @@ static HRESULT WINAPI InPlaceSiteEx_OnInPlaceDeactivateEx(IOleInPlaceSiteEx *ifa static HRESULT WINAPI InPlaceSiteEx_RequestUIActivate(IOleInPlaceSiteEx *iface) { - ok(0, "unexpected call\n"); - return E_NOTIMPL; + CHECK_EXPECT(RequestUIActivate); + return S_OK; } static const IOleInPlaceSiteExVtbl InPlaceSiteVtbl = { @@ -1595,6 +1598,83 @@ static const IOleDocumentSiteVtbl DocumentSiteVtbl = { static IOleDocumentSite DocumentSite = { &DocumentSiteVtbl }; +static HRESULT WINAPI OleControlSite_QueryInterface(IOleControlSite *iface, REFIID riid, void **ppv) +{ + return QueryInterface(riid, ppv); +} + +static ULONG WINAPI OleControlSite_AddRef(IOleControlSite *iface) +{ + return 2; +} + +static ULONG WINAPI OleControlSite_Release(IOleControlSite *iface) +{ + return 1; +} + +static HRESULT WINAPI OleControlSite_OnControlInfoChanged(IOleControlSite *iface) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI OleControlSite_LockInPlaceActive(IOleControlSite *iface, BOOL fLock) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI OleControlSite_GetExtendedControl(IOleControlSite *iface, IDispatch **ppDisp) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI OleControlSite_TransformCoords(IOleControlSite *iface, POINTL *pPtHimetric, + POINTF *pPtfContainer, DWORD dwFlags) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI OleControlSite_TranslateAccelerator(IOleControlSite *iface, + MSG *pMsg, DWORD grfModifiers) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI OleControlSite_OnFocus(IOleControlSite *iface, BOOL fGotFocus) +{ + if(fGotFocus) + CHECK_EXPECT(OnFocus_TRUE); + else + CHECK_EXPECT(OnFocus_FALSE); + return S_OK; +} + +static HRESULT WINAPI OleControlSite_ShowPropertyFrame(IOleControlSite *iface) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static const IOleControlSiteVtbl OleControlSiteVtbl = { + OleControlSite_QueryInterface, + OleControlSite_AddRef, + OleControlSite_Release, + OleControlSite_OnControlInfoChanged, + OleControlSite_LockInPlaceActive, + OleControlSite_GetExtendedControl, + OleControlSite_TransformCoords, + OleControlSite_TranslateAccelerator, + OleControlSite_OnFocus, + OleControlSite_ShowPropertyFrame +}; + +static IOleControlSite OleControlSite = { &OleControlSiteVtbl }; + static HRESULT WINAPI DocHostUIHandler_QueryInterface(IDocHostUIHandler2 *iface, REFIID riid, void **ppv) { return QueryInterface(riid, ppv); @@ -2122,6 +2202,8 @@ static HRESULT QueryInterface(REFIID riid, void **ppv) *ppv = &ServiceProvider; else if(ipsex && IsEqualGUID(&IID_IOleInPlaceSiteEx, riid)) *ppv = &InPlaceSiteEx; + else if(IsEqualGUID(&IID_IOleControlSite, riid)) + *ppv = &OleControlSite; /* TODO: * {D48A6EC6-6A4A-11CF-94A7-444553540000} @@ -3090,6 +3172,7 @@ static void test_InPlaceDeactivate(IUnknown *unk, BOOL expect_call) return; if(expect_call) { + SET_EXPECT(OnFocus_FALSE); if(ipsex) SET_EXPECT(OnInPlaceDeactivateEx); else @@ -3098,6 +3181,7 @@ static void test_InPlaceDeactivate(IUnknown *unk, BOOL expect_call) hres = IOleInPlaceObjectWindowless_InPlaceDeactivate(windowlessobj); ok(hres == S_OK, "InPlaceDeactivate failed: %08x\n", hres); if(expect_call) { + CHECK_CALLED(OnFocus_FALSE); if(ipsex) CHECK_CALLED(OnInPlaceDeactivateEx); else

1 0

Jacek Caban : mshtml: Notify IOleControlSite about focus changes.
by Alexandre Julliard 25 Jun '07

25 Jun '07

Module: wine Branch: master Commit: 5baf587c43f7db5cf45cc364479625de166c499f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5baf587c43f7db5cf45cc3644… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 22 23:33:00 2007 +0200 mshtml: Notify IOleControlSite about focus changes. --- dlls/mshtml/mshtml_private.h | 4 +++ dlls/mshtml/nsevents.c | 48 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/view.c | 14 ++++++++++++ 3 files changed, 66 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 1ee8148..1b8b02f 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -116,6 +116,7 @@ struct HTMLDocument { BOOL window_active; BOOL has_key_path; BOOL container_locked; + BOOL focus; DWORD update; @@ -141,6 +142,8 @@ struct NSContainer { const nsIWeakReferenceVtbl *lpWeakReferenceVtbl; const nsISupportsWeakReferenceVtbl *lpSupportsWeakReferenceVtbl; + nsEventListener blur_listener; + nsEventListener focus_listener; nsEventListener keypress_listener; nsEventListener load_listener; @@ -327,6 +330,7 @@ void NSContainer_Release(NSContainer*); void HTMLDocument_LockContainer(HTMLDocument*,BOOL); void show_context_menu(HTMLDocument*,DWORD,POINT*); +void notif_focus(HTMLDocument*); void show_tooltip(HTMLDocument*,DWORD,DWORD,LPCWSTR); void hide_tooltip(HTMLDocument*); diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index 2a04111..255716c 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -72,6 +72,46 @@ static nsrefcnt NSAPI nsDOMEventListener_Release(nsIDOMEventListener *iface) return nsIWebBrowserChrome_Release(NSWBCHROME(This)); } +static BOOL is_doc_child_focus(NSContainer *This) +{ + HWND hwnd; + + if(!This->doc) + return FALSE; + + for(hwnd = GetFocus(); hwnd && hwnd != This->doc->hwnd; hwnd = GetParent(hwnd)); + + return hwnd == This->doc->hwnd; +} + +static nsresult NSAPI handle_blur(nsIDOMEventListener *iface, nsIDOMEvent *event) +{ + NSContainer *This = NSEVENTLIST_THIS(iface)->This; + + TRACE("(%p)\n", This); + + if(This->doc && This->doc->focus && !is_doc_child_focus(This)) { + This->doc->focus = FALSE; + notif_focus(This->doc); + } + + return NS_OK; +} + +static nsresult NSAPI handle_focus(nsIDOMEventListener *iface, nsIDOMEvent *event) +{ + NSContainer *This = NSEVENTLIST_THIS(iface)->This; + + TRACE("(%p)\n", This); + + if(This->doc && !This->doc->focus) { + This->doc->focus = TRUE; + notif_focus(This->doc); + } + + return NS_OK; +} + static nsresult NSAPI handle_keypress(nsIDOMEventListener *iface, nsIDOMEvent *event) { @@ -129,6 +169,8 @@ static nsresult NSAPI handle_load(nsIDOMEventListener *iface, nsIDOMEvent *event handler, \ }; +static const nsIDOMEventListenerVtbl blur_vtbl = EVENTLISTENER_VTBL(handle_blur); +static const nsIDOMEventListenerVtbl focus_vtbl = EVENTLISTENER_VTBL(handle_focus); static const nsIDOMEventListenerVtbl keypress_vtbl = EVENTLISTENER_VTBL(handle_keypress); static const nsIDOMEventListenerVtbl load_vtbl = EVENTLISTENER_VTBL(handle_load); @@ -159,9 +201,13 @@ void init_nsevents(NSContainer *This) nsIDOMEventTarget *target; nsresult nsres; + static const PRUnichar wsz_blur[] = {'b','l','u','r',0}; + static const PRUnichar wsz_focus[] = {'f','o','c','u','s',0}; static const PRUnichar wsz_keypress[] = {'k','e','y','p','r','e','s','s',0}; static const PRUnichar wsz_load[] = {'l','o','a','d',0}; + init_listener(&This->blur_listener, This, &blur_vtbl); + init_listener(&This->focus_listener, This, &focus_vtbl); init_listener(&This->keypress_listener, This, &keypress_vtbl); init_listener(&This->load_listener, This, &load_vtbl); @@ -178,6 +224,8 @@ void init_nsevents(NSContainer *This) return; } + init_event(target, wsz_blur, NSEVENTLIST(&This->blur_listener), TRUE); + init_event(target, wsz_focus, NSEVENTLIST(&This->focus_listener), TRUE); init_event(target, wsz_keypress, NSEVENTLIST(&This->keypress_listener), FALSE); init_event(target, wsz_load, NSEVENTLIST(&This->load_listener), TRUE); diff --git a/dlls/mshtml/view.c b/dlls/mshtml/view.c index 14648c7..c51bcf1 100644 --- a/dlls/mshtml/view.c +++ b/dlls/mshtml/view.c @@ -164,6 +164,19 @@ static LRESULT on_timer(HTMLDocument *This) return 0; } +void notif_focus(HTMLDocument *This) +{ + IOleControlSite *site; + HRESULT hres; + + hres = IOleClientSite_QueryInterface(This->client, &IID_IOleControlSite, (void**)&site); + if(FAILED(hres)) + return; + + IOleControlSite_OnFocus(site, This->focus); + IOleControlSite_Release(site); +} + static LRESULT WINAPI serverwnd_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { HTMLDocument *This; @@ -771,6 +784,7 @@ void HTMLDocument_View_Init(HTMLDocument *This) This->in_place_active = FALSE; This->ui_active = FALSE; This->window_active = FALSE; + This->focus = FALSE; This->update = 0; }

1 0