November 2010 - Wine-Commits

Piotr Caban : msvcrt: Fix msvcrt.spec.
by Alexandre Julliard Nov. 18, 2010

Nov. 18, 2010

Module: wine Branch: master Commit: 6b3b72d6326924b399763916c003acae1e6a5c35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b3b72d6326924b399763916c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 17 20:02:39 2010 +0100 msvcrt: Fix msvcrt.spec. --- dlls/msvcrt/msvcrt.spec | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index c73a132..a0a29b2 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -639,9 +639,9 @@ @ cdecl _lseek(long long long) MSVCRT__lseek @ cdecl -ret64 _lseeki64(long int64 long) MSVCRT__lseeki64 @ cdecl _ltoa(long ptr long) ntdll._ltoa -@ cdecl _ltoa_s(long ptr long long) ntdll._ltoa_s +@ cdecl _ltoa_s(long ptr long long) @ cdecl _ltow(long ptr long) ntdll._ltow -@ cdecl _ltow_s(long ptr long long) ntdll._ltow_s +@ cdecl _ltow_s(long ptr long long) @ cdecl _makepath(ptr str str str str) @ cdecl _makepath_s(ptr long str str str str) # stub _malloc_dbg

1 0

Jacek Caban : mshtml: Removed tests failing on IE7.
by Alexandre Julliard Nov. 18, 2010

Nov. 18, 2010

Module: wine Branch: master Commit: b2297e2090e2ef232290b97b6a816ac30026e4e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2297e2090e2ef232290b97b6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 17 23:46:04 2010 +0100 mshtml: Removed tests failing on IE7. --- dlls/mshtml/tests/jstest.html | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/jstest.html b/dlls/mshtml/tests/jstest.html index 39f2620..c19abe8 100644 --- a/dlls/mshtml/tests/jstest.html +++ b/dlls/mshtml/tests/jstest.html @@ -35,12 +35,10 @@ function test_createDocumentFragment() { var fragment = document.createDocumentFragment(); ok(typeof(fragment) === "object", "typeof(fragmend) = " + typeof(fragment)); - ok(fragment.parentWindow === window, "fragment.parentWindow != window"); ok(fragment.nodeType === 11, "fragment.nodeType = " + fragment.nodeType); ok(fragment.nodeName === "#document-fragment", "fragment.nodeName = " + fragment.nodeName); var cloned = fragment.cloneNode(true); - ok(cloned.parentWindow === window, "cloned.parentWindow != window"); ok(cloned.nodeType === 11, "cloned.nodeType = " + cloned.nodeType); ok(cloned.nodeName === "#document-fragment", "cloned.nodeName = " + cloned.nodeName); }

1 0

Alexandre Julliard : winspool/tests: Avoid sizeof in traces.
by Alexandre Julliard Nov. 17, 2010

Nov. 17, 2010

