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

Eric Pouech : mmsystem.drv: Always map parameters for all callback kinds.
by Alexandre Julliard 21 Jun '10

21 Jun '10

Module: wine Branch: master Commit: 6f778a79f4f0e0c229d7dc7917a5fb5195dabd35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f778a79f4f0e0c229d7dc791… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Jun 20 08:08:04 2010 +0200 mmsystem.drv: Always map parameters for all callback kinds. --- dlls/mmsystem.dll16/message16.c | 70 +++++++++++++++++++++++++++------------ dlls/mmsystem.dll16/mmsystem.c | 61 +++++++++++++-------------------- dlls/mmsystem.dll16/winemm16.h | 2 +- 3 files changed, 74 insertions(+), 59 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6f778a79f4f0e0c229d7d…

1 0

Florian Köberle : comctl32/tests: Test calculating the rect of a child item while handling TVN_ITEMEXPANDED.
by Alexandre Julliard 21 Jun '10

21 Jun '10

Module: wine Branch: master Commit: 2f77e2b93d6a70975d3416a03cadf5ff224e8adc URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f77e2b93d6a70975d3416a03… Author: Florian Köberle <florian(a)fkoeberle.de> Date: Sun Jun 20 14:50:00 2010 +0200 comctl32/tests: Test calculating the rect of a child item while handling TVN_ITEMEXPANDED. --- dlls/comctl32/tests/treeview.c | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index a0d8e77..320deba 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -819,12 +819,15 @@ static void test_get_set_unicodeformat(void) static TVITEMA g_item_expanding, g_item_expanded; static BOOL g_get_from_expand; +static BOOL g_get_rect_in_expand; static LRESULT CALLBACK parent_wnd_proc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { static LONG defwndproc_counter = 0; struct message msg; LRESULT ret; + RECT rect; + HTREEITEM visibleItem; msg.message = message; msg.flags = sent|wparam|lparam; @@ -907,6 +910,17 @@ static LRESULT CALLBACK parent_wnd_proc(HWND hWnd, UINT message, WPARAM wParam, ret = SendMessageA(pHdr->hwndFrom, TVM_GETITEMA, 0, (LPARAM)&g_item_expanded); ok(ret == TRUE, "got %lu\n", ret); } + if (g_get_rect_in_expand) { + visibleItem = TreeView_GetNextItem(pHdr->hwndFrom, NULL, TVGN_FIRSTVISIBLE); + ok(pTreeView->itemNew.hItem == visibleItem, "expanded item == first visible item\n"); + *(HTREEITEM*)&rect = visibleItem; + ok(SendMessage(pHdr->hwndFrom, TVM_GETITEMRECT, TRUE, (LPARAM)&rect), "Failed to get rect for first visible item.\n"); + visibleItem = TreeView_GetNextItem(pHdr->hwndFrom, visibleItem, TVGN_NEXTVISIBLE); + *(HTREEITEM*)&rect = visibleItem; + ok(visibleItem != NULL, "There must be a visible item after the first visisble item.\n"); + todo_wine + ok(SendMessage(pHdr->hwndFrom, TVM_GETITEMRECT, TRUE, (LPARAM)&rect), "Failed to get rect for second visible item.\n"); + } break; } } @@ -1167,6 +1181,17 @@ static void test_expandnotify(void) DestroyWindow(hTree); } +static void test_rect_retrieval_after_expand_with_select(void) { + BOOL ret; + HWND hTree; + hTree = create_treeview_control(); + fill_tree(hTree); + g_get_rect_in_expand = TRUE; + ret = TreeView_Select(hTree, hChild, TVGN_CARET); + g_get_rect_in_expand = FALSE; + ok(ret,"TreeView_Select should return true\n"); +} + START_TEST(treeview) { HMODULE hComctl32; @@ -1227,6 +1252,7 @@ START_TEST(treeview) test_itemedit(); test_treeview_classinfo(); test_expandnotify(); + test_rect_retrieval_after_expand_with_select(); PostMessageA(hMainWnd, WM_CLOSE, 0, 0); while(GetMessageA(&msg,0,0,0)) {

1 0

Paul Chitescu : gdi32: If driver is missing claim vectorial fonts are supported so GDI fonts ( freetype) are used.
by Alexandre Julliard 21 Jun '10

21 Jun '10

Module: wine Branch: master Commit: f479aa5ce5f0b1995913dbee7483d63949b6ea24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f479aa5ce5f0b1995913dbee7… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Fri Jun 18 18:37:50 2010 +0300 gdi32: If driver is missing claim vectorial fonts are supported so GDI fonts (freetype) are used. --- dlls/gdi32/dc.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index f3a62bd..c55442f 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -912,6 +912,11 @@ INT WINAPI GetDeviceCaps( HDC hdc, INT cap ) case LOGPIXELSX: ret = 72; break; case LOGPIXELSY: ret = 72; break; case SIZEPALETTE: ret = 2; break; + case TEXTCAPS: + ret = (TC_OP_CHARACTER | TC_OP_STROKE | TC_CP_STROKE | + TC_CR_ANY | TC_SF_X_YINDEP | TC_SA_DOUBLE | TC_SA_INTEGER | + TC_SA_CONTIN | TC_UA_ABLE | TC_SO_ABLE | TC_RA_ABLE | TC_VA_ABLE); + break; } release_dc_ptr( dc ); }

