November 2010 - Wine-commits

Piotr Caban : msvcrt: Move _initterm_e implementation (from msvcr90).
by Alexandre Julliard 18 Nov '10

18 Nov '10

Module: wine Branch: master Commit: 2770155532ec79f1e05d9abf7d4cd6b2c5e3092e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2770155532ec79f1e05d9abf7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 17 23:42:29 2010 +0100 msvcrt: Move _initterm_e implementation (from msvcr90). --- dlls/msvcr90/msvcr90.c | 26 -------------------------- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/data.c | 25 +++++++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- 4 files changed, 27 insertions(+), 28 deletions(-) diff --git a/dlls/msvcr90/msvcr90.c b/dlls/msvcr90/msvcr90.c index 2fff15a..dbe528f 100644 --- a/dlls/msvcr90/msvcr90.c +++ b/dlls/msvcr90/msvcr90.c @@ -30,8 +30,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcr90); -typedef int (CDECL *_INITTERM_E_FN)(void); - /********************************************************************* * DllMain (MSVCR90.@) */ @@ -81,30 +79,6 @@ void * CDECL _encoded_null(void) } /********************************************************************* - * _initterm_e (MSVCR90.@) - * - * call an array of application initialization functions and report the return value - */ -int CDECL _initterm_e(_INITTERM_E_FN *table, _INITTERM_E_FN *end) -{ - int res = 0; - - TRACE("(%p, %p)\n", table, end); - - while (!res && table < end) { - if (*table) { - TRACE("calling %p\n", **table); - res = (**table)(); - if (res) - TRACE("function %p failed: 0x%x\n", *table, res); - - } - table++; - } - return res; -} - -/********************************************************************* * _invalid_parameter_noinfo (MSVCR90.@) */ void CDECL _invalid_parameter_noinfo(void) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index c58637d..ea00630 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -571,7 +571,7 @@ @ cdecl _i64tow_s(int64 ptr long long) msvcrt._i64tow_s @ stub _initptd @ cdecl _initterm(ptr ptr) msvcrt._initterm -@ cdecl _initterm_e(ptr ptr) +@ cdecl _initterm_e(ptr ptr) msvcrt._initterm_e @ stub _inp @ stub _inpd @ stub _inpw diff --git a/dlls/msvcrt/data.c b/dlls/msvcrt/data.c index 53dd114..1ea5b1b 100644 --- a/dlls/msvcrt/data.c +++ b/dlls/msvcrt/data.c @@ -132,6 +132,7 @@ MSVCRT_wchar_t ** msvcrt_SnapshotOfEnvironmentW(MSVCRT_wchar_t **wblk) } typedef void (CDECL *_INITTERMFUN)(void); +typedef int (CDECL *_INITTERM_E_FN)(void); /*********************************************************************** * __p___argc (MSVCRT.@) @@ -396,6 +397,30 @@ void CDECL _initterm(_INITTERMFUN *start,_INITTERMFUN *end) } /********************************************************************* + * _initterm_e (MSVCRT.@) + * + * call an array of application initialization functions and report the return value + */ +int CDECL _initterm_e(_INITTERM_E_FN *table, _INITTERM_E_FN *end) +{ + int res = 0; + + TRACE("(%p, %p)\n", table, end); + + while (!res && table < end) { + if (*table) { + TRACE("calling %p\n", **table); + res = (**table)(); + if (res) + TRACE("function %p failed: 0x%x\n", *table, res); + + } + table++; + } + return res; +} + +/********************************************************************* * __set_app_type (MSVCRT.@) */ void CDECL MSVCRT___set_app_type(int app_type) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index c10f7de..63e3b71 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -518,7 +518,7 @@ @ cdecl _i64tow(int64 ptr long) ntdll._i64tow @ cdecl _i64tow_s(int64 ptr long long) _i64tow_s @ cdecl _initterm(ptr ptr) -# stub _initterm_e +@ cdecl _initterm_e(ptr ptr) @ stub _inp #(long) -i386 @ stub _inpd #(long) -i386 @ stub _inpw #(long) -i386

1 0

Jacek Caban : mshtml: Removed tests failing on IE7.
by Alexandre Julliard 18 Nov '10

18 Nov '10

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 : urlmon/tests: Avoid sizeof in traces.
by Alexandre Julliard 17 Nov '10

17 Nov '10

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 : winspool/tests: Avoid sizeof in traces.
by Alexandre Julliard 17 Nov '10

17 Nov '10

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 : advapi32/tests: Avoid sizeof in traces.
by Alexandre Julliard 17 Nov '10

17 Nov '10

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

Alexandre Julliard : gameux: Avoid sizeof in traces.
by Alexandre Julliard 17 Nov '10

17 Nov '10

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 17 Nov '10

17 Nov '10

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

Maarten Lankhorst : winegstreamer: Fix reference leak.
by Alexandre Julliard 17 Nov '10