Module: wine Branch: master Commit: d7a0284f87e66833133865401c80a8a6b989be97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7a0284f87e66833133865401… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 17 15:08:18 2010 +0100 winspool/tests: Avoid sizeof in traces. --- dlls/winspool.drv/tests/info.c | 29 +++++++++++++---------------- 1 files changed, 13 insertions(+), 16 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index a31cbc9..1c7e917 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -2367,15 +2367,14 @@ static void test_GetPrinterData(void) len = lstrlenA(buffer) + sizeof(CHAR); /* NT4 and w2k require a buffer to save the UNICODE result also for the ANSI function */ ok( !res && (type == REG_SZ) && ((needed == len) || (needed == (len * sizeof(WCHAR)))), - "got %d, type %d, needed: %d and '%s' (expected ERROR_SUCCESS, REG_SZ and %d or %d)\n", - res, type, needed, buffer, len, len * sizeof(WCHAR)); + "got %d, type %d, needed: %d and '%s' (expected ERROR_SUCCESS, REG_SZ and %d)\n", + res, type, needed, buffer, len); needed = 0xdeadbeef; SetLastError(0xdeadbeef); res = GetPrinterDataA(hprn, defaultspooldirectory, NULL, NULL, 0, &needed); ok( (res == ERROR_MORE_DATA) && ((needed == len) || (needed == (len * sizeof(WCHAR)))), - "got %d, needed: %d (expected ERROR_MORE_DATA and %d or %d)\n", - res, needed, len, len * sizeof(WCHAR)); + "got %d, needed: %d (expected ERROR_MORE_DATA and %d)\n", res, needed, len); /* ToDo: test SPLREG_* */ @@ -2423,8 +2422,8 @@ static void test_GetPrinterDataEx(void) len = lstrlenA(buffer) + sizeof(CHAR); /* NT4 and w2k require a buffer to save the UNICODE result also for the ANSI function */ ok( !res && (type == REG_SZ) && ((needed == len) || (needed == (len * sizeof(WCHAR)))), - "got %d, type %d, needed: %d and '%s' (expected ERROR_SUCCESS, REG_SZ and %d or %d)\n", - res, type, needed, buffer, len, len * sizeof(WCHAR)); + "got %d, type %d, needed: %d and '%s' (expected ERROR_SUCCESS, REG_SZ and %d)\n", + res, type, needed, buffer, len); memset(buffer, '#', sizeof(buffer)); buffer[MAX_PATH] = 0; @@ -2435,8 +2434,8 @@ static void test_GetPrinterDataEx(void) (LPBYTE) buffer, sizeof(buffer), &needed); len = lstrlenA(buffer) + sizeof(CHAR); ok( !res && (type == REG_SZ) && ((needed == len) || (needed == (len * sizeof(WCHAR)))), - "got %d, type %d, needed: %d and '%s' (expected ERROR_SUCCESS, REG_SZ and %d or %d)\n", - res, type, needed, buffer, len, len * sizeof(WCHAR)); + "got %d, type %d, needed: %d and '%s' (expected ERROR_SUCCESS, REG_SZ and %d)\n", + res, type, needed, buffer, len); memset(buffer, '#', sizeof(buffer)); buffer[MAX_PATH] = 0; @@ -2448,8 +2447,8 @@ static void test_GetPrinterDataEx(void) &type, (LPBYTE) buffer, sizeof(buffer), &needed); len = lstrlenA(buffer) + sizeof(CHAR); ok( !res && (type == REG_SZ) && ((needed == len) || (needed == (len * sizeof(WCHAR)))), - "got %d, type %d, needed: %d and '%s' (expected ERROR_SUCCESS, REG_SZ and %d or %d)\n", - res, type, needed, buffer, len, len * sizeof(WCHAR)); + "got %d, type %d, needed: %d and '%s' (expected ERROR_SUCCESS, REG_SZ and %d)\n", + res, type, needed, buffer, len); memset(buffer, '#', sizeof(buffer)); @@ -2461,8 +2460,8 @@ static void test_GetPrinterDataEx(void) (LPBYTE) buffer, sizeof(buffer), &needed); len = lstrlenA(buffer) + sizeof(CHAR); ok( !res && (type == REG_SZ) && ((needed == len) || (needed == (len * sizeof(WCHAR)))), - "got %d, type %d, needed: %d and '%s' (expected ERROR_SUCCESS, REG_SZ and %d or %d)\n", - res, type, needed, buffer, len, len * sizeof(WCHAR)); + "got %d, type %d, needed: %d and '%s' (expected ERROR_SUCCESS, REG_SZ and %d)\n", + res, type, needed, buffer, len); needed = 0xdeadbeef; SetLastError(0xdeadbeef); @@ -2471,16 +2470,14 @@ static void test_GetPrinterDataEx(void) res = pGetPrinterDataExA(hprn, NULL, defaultspooldirectory, NULL, NULL, 0, &needed); ok( ((res == ERROR_MORE_DATA) || broken(res == 0xdeadbeef)) && ((needed == len) || (needed == (len * sizeof(WCHAR)))), - "got %d, needed: %d (expected ERROR_MORE_DATA and %d or %d)\n", - res, needed, len, len * sizeof(WCHAR)); + "got %d, needed: %d (expected ERROR_MORE_DATA and %d)\n", res, needed, len); needed = 0xdeadbeef; SetLastError(0xdeaddead); res = pGetPrinterDataExA(hprn, NULL, defaultspooldirectory, NULL, NULL, 0, &needed); ok( ((res == ERROR_MORE_DATA) || broken(res == 0xdeaddead)) && ((needed == len) || (needed == (len * sizeof(WCHAR)))), - "got %d, needed: %d (expected ERROR_MORE_DATA and %d or %d)\n", - res, needed, len, len * sizeof(WCHAR)); + "got %d, needed: %d (expected ERROR_MORE_DATA and %d)\n", res, needed, len); SetLastError(0xdeadbeef); res = ClosePrinter(hprn);