1 0

Maarten Lankhorst : winecfg: Only initialise the audio drivers once.
by Alexandre Julliard 21 Jun '10

21 Jun '10

Module: wine Branch: master Commit: 0dc5bab1c9ccb27473d9bc2ec96e58b0e23662e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dc5bab1c9ccb27473d9bc2ec… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Jun 18 21:18:06 2010 +0200 winecfg: Only initialise the audio drivers once. --- programs/winecfg/audio.c | 47 ++++++++++++++++++++++++++++++++++++--------- 1 files changed, 37 insertions(+), 10 deletions(-) diff --git a/programs/winecfg/audio.c b/programs/winecfg/audio.c index c5cebcd..134296d 100644 --- a/programs/winecfg/audio.c +++ b/programs/winecfg/audio.c @@ -86,9 +86,10 @@ typedef struct { UINT nameID; const char *szDriver; + HDRVR hDriver; } AUDIO_DRIVER; -static const AUDIO_DRIVER sAudioDrivers[] = { +static AUDIO_DRIVER sAudioDrivers[] = { {IDS_DRIVER_ALSA, "alsa"}, {IDS_DRIVER_OSS, "oss"}, {IDS_DRIVER_COREAUDIO, "coreaudio"}, @@ -118,7 +119,7 @@ static void configureAudioDriver(HWND hDlg) HDRVR hdrvr; char wine_driver[MAX_NAME_LENGTH + 9]; sprintf(wine_driver, "wine%s.drv", pAudioDrv->szDriver); - hdrvr = OpenDriverA(wine_driver, 0, 0); + hdrvr = pAudioDrv->hDriver; if (hdrvr != 0) { if (SendDriverMessage(hdrvr, DRV_QUERYCONFIGURE, 0, 0) != 0) @@ -129,7 +130,6 @@ static void configureAudioDriver(HWND hDlg) dci.lpszDCIAliasName = NULL; SendDriverMessage(hdrvr, DRV_CONFIGURE, 0, (LONG_PTR)&dci); } - CloseDriver(hdrvr, 0, 0); } else { @@ -197,7 +197,7 @@ static void removeDriver(const char * driver) static void initAudioDeviceTree(HWND hDlg) { - const AUDIO_DRIVER *pAudioDrv = NULL; + AUDIO_DRIVER *pAudioDrv = NULL; int i, j; TVINSERTSTRUCTW insert; HTREEITEM root, driver[10]; @@ -247,7 +247,7 @@ static void initAudioDeviceTree(HWND hDlg) LoadStringW (GetModuleHandle (NULL), pAudioDrv->nameID, text, sizeof(text)/sizeof(text[0])); - if ((hdrv = OpenDriverA(name, 0, 0))) + if ((hdrv = pAudioDrv->hDriver)) { HMODULE lib; if ((lib = GetDriverModuleHandle(hdrv))) @@ -473,7 +473,6 @@ static void initAudioDeviceTree(HWND hDlg) } } } - CloseDriver(hdrv, 0, 0); } } @@ -490,7 +489,7 @@ static void initAudioDeviceTree(HWND hDlg) static void findAudioDrivers(void) { int numFound = 0; - const AUDIO_DRIVER *pAudioDrv = NULL; + AUDIO_DRIVER *pAudioDrv = NULL; HCURSOR old_cursor; /* delete an existing list */ @@ -511,10 +510,38 @@ static void findAudioDrivers(void) sprintf(driver, "wine%s.drv", pAudioDrv->szDriver); - if ((hdrv = OpenDriverA(driver, 0, 0))) - { - CloseDriver(hdrv, 0, 0); + hdrv = pAudioDrv->hDriver; + if (!pAudioDrv->hDriver && (hdrv = OpenDriverA(driver, 0, 0))) { + HMODULE lib = GetDriverModuleHandle(hdrv); + MessagePtr wodMessagePtr = (MessagePtr)GetProcAddress(lib, "wodMessage"); + MessagePtr widMessagePtr = (MessagePtr)GetProcAddress(lib, "widMessage"); + MessagePtr modMessagePtr = (MessagePtr)GetProcAddress(lib, "modMessage"); + MessagePtr midMessagePtr = (MessagePtr)GetProcAddress(lib, "midMessage"); + MessagePtr auxMessagePtr = (MessagePtr)GetProcAddress(lib, "auxMessage"); + MessagePtr mxdMessagePtr = (MessagePtr)GetProcAddress(lib, "mxdMessage"); + + pAudioDrv->hDriver = hdrv; + if (wodMessagePtr) + wodMessagePtr(0, DRVM_INIT, 0, 0, 0); + + if (widMessagePtr) + widMessagePtr(0, DRVM_INIT, 0, 0, 0); + + if (modMessagePtr) + modMessagePtr(0, DRVM_INIT, 0, 0, 0); + + if (midMessagePtr) + midMessagePtr(0, DRVM_INIT, 0, 0, 0); + + if (auxMessagePtr) + auxMessagePtr(0, DRVM_INIT, 0, 0, 0); + + if (mxdMessagePtr) + mxdMessagePtr(0, DRVM_INIT, 0, 0, 0); + } + if (hdrv) + { if (loadedAudioDrv) loadedAudioDrv = HeapReAlloc(GetProcessHeap(), 0, loadedAudioDrv, (numFound + 1) * sizeof(AUDIO_DRIVER)); else

1 0

Marko Nikolic : advapi32/tests: Fixed -Wsign-compare warnings in security tests.
by Alexandre Julliard 21 Jun '10

21 Jun '10

Module: wine Branch: master Commit: 3675a3844786496098675a9fa0855357c2fe1e9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3675a3844786496098675a9fa… Author: Marko Nikolic <grkoma(a)gmail.com> Date: Fri Jun 18 22:01:57 2010 +0200 advapi32/tests: Fixed -Wsign-compare warnings in security tests. --- dlls/advapi32/tests/security.c | 62 ++++++++++++++++++++-------------------- 1 files changed, 31 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3675a3844786496098675…

1 0

Marko Nikolic : advapi32/ tests Fixed test macro in ConvertSecurityDescriptorToString.
by Alexandre Julliard 21 Jun '10

21 Jun '10

Module: wine Branch: master Commit: b8978553ad83a069e7a033a995048b3a335b6ad4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8978553ad83a069e7a033a99… Author: Marko Nikolic <grkoma(a)gmail.com> Date: Fri Jun 18 22:44:45 2010 +0200 advapi32/tests Fixed test macro in ConvertSecurityDescriptorToString. --- 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 ba139ce..2b14ae5 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -2812,7 +2812,7 @@ static void test_ConvertSecurityDescriptorToString(void) #define CHECK_ONE_OF_AND_FREE(exp_str1, exp_str2) \ ok(strcmp(string, (exp_str1)) == 0 || strcmp(string, (exp_str2)) == 0, "String mismatch (expected\n\"%s\" or\n\"%s\", got\n\"%s\")\n", (exp_str1), (exp_str2), string); \ - ok(len >= (strlen(string) + 1), "Length mismatch (expected %d, got %d)\n", lstrlen(string) + 1, len); \ + ok(len >= (strlen(exp_str1) + 1) || len >= (strlen(exp_str2) + 1), "Length mismatch (expected %d or %d, got %d)\n", lstrlen(exp_str1) + 1, lstrlen(exp_str2) + 1, len); \ LocalFree(string); InitializeSecurityDescriptor(&desc, SECURITY_DESCRIPTOR_REVISION);

1 0

Alexandre Julliard : user32: Fallback to English in MessageBoxIndirect if the specified language is not supported .
by Alexandre Julliard 21 Jun '10

21 Jun '10

Module: wine Branch: master Commit: db1c43c399fe9559abe43a08064255c1e50acf6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=db1c43c399fe9559abe43a080… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 21 11:50:44 2010 +0200 user32: Fallback to English in MessageBoxIndirect if the specified language is not supported. --- dlls/user32/msgbox.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/user32/msgbox.c b/dlls/user32/msgbox.c index 32b4252..effe09b 100644 --- a/dlls/user32/msgbox.c +++ b/dlls/user32/msgbox.c @@ -512,7 +512,11 @@ INT WINAPI MessageBoxIndirectW( LPMSGBOXPARAMSW msgbox ) if (!(hRes = FindResourceExW(user32_module, (LPWSTR)RT_DIALOG, msg_box_res_nameW, msgbox->dwLanguageId))) - return 0; + { + if (!msgbox->dwLanguageId || + !(hRes = FindResourceExW(user32_module, (LPWSTR)RT_DIALOG, msg_box_res_nameW, LANG_NEUTRAL))) + return 0; + } if (!(tmplate = LoadResource(user32_module, hRes))) return 0;

1 0

Jacek Caban : mshtml: Fixed event tests.
by Alexandre Julliard 21 Jun '10

21 Jun '10

Module: wine Branch: master Commit: c00121a6030124553a542f7ba93b799c05144e2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c00121a6030124553a542f7ba… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jun 19 22:25:12 2010 +0200 mshtml: Fixed event tests. --- dlls/mshtml/tests/events.c | 48 +++++++------------------------------------ 1 files changed, 8 insertions(+), 40 deletions(-) diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index d62df7a..c9523de 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -483,9 +483,7 @@ static void _test_event_x(unsigned line, IHTMLEventObj *event, LONG exl) hres = IHTMLEventObj_get_x(event, &l); ok_(__FILE__,line)(hres == S_OK, "get_x failed: %08x\n", hres); - if(exl == -10) /* don't test the exact value */ - todo_wine ok_(__FILE__,line)(l > 0, "x = %d\n", l); - else + if(exl != -10) /* don't test the exact value */ ok_(__FILE__,line)(l == exl, "x = %d, expected %d\n", l, exl); } @@ -496,9 +494,7 @@ static void _test_event_y(unsigned line, IHTMLEventObj *event, LONG exl) hres = IHTMLEventObj_get_y(event, &l); ok_(__FILE__,line)(hres == S_OK, "get_y failed: %08x\n", hres); - if(exl == -10) /* don't test the exact value */ - todo_wine ok_(__FILE__,line)(l > 0, "y = %d\n", l); - else + if(exl != -10) /* don't test the exact value */ ok_(__FILE__,line)(l == exl, "y = %d, expected %d\n", l, exl); } @@ -509,14 +505,8 @@ static void _test_event_clientx(unsigned line, IHTMLEventObj *event, LONG exl) hres = IHTMLEventObj_get_clientX(event, &l); ok_(__FILE__,line)(hres == S_OK, "get_clientX failed: %08x\n", hres); - if(exl == -10) {/* don't test the exact value */ - if(xy_todo) - todo_wine ok_(__FILE__,line)(l > 0, "clientX = %d\n", l); - else - ok_(__FILE__,line)(l > 0, "clientX = %d\n", l); - }else { + if(exl != -10) /* don't test the exact value */ ok_(__FILE__,line)(l == exl, "clientX = %d, expected %d\n", l, exl); - } } static void _test_event_clienty(unsigned line, IHTMLEventObj *event, LONG exl) @@ -526,14 +516,8 @@ static void _test_event_clienty(unsigned line, IHTMLEventObj *event, LONG exl) hres = IHTMLEventObj_get_clientY(event, &l); ok_(__FILE__,line)(hres == S_OK, "get_clientY failed: %08x\n", hres); - if(exl == -10) {/* don't test the exact value */ - if(xy_todo) - todo_wine ok_(__FILE__,line)(l > 0, "clientY = %d\n", l); - else - ok_(__FILE__,line)(l > 0, "clientY = %d\n", l); - }else { + if(exl != -10) /* don't test the exact value */ ok_(__FILE__,line)(l == exl, "clientY = %d, expected %d\n", l, exl); - } } static void _test_event_offsetx(unsigned line, IHTMLEventObj *event, LONG exl) @@ -543,9 +527,7 @@ static void _test_event_offsetx(unsigned line, IHTMLEventObj *event, LONG exl) hres = IHTMLEventObj_get_offsetX(event, &l); ok_(__FILE__,line)(hres == S_OK, "get_offsetX failed: %08x\n", hres); - if(exl == -10) /* don't test the exact value */ - todo_wine ok_(__FILE__,line)(l > 0, "offsetX = %d\n", l); - else + if(exl != -10) /* don't test the exact value */ ok_(__FILE__,line)(l == exl, "offsetX = %d, expected %d\n", l, exl); } @@ -556,9 +538,7 @@ static void _test_event_offsety(unsigned line, IHTMLEventObj *event, LONG exl) hres = IHTMLEventObj_get_offsetY(event, &l); ok_(__FILE__,line)(hres == S_OK, "get_offsetY failed: %08x\n", hres); - if(exl == -10) /* don't test the exact value */ - todo_wine ok_(__FILE__,line)(l > 0, "offsetY = %d\n", l); - else + if(exl != -10) /* don't test the exact value */ ok_(__FILE__,line)(l == exl, "offsetY = %d, expected %d\n", l, exl); } @@ -569,14 +549,8 @@ static void _test_event_screenx(unsigned line, IHTMLEventObj *event, LONG exl) hres = IHTMLEventObj_get_screenX(event, &l); ok_(__FILE__,line)(hres == S_OK, "get_screenX failed: %08x\n", hres); - if(exl == -10) { /* don't test the exact value */ - if(xy_todo) - todo_wine ok_(__FILE__,line)(l > 0, "screenX = %d\n", l); - else - ok_(__FILE__,line)(l > 0, "screenX = %d\n", l); - }else { + if(exl != -10) /* don't test the exact value */ ok_(__FILE__,line)(l == exl, "screenX = %d, expected %d\n", l, exl); - } } static void _test_event_screeny(unsigned line, IHTMLEventObj *event, LONG exl) @@ -586,14 +560,8 @@ static void _test_event_screeny(unsigned line, IHTMLEventObj *event, LONG exl) hres = IHTMLEventObj_get_screenY(event, &l); ok_(__FILE__,line)(hres == S_OK, "get_screenY failed: %08x\n", hres); - if(exl == -10) { /* don't test the exact value */ - if(xy_todo) - todo_wine ok_(__FILE__,line)(l > 0, "screenY = %d\n", l); - else - ok_(__FILE__,line)(l > 0, "screenY = %d\n", l); - }else { + if(exl != -10) /* don't test the exact value for -10 */ ok_(__FILE__,line)(l == exl, "screenY = %d, expected %d\n", l, exl); - } } static void _test_event_type(unsigned line, IHTMLEventObj *event, const char *exstr)