17 Nov '10

Module: wine Branch: master Commit: f3481b0218a30fe49af245183fd89c7ebbefac40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3481b0218a30fe49af245183… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Nov 17 13:25:51 2010 +0100 winegstreamer: Fix reference leak. --- dlls/winegstreamer/gstdemux.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 0af7014..a53355d 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1556,6 +1556,7 @@ static HRESULT GST_RemoveOutputPins(GSTImpl *This) { gst_element_set_bus(This->gstfilter, NULL); gst_element_set_state(This->gstfilter, GST_STATE_NULL); gst_pad_unlink(This->my_src, This->their_sink); + gst_object_unref(This->my_src); This->my_src = This->their_sink = NULL; for (i = 0; i < This->cStreams; i++) {

1 0

Maarten Lankhorst : winegstreamer: Destroy thread in GST_Connect.
by Alexandre Julliard 17 Nov '10

17 Nov '10

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

David Hedberg : shdocvw: Implement DocHostUIHandler::TranslateAccelerator.
by Alexandre Julliard 17 Nov '10

17 Nov '10

Module: wine Branch: master Commit: 910cac49a464fea8633488511f033b7adcd6ef70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=910cac49a464fea8633488511… Author: David Hedberg <dhedberg(a)codeweavers.com> Date: Wed Nov 17 13:12:19 2010 +0100 shdocvw: Implement DocHostUIHandler::TranslateAccelerator. --- dlls/shdocvw/dochost.c | 9 +++- dlls/shdocvw/tests/webbrowser.c | 89 ++++++++++++++++++++++++++++++++++++-- 2 files changed, 91 insertions(+), 7 deletions(-) diff --git a/dlls/shdocvw/dochost.c b/dlls/shdocvw/dochost.c index e7c8c0f..31ecce3 100644 --- a/dlls/shdocvw/dochost.c +++ b/dlls/shdocvw/dochost.c @@ -620,8 +620,13 @@ static HRESULT WINAPI DocHostUIHandler_TranslateAccelerator(IDocHostUIHandler2 * LPMSG lpMsg, const GUID *pguidCmdGroup, DWORD nCmdID) { DocHost *This = impl_from_IDocHostUIHandler2(iface); - FIXME("(%p)->(%p %p %d)\n", This, lpMsg, pguidCmdGroup, nCmdID); - return E_NOTIMPL; + HRESULT hr = S_FALSE; + TRACE("(%p)->(%p %p %d)\n", This, lpMsg, pguidCmdGroup, nCmdID); + + if(This->hostui) + hr = IDocHostUIHandler_TranslateAccelerator(This->hostui, lpMsg, pguidCmdGroup, nCmdID); + + return hr; } static HRESULT WINAPI DocHostUIHandler_GetOptionKeyPath(IDocHostUIHandler2 *iface, diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c index 1b1afc1..7f9a24a 100644 --- a/dlls/shdocvw/tests/webbrowser.c +++ b/dlls/shdocvw/tests/webbrowser.c @@ -124,8 +124,12 @@ DEFINE_EXPECT(QueryStatus_SETPROGRESSTEXT); DEFINE_EXPECT(QueryStatus_STOP); DEFINE_EXPECT(DocHost_EnableModeless_TRUE); DEFINE_EXPECT(DocHost_EnableModeless_FALSE); +DEFINE_EXPECT(DocHost_TranslateAccelerator); DEFINE_EXPECT(GetDropTarget); DEFINE_EXPECT(TranslateUrl); +DEFINE_EXPECT(ShowUI); +DEFINE_EXPECT(HideUI); +DEFINE_EXPECT(RequestUIActivate); static const WCHAR wszItem[] = {'i','t','e','m',0}; static const WCHAR emptyW[] = {0}; @@ -135,6 +139,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 const char *current_url; #define DWL_EXPECT_BEFORE_NAVIGATE 0x01 @@ -1140,7 +1145,7 @@ static HRESULT WINAPI InPlaceSite_OnInPlaceDeactivateEx(IOleInPlaceSiteEx *iface static HRESULT WINAPI InPlaceSite_RequestUIActivate(IOleInPlaceSiteEx *iface) { - ok(0, "unexpected call\n"); + CHECK_EXPECT2(RequestUIActivate); return S_OK; } @@ -1207,13 +1212,13 @@ static HRESULT WINAPI DocHostUIHandler_ShowUI(IDocHostUIHandler2 *iface, DWORD d IOleInPlaceActiveObject *pActiveObject, IOleCommandTarget *pCommandTarget, IOleInPlaceFrame *pFrame, IOleInPlaceUIWindow *pDoc) { - ok(0, "unexpected call\n"); + CHECK_EXPECT(ShowUI); return E_NOTIMPL; } static HRESULT WINAPI DocHostUIHandler_HideUI(IDocHostUIHandler2 *iface) { - ok(0, "unexpected call\n"); + CHECK_EXPECT(HideUI); return E_NOTIMPL; } @@ -1255,8 +1260,12 @@ static HRESULT WINAPI DocHostUIHandler_ResizeBorder(IDocHostUIHandler2 *iface, L static HRESULT WINAPI DocHostUIHandler_TranslateAccelerator(IDocHostUIHandler2 *iface, LPMSG lpMsg, const GUID *pguidCmdGroup, DWORD nCmdID) { - ok(0, "unexpected call\n"); - return E_NOTIMPL; + CHECK_EXPECT(DocHost_TranslateAccelerator); + ok(pguidCmdGroup != NULL, "Got NULL pguidCmdGroup.\n"); + if(pguidCmdGroup) + ok(IsEqualGUID(pguidCmdGroup, &CGID_MSHTML), "Unexpected pguidCmdGroup\n"); + ok(lpMsg != NULL, "Got NULL lpMsg.\n"); + return hr_dochost_TranslateAccelerator; } static HRESULT WINAPI DocHostUIHandler_GetOptionKeyPath(IDocHostUIHandler2 *iface, @@ -2505,6 +2514,75 @@ static void test_QueryInterface(IUnknown *unk) } +static void test_TranslateAccelerator(IUnknown *unk) +{ + IOleObject *obj_doc; + IDispatch *disp_doc; + HRESULT hres; + DWORD keycode; + MSG msg_a = { + container_hwnd, + 0, 0, 0, + GetTickCount(), + {5, 5} + }; + + test_Navigate2(unk); + + disp_doc = get_document(unk); + hres = IDispatch_QueryInterface(disp_doc, &IID_IOleObject, (void**)&obj_doc); + ok(hres == S_OK, "Got 0x%08x\n", hres); + if(SUCCEEDED(hres)) { + IOleClientSite *doc_clientsite; + + hres = IOleObject_GetClientSite(obj_doc, &doc_clientsite); + ok(hres == S_OK, "Got 0x%08x\n", hres); + if(SUCCEEDED(hres)) { + IDocHostUIHandler2 *dochost; + IUnknown *unk_test; + + hres = IOleClientSite_QueryInterface(doc_clientsite, &IID_IOleInPlaceFrame, (void**)&unk_test); + ok(hres == E_NOINTERFACE, "Got 0x%08x\n", hres); + if(SUCCEEDED(hres)) IUnknown_Release(unk_test); + + hres = IOleClientSite_QueryInterface(doc_clientsite, &IID_IDocHostShowUI, (void**)&unk_test); + todo_wine ok(hres == S_OK, "Got 0x%08x\n", hres); + if(SUCCEEDED(hres)) IUnknown_Release(unk_test); + + hres = IOleClientSite_QueryInterface(doc_clientsite, &IID_IDocHostUIHandler, (void**)&unk_test); + ok(hres == S_OK, "Got 0x%08x\n", hres); + if(SUCCEEDED(hres)) IUnknown_Release(unk_test); + + hres = IOleClientSite_QueryInterface(doc_clientsite, &IID_IDocHostUIHandler2, (void**)&dochost); + ok(hres == S_OK, "Got 0x%08x\n", hres); + if(SUCCEEDED(hres)) { + + msg_a.message = WM_KEYDOWN; + hr_dochost_TranslateAccelerator = 0xdeadbeef; + for(keycode = 0; keycode <= 0x100; keycode++) { + msg_a.wParam = keycode; + SET_EXPECT(DocHost_TranslateAccelerator); + hres = IDocHostUIHandler_TranslateAccelerator(dochost, &msg_a, &CGID_MSHTML, 1234); + ok(hres == 0xdeadbeef, "Got 0x%08x\n", hres); + CHECK_CALLED(DocHost_TranslateAccelerator); + } + hr_dochost_TranslateAccelerator = E_NOTIMPL; + + SET_EXPECT(DocHost_TranslateAccelerator); + hres = IDocHostUIHandler_TranslateAccelerator(dochost, &msg_a, &CGID_MSHTML, 1234); + ok(hres == E_NOTIMPL, "Got 0x%08x\n", hres); + CHECK_CALLED(DocHost_TranslateAccelerator); + + IDocHostUIHandler2_Release(dochost); + } + IOleClientSite_Release(doc_clientsite); + } + IOleObject_Release(obj_doc); + } + + IDispatch_Release(disp_doc); +} + static void test_WebBrowser(BOOL do_download) { IUnknown *unk = NULL; @@ -2559,6 +2637,7 @@ static void test_WebBrowser(BOOL do_download) test_Navigate2(unk); test_download(DWL_EXPECT_BEFORE_NAVIGATE); + test_TranslateAccelerator(unk); doc2 = get_document(unk); ok(doc == doc2, "doc != doc2\n"); IDispatch_Release(doc2);

1 0