1 0

Alexandre Julliard : urlmon/tests: Avoid sizeof in traces.
by Alexandre Julliard Nov. 17, 2010

Nov. 17, 2010

Module: wine Branch: master Commit: bbf0af4543530731bf2a7e6d3b6e99e3de425cc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbf0af4543530731bf2a7e6d3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 17 15:08:08 2010 +0100 urlmon/tests: Avoid sizeof in traces. --- dlls/urlmon/tests/uri.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index d27d4ed..580dfa3 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -9140,7 +9140,7 @@ static HRESULT WINAPI InternetProtocolInfo_CombineUrl(IInternetProtocolInfo *ifa wine_dbgstr_w(combine_relativeW), wine_dbgstr_w(pwzRelativeUrl)); ok(dwCombineFlags == (URL_DONT_SIMPLIFY|URL_FILE_USE_PATHURL|URL_DONT_UNESCAPE_EXTRA_INFO), "Error: Expected 0, but got 0x%08x.\n", dwCombineFlags); - ok(cchResult == INTERNET_MAX_URL_LENGTH+1, "Error: Expected %d, but got %d.\n", INTERNET_MAX_URL_LENGTH+1, cchResult); + ok(cchResult == INTERNET_MAX_URL_LENGTH+1, "Error: Got %d.\n", cchResult); memcpy(pwzResult, combine_resultW, sizeof(combine_resultW)); *pcchResult = lstrlenW(combine_resultW);

1 0

Alexandre Julliard : gameux: Avoid sizeof in traces.
by Alexandre Julliard Nov. 17, 2010

Nov. 17, 2010