1 0

Jacek Caban : mshtml: Check if event_table entry is allocated before using it in remove_event_handler .
by Alexandre Julliard 21 Jun '10

21 Jun '10

Module: wine Branch: master Commit: 1eced6053d7d277029128b9e127edf2317e9ccbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=1eced6053d7d277029128b9e1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jun 19 22:25:32 2010 +0200 mshtml: Check if event_table entry is allocated before using it in remove_event_handler. --- dlls/mshtml/htmlevent.c | 2 +- dlls/mshtml/tests/events.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 6925a0c..7cc2f39 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1077,7 +1077,7 @@ static HRESULT ensure_nsevent_handler(HTMLDocumentNode *doc, event_target_t *eve static HRESULT remove_event_handler(event_target_t **event_target, eventid_t eid) { - if(*event_target && (*event_target)->event_table[eid]->handler_prop) { + if(*event_target && (*event_target)->event_table[eid] && (*event_target)->event_table[eid]->handler_prop) { IDispatch_Release((*event_target)->event_table[eid]->handler_prop); (*event_target)->event_table[eid]->handler_prop = NULL; } diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index c9523de..deafd54 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -1172,6 +1172,10 @@ static void test_onclick(IHTMLDocument2 *doc) hres = IHTMLElement_put_onclick(div, v); ok(hres == S_OK, "put_onclick failed: %08x\n", hres); + V_VT(&v) = VT_NULL; + hres = IHTMLElement_put_ondblclick(div, v); + ok(hres == S_OK, "put_ondblclick failed: %08x\n", hres); + V_VT(&v) = VT_EMPTY; hres = IHTMLElement_get_onclick(div, &v); ok(hres == S_OK, "get_onclick failed: %08x\n", hres);

1 0

Jacek Caban : shdocvw: Return IHTMLDocument2's IDispatch in get_Document.
by Alexandre Julliard 21 Jun '10

21 Jun '10

Module: wine Branch: master Commit: 2c354b8bbbd4f59962673894caa8f188cc682eca URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c354b8bbbd4f59962673894c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jun 20 14:40:09 2010 +0200 shdocvw: Return IHTMLDocument2's IDispatch in get_Document. --- dlls/mshtml/tests/htmldoc.c | 5 +++++ dlls/shdocvw/tests/webbrowser.c | 6 ++++++ dlls/shdocvw/webbrowser.c | 22 +++++++++++++++++++--- 3 files changed, 30 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 319e5fd..2d51262 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -4515,6 +4515,11 @@ static void test_QueryInterface(IHTMLDocument2 *doc) hres = IUnknown_QueryInterface(doc, &IID_IStdMarshalInfo, (void**)&qi); ok(hres == E_NOINTERFACE, "QueryInterface returned %08x, expected E_NOINTERFACE\n", hres); ok(qi == NULL, "qi=%p, expected NULL\n", qi); + + hres = IUnknown_QueryInterface(doc, &IID_IDispatch, (void**)&qi); + ok(hres == S_OK, "Could not get IDispatch interface: %08x\n", hres); + ok(qi != (IUnknown*)doc, "disp == doc\n"); + IUnknown_Release(qi); } static void init_test(enum load_state_t ls) { diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c index 17189fc..15fc1ec 100644 --- a/dlls/shdocvw/tests/webbrowser.c +++ b/dlls/shdocvw/tests/webbrowser.c @@ -2369,6 +2369,7 @@ static void test_IServiceProvider(IUnknown *unk) #define get_document(u) _get_document(__LINE__,u) static IDispatch *_get_document(unsigned line, IUnknown *unk) { + IHTMLDocument2 *html_doc; IWebBrowser2 *wb; IDispatch *disp; HRESULT hres; @@ -2382,6 +2383,11 @@ static IDispatch *_get_document(unsigned line, IUnknown *unk) ok_(__FILE__,line)(hres == S_OK, "get_Document failed: %08x\n", hres); ok_(__FILE__,line)(disp != NULL, "doc_disp == NULL\n"); + hres = IDispatch_QueryInterface(disp, &IID_IHTMLDocument2, (void**)&html_doc); + ok_(__FILE__,line)(hres == S_OK, "Could not get IHTMLDocument iface: %08x\n", hres); + ok(disp == (IDispatch*)html_doc, "disp != html_doc\n"); + IHTMLDocument_Release(html_doc); + return disp; } diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c index 0c26a83..20d39bb 100644 --- a/dlls/shdocvw/webbrowser.c +++ b/dlls/shdocvw/webbrowser.c @@ -22,6 +22,7 @@ #include "wine/debug.h" #include "shdocvw.h" #include "exdispid.h" +#include "mshtml.h" WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); @@ -334,13 +335,28 @@ static HRESULT WINAPI WebBrowser_get_Container(IWebBrowser2 *iface, IDispatch ** static HRESULT WINAPI WebBrowser_get_Document(IWebBrowser2 *iface, IDispatch **ppDisp) { WebBrowser *This = WEBBROWSER_THIS(iface); + IDispatch *disp = NULL; TRACE("(%p)->(%p)\n", This, ppDisp); - *ppDisp = NULL; - if(This->doc_host.document) - IUnknown_QueryInterface(This->doc_host.document, &IID_IDispatch, (void**)ppDisp); + if(This->doc_host.document) { + HRESULT hres; + + hres = IUnknown_QueryInterface(This->doc_host.document, &IID_IDispatch, (void**)&disp); + if(SUCCEEDED(hres)) { + IDispatch *html_doc; + + /* Some broken apps cast returned IDispatch to IHTMLDocument2 + * without QueryInterface call */ + hres = IDispatch_QueryInterface(disp, &IID_IHTMLDocument2, (void**)&html_doc); + if(SUCCEEDED(hres)) { + IDispatch_Release(disp); + disp = html_doc; + } + } + } + *ppDisp = disp; return S_OK; }

1 0