Module: wine Branch: master Commit: 19b251885c2516de8b11840976880769ca8345f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19b251885c2516de8b1184097… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 17 15:07:56 2010 +0100 gameux: Avoid sizeof in traces. --- dlls/gameux/gamestatistics.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/gameux/gamestatistics.c b/dlls/gameux/gamestatistics.c index da2a3e5..97a8f13 100644 --- a/dlls/gameux/gamestatistics.c +++ b/dlls/gameux/gamestatistics.c @@ -629,7 +629,6 @@ static HRESULT GAMEUX_loadGameStatistics(struct GAMEUX_STATS *pStats, else if(hr == S_FALSE && openType == GAMESTATS_OPEN_OPENORCREATE) /* file does not exist */ { /* create new statitics, not yet connected with file */ - TRACE("size: %d\n", sizeof(pStats->categories)); ZeroMemory(pStats->categories, sizeof(pStats->categories)); *pOpenResult = GAMESTATS_OPEN_CREATED; hr = S_OK;

1 0

Alexandre Julliard : msvcrt/tests: Avoid sizeof in traces.
by Alexandre Julliard Nov. 17, 2010

Nov. 17, 2010

Module: wine Branch: master Commit: 45a8b643cdd9eeaaad5da36f3c3b2c2dbcbe853d URL: http://source.winehq.org/git/wine.git/?a=commit;h=45a8b643cdd9eeaaad5da36f3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 17 15:08:03 2010 +0100 msvcrt/tests: Avoid sizeof in traces. --- dlls/msvcrt/tests/file.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 488c219..33fe128 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -1237,7 +1237,7 @@ static void test_fopen_s( void ) file = fopen(name, "r"); ok(file != 0, "fopen failed\n"); len = fread(buff, 1, sizeof(name), file); - ok(len == sizeof(name), "File length supposed to be %d, not %d\n", sizeof(name), len); + ok(len == sizeof(name), "File length is %d\n", len); buff[sizeof(name)] = '\0'; ok(strcmp(name, buff) == 0, "File content mismatch! Got %s, expected %s\n", buff, name); @@ -1278,7 +1278,7 @@ static void test__wfopen_s( void ) file = fopen(name, "r"); ok(file != 0, "fopen failed\n"); len = fread(buff, 1, sizeof(name), file); - ok(len == sizeof(name), "File length supposed to be %d, not %d\n", sizeof(name), len); + ok(len == sizeof(name), "File length is %d\n", len); buff[sizeof(name)] = '\0'; ok(strcmp(name, buff) == 0, "File content mismatch! Got %s, expected %s\n", buff, name);

1 0

Alexandre Julliard : advapi32/tests: Avoid sizeof in traces.
by Alexandre Julliard Nov. 17, 2010

Nov. 17, 2010

Module: wine Branch: master Commit: 5fc51fd10e5b18e54d6e0bd6507eadf615019912 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fc51fd10e5b18e54d6e0bd65… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 17 15:07:47 2010 +0100 advapi32/tests: Avoid sizeof in traces. --- dlls/advapi32/tests/security.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index edfecb9..4d8c8cf 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1311,7 +1311,7 @@ static void test_token_attr(void) ok(ret, "GetTokenInformation(TokenDefaultDacl) failed with error %u\n", GetLastError()); ok(Dacl->DefaultDacl == NULL, "expected NULL, got %p\n", Dacl->DefaultDacl); ok(Size2 == sizeof(TOKEN_DEFAULT_DACL) || broken(Size2 == 2*sizeof(TOKEN_DEFAULT_DACL)), /* WoW64 */ - "got %u expected %u (sizeof(TOKEN_DEFAULT_DACL))\n", Size2, sizeof(TOKEN_DEFAULT_DACL)); + "got %u expected sizeof(TOKEN_DEFAULT_DACL)\n", Size2); Dacl->DefaultDacl = acl; ret = SetTokenInformation(Token, TokenDefaultDacl, Dacl, Size);

1 0

Maarten Lankhorst : winegstreamer: Destroy thread in GST_Connect.
by Alexandre Julliard Nov. 17, 2010

Nov. 17, 2010

Module: wine Branch: master Commit: a63c81d480749d183ea5c742f9cd5adb32fd700a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a63c81d480749d183ea5c742f… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Nov 17 13:27:22 2010 +0100 winegstreamer: Destroy thread in GST_Connect. --- dlls/winegstreamer/gstdemux.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index a53355d..6c9aca0 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -977,6 +977,8 @@ static HRESULT GST_Connect(GSTInPin *pPin, IPin *pConnectPin, ALLOCATOR_PROPERTI *props = This->props; gst_element_set_state(This->gstfilter, GST_STATE_READY); gst_element_get_state(This->gstfilter, NULL, NULL, -1); + if (This->push_thread) + gst_pad_activate_push(This->my_src, 0); This->initial = 0; This->nextofs = This->nextpullofs = 0;

1 0

Alexandre Julliard : msxml3: Fix incorrect uses of va_list arguments.
by Alexandre Julliard Nov. 17, 2010

Nov. 17, 2010

Module: wine Branch: master Commit: d70b3e592922a2f361bd558a4ee9fbd1e6aed4fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=d70b3e592922a2f361bd558a4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 17 14:21:09 2010 +0100 msxml3: Fix incorrect uses of va_list arguments. --- dlls/msxml3/main.c | 42 ++++++++++++++++++++++++------------------ dlls/msxml3/msxml_private.h | 4 ++-- 2 files changed, 26 insertions(+), 20 deletions(-) diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c index 49ef6fa..1201d2b 100644 --- a/dlls/msxml3/main.c +++ b/dlls/msxml3/main.c @@ -61,29 +61,35 @@ void wineXmlCallbackLog(char const* caller, xmlErrorLevel lvl, char const* msg, break; } - if (ap) + do { - do - { - heap_free(buf); - buf = heap_alloc(len); - needed = vsnprintf(buf, len, msg, ap); - if (needed == -1) - len *= 2; - else if (needed >= len) - len = needed + 1; - else - needed = 0; - } - while (needed); - - wine_dbg_log(dbcl, &__wine_dbch_msxml, caller, buf); heap_free(buf); + buf = heap_alloc(len); + needed = vsnprintf(buf, len, msg, ap); + if (needed == -1) + len *= 2; + else if (needed >= len) + len = needed + 1; + else + needed = 0; } - else + while (needed); + + wine_dbg_log(dbcl, &__wine_dbch_msxml, caller, "%s", buf); + heap_free(buf); +} + +void wineXmlCallbackError(char const* caller, xmlErrorPtr err) +{ + enum __wine_debug_class dbcl; + + switch (err->level) { - wine_dbg_log(dbcl, &__wine_dbch_msxml, caller, msg); + case XML_ERR_NONE: dbcl = __WINE_DBCL_TRACE; break; + case XML_ERR_WARNING: dbcl = __WINE_DBCL_WARN; break; + default: dbcl = __WINE_DBCL_ERR; break; } + wine_dbg_log(dbcl, &__wine_dbch_msxml, caller, "%s", err->message); } /* Support for loading xml files from a Wine Windows drive */ diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 9980fdd..f3faa8a 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -209,6 +209,7 @@ extern xmlNodePtr xmldoc_unlink_xmldecl(xmlDocPtr doc); extern HRESULT XMLElement_create( IUnknown *pUnkOuter, xmlNodePtr node, LPVOID *ppObj, BOOL own ); extern void wineXmlCallbackLog(char const* caller, xmlErrorLevel lvl, char const* msg, va_list ap); +extern void wineXmlCallbackError(char const* caller, xmlErrorPtr err); #define LIBXML2_LOG_CALLBACK __WINE_PRINTF_ATTR(2,3) @@ -221,8 +222,7 @@ extern void wineXmlCallbackLog(char const* caller, xmlErrorLevel lvl, char const #define LIBXML2_CALLBACK_ERR(caller, msg, ap) \ wineXmlCallbackLog(#caller, XML_ERR_ERROR, msg, ap) -#define LIBXML2_CALLBACK_SERROR(caller, err) \ - wineXmlCallbackLog(#caller, err->level, err->message, NULL) +#define LIBXML2_CALLBACK_SERROR(caller, err) wineXmlCallbackError(#caller, err) extern BOOL is_preserving_whitespace(xmlNodePtr node);

1 0

David Hedberg : shdocvw: Implement ControlSite::TranslateAccelerator.
by Alexandre Julliard Nov. 17, 2010

Nov. 17, 2010

Module: wine Branch: master Commit: 0adfeb28696aacf426977c578012bfa84e257cbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=0adfeb28696aacf426977c578… Author: David Hedberg <dhedberg(a)codeweavers.com> Date: Wed Nov 17 13:12:21 2010 +0100 shdocvw: Implement ControlSite::TranslateAccelerator. --- dlls/shdocvw/client.c | 27 ++++++++- dlls/shdocvw/tests/webbrowser.c | 125 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 149 insertions(+), 3 deletions(-) diff --git a/dlls/shdocvw/client.c b/dlls/shdocvw/client.c index bb569aa..5c5da44 100644 --- a/dlls/shdocvw/client.c +++ b/dlls/shdocvw/client.c @@ -415,8 +415,31 @@ static HRESULT WINAPI ControlSite_TranslateAccelerator(IOleControlSite *iface, M DWORD grfModifiers) { DocHost *This = impl_from_IOleControlSite(iface); - FIXME("(%p)->(%p, %08x)\n", This, pMsg, grfModifiers); - return E_NOTIMPL; + IOleObject *wb_obj; + IOleClientSite *clientsite; + IOleControlSite *controlsite; + HRESULT hr; + + TRACE("(%p)->(%p, %08x)\n", This, pMsg, grfModifiers); + + hr = IDispatch_QueryInterface(This->disp, &IID_IOleObject, (void**)&wb_obj); + if(SUCCEEDED(hr)) { + hr = IOleObject_GetClientSite(wb_obj, &clientsite); + if(SUCCEEDED(hr)) { + hr = IOleClientSite_QueryInterface(clientsite, &IID_IOleControlSite, (void**)&controlsite); + if(SUCCEEDED(hr)) { + hr = IOleControlSite_TranslateAccelerator(controlsite, pMsg, grfModifiers); + IOleControlSite_Release(controlsite); + } + IOleClientSite_Release(clientsite); + } + IOleObject_Release(wb_obj); + } + + if(FAILED(hr)) + return S_FALSE; + else + return hr; } static HRESULT WINAPI ControlSite_OnFocus(IOleControlSite *iface, BOOL fGotFocus) diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c index 7f9a24a..6f84eee 100644 --- a/dlls/shdocvw/tests/webbrowser.c +++ b/dlls/shdocvw/tests/webbrowser.c @@ -130,6 +130,8 @@ DEFINE_EXPECT(TranslateUrl); DEFINE_EXPECT(ShowUI); DEFINE_EXPECT(HideUI); DEFINE_EXPECT(RequestUIActivate); +DEFINE_EXPECT(ControlSite_TranslateAccelerator); +DEFINE_EXPECT(OnFocus); static const WCHAR wszItem[] = {'i','t','e','m',0}; static const WCHAR emptyW[] = {0}; @@ -140,6 +142,7 @@ static IWebBrowser2 *wb; static HWND container_hwnd, shell_embedding_hwnd; static BOOL is_downloading, is_first_load; static HRESULT hr_dochost_TranslateAccelerator = E_NOTIMPL; +static HRESULT hr_site_TranslateAccelerator = E_NOTIMPL; static const char *current_url; #define DWL_EXPECT_BEFORE_NAVIGATE 0x01 @@ -852,6 +855,85 @@ static const IOleClientSiteVtbl ClientSiteVtbl = { static IOleClientSite ClientSite = { &ClientSiteVtbl }; +static HRESULT WINAPI IOleControlSite_fnQueryInterface(IOleControlSite *iface, REFIID riid, void **ppv) +{ + *ppv = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI IOleControlSite_fnAddRef(IOleControlSite *iface) +{ + return 2; +} + +static ULONG WINAPI IOleControlSite_fnRelease(IOleControlSite *iface) +{ + return 1; +} + +static HRESULT WINAPI IOleControlSite_fnOnControlInfoChanged(IOleControlSite* This) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI IOleControlSite_fnLockInPlaceActive(IOleControlSite* This, + BOOL fLock) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI IOleControlSite_fnGetExtendedControl(IOleControlSite* This, + IDispatch **ppDisp) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI IOleControlSite_fnTransformCoords(IOleControlSite* This, + POINTL *pPtlHimetric, + POINTF *pPtfContainer, + DWORD dwFlags) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI IOleControlSite_fnTranslateAccelerator(IOleControlSite* This, MSG *pMsg, + DWORD grfModifiers) +{ + CHECK_EXPECT(ControlSite_TranslateAccelerator); + return hr_site_TranslateAccelerator; +} + +static HRESULT WINAPI IOleControlSite_fnOnFocus(IOleControlSite* This, BOOL fGotFocus) +{ + CHECK_EXPECT2(OnFocus); + return E_NOTIMPL; +} + +static HRESULT WINAPI IOleControlSite_fnShowPropertyFrame(IOleControlSite* This) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static IOleControlSiteVtbl ControlSiteVtbl = { + IOleControlSite_fnQueryInterface, + IOleControlSite_fnAddRef, + IOleControlSite_fnRelease, + IOleControlSite_fnOnControlInfoChanged, + IOleControlSite_fnLockInPlaceActive, + IOleControlSite_fnGetExtendedControl, + IOleControlSite_fnTransformCoords, + IOleControlSite_fnTranslateAccelerator, + IOleControlSite_fnOnFocus, + IOleControlSite_fnShowPropertyFrame +}; + +static IOleControlSite ControlSite = { &ControlSiteVtbl }; + static HRESULT WINAPI InPlaceUIWindow_QueryInterface(IOleInPlaceFrame *iface, REFIID riid, void **ppv) { @@ -1433,7 +1515,7 @@ static HRESULT QueryInterface(REFIID riid, void **ppv) else if(IsEqualGUID(&IID_IDocHostShowUI, riid)) trace("interface IID_IDocHostShowUI\n"); else if(IsEqualGUID(&IID_IOleControlSite, riid)) - trace("interface IID_IOleControlSite\n"); + *ppv = &ControlSite; else if(IsEqualGUID(&IID_IOleCommandTarget, riid)) trace("interface IID_IOleCommandTarget\n"); @@ -1494,6 +1576,7 @@ static void test_DoVerb(IUnknown *unk) SET_EXPECT(Frame_SetActiveObject); SET_EXPECT(UIWindow_SetActiveObject); SET_EXPECT(SetMenu); + SET_EXPECT(OnFocus); hres = IOleObject_DoVerb(oleobj, OLEIVERB_SHOW, NULL, &ClientSite, 0, (HWND)0xdeadbeef, &rect); @@ -1510,6 +1593,7 @@ static void test_DoVerb(IUnknown *unk) CHECK_CALLED(Frame_SetActiveObject); CHECK_CALLED(UIWindow_SetActiveObject); CHECK_CALLED(SetMenu); + todo_wine CHECK_CALLED(OnFocus); hres = IOleObject_DoVerb(oleobj, OLEIVERB_SHOW, NULL, &ClientSite, 0, (HWND)0xdeadbeef, &rect); @@ -2539,6 +2623,7 @@ static void test_TranslateAccelerator(IUnknown *unk) ok(hres == S_OK, "Got 0x%08x\n", hres); if(SUCCEEDED(hres)) { IDocHostUIHandler2 *dochost; + IOleControlSite *doc_controlsite; IUnknown *unk_test; hres = IOleClientSite_QueryInterface(doc_clientsite, &IID_IOleInPlaceFrame, (void**)&unk_test); @@ -2575,6 +2660,44 @@ static void test_TranslateAccelerator(IUnknown *unk) IDocHostUIHandler2_Release(dochost); } + hres = IOleClientSite_QueryInterface(doc_clientsite, &IID_IOleControlSite, (void**)&doc_controlsite); + ok(hres == S_OK, "Got 0x%08x\n", hres); + if(SUCCEEDED(hres)) { + + msg_a.message = WM_KEYDOWN; + hr_site_TranslateAccelerator = 0xdeadbeef; + for(keycode = 0; keycode < 0x100; keycode++) { + msg_a.wParam = keycode; + SET_EXPECT(ControlSite_TranslateAccelerator); + hres = IOleControlSite_TranslateAccelerator(doc_controlsite, &msg_a, 0); + if(keycode == 0x9 || keycode == 0x75) + todo_wine ok(hres == S_OK, "Got 0x%08x (keycode: %04x)\n", hres, keycode); + else + ok(hres == S_FALSE, "Got 0x%08x (keycode: %04x)\n", hres, keycode); + + CHECK_CALLED(ControlSite_TranslateAccelerator); + } + msg_a.wParam = VK_LEFT; + SET_EXPECT(ControlSite_TranslateAccelerator); + hres = IOleControlSite_TranslateAccelerator(doc_controlsite, &msg_a, 0); + ok(hres == S_FALSE, "Got 0x%08x (keycode: %04x)\n", hres, keycode); + CHECK_CALLED(ControlSite_TranslateAccelerator); + + hr_site_TranslateAccelerator = S_OK; + SET_EXPECT(ControlSite_TranslateAccelerator); + hres = IOleControlSite_TranslateAccelerator(doc_controlsite, &msg_a, 0); + ok(hres == S_OK, "Got 0x%08x (keycode: %04x)\n", hres, keycode); + CHECK_CALLED(ControlSite_TranslateAccelerator); + + hr_site_TranslateAccelerator = E_NOTIMPL; + SET_EXPECT(ControlSite_TranslateAccelerator); + hres = IOleControlSite_TranslateAccelerator(doc_controlsite, &msg_a, 0); + ok(hres == S_FALSE, "Got 0x%08x (keycode: %04x)\n", hres, keycode); + CHECK_CALLED(ControlSite_TranslateAccelerator); + + IOleControlSite_Release(doc_controlsite); + } + IOleClientSite_Release(doc_clientsite); } IOleObject_Release(obj_doc);

1 0