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

Dylan Smith : winemine: Set mines after first choice.
by Alexandre Julliard 25 Jun '08

25 Jun '08

Module: wine Branch: master Commit: 04f925e72ce4c87dbdf503072dd58e4e444d3760 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04f925e72ce4c87dbdf503072… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Jun 24 14:09:42 2008 -0400 winemine: Set mines after first choice. The first choice never is on a mine in Windows. This can be tested by making a custom game with as many mines as possible, and then playing the start of many games, and the first choice will never be on a mine. This is done to make the game reasonable, since after the first choice there will at least be some information given to make the next choice. --- programs/winemine/main.c | 46 +++++++++++++++++++++++++++------------------- programs/winemine/main.h | 2 +- 2 files changed, 28 insertions(+), 20 deletions(-) diff --git a/programs/winemine/main.c b/programs/winemine/main.c index f4a48d0..2d17536 100644 --- a/programs/winemine/main.c +++ b/programs/winemine/main.c @@ -452,13 +452,24 @@ static void MoveOnScreen(RECT* rect) void CreateBoard( BOARD *p_board ) { int left, top, bottom, right; + unsigned col, row; RECT wnd_rect; p_board->mb = MB_NONE; p_board->boxes_left = p_board->cols * p_board->rows - p_board->mines; p_board->num_flags = 0; - CreateBoxes( p_board ); + /* Create the boxes... + * We actually create them with an empty border, + * so special care doesn't have to be taken on the edges + */ + for( col = 0; col <= p_board->cols + 1; col++ ) + for( row = 0; row <= p_board->rows + 1; row++ ) { + p_board->box[col][row].IsPressed = FALSE; + p_board->box[col][row].IsMine = FALSE; + p_board->box[col][row].FlagType = NORMAL; + p_board->box[col][row].NumMines = 0; + } p_board->width = p_board->cols * MINE_WIDTH + BOARD_WMARGIN * 2; @@ -531,30 +542,21 @@ void CheckLevel( BOARD *p_board ) if( p_board->mines < BEGINNER_MINES ) p_board->mines = BEGINNER_MINES; - if( p_board->mines > p_board->cols * p_board->rows - 1 ) - p_board->mines = p_board->cols * p_board->rows - 1; + if( p_board->mines > p_board->cols * p_board->rows - 2 ) + p_board->mines = p_board->cols * p_board->rows - 2; } - -void CreateBoxes( BOARD *p_board ) +/* Randomly places mines everywhere except the selected box. */ +void PlaceMines ( BOARD *p_board, int selected_col, int selected_row ) { int i, j; unsigned col, row; srand( (unsigned) time( NULL ) ); - /* Create the boxes... - * We actually create them with an empty border, - * so special care doesn't have to be taken on the edges - */ - - for( col = 0; col <= p_board->cols + 1; col++ ) - for( row = 0; row <= p_board->rows + 1; row++ ) { - p_board->box[col][row].IsPressed = FALSE; - p_board->box[col][row].IsMine = FALSE; - p_board->box[col][row].FlagType = NORMAL; - p_board->box[col][row].NumMines = 0; - } + /* Temporarily place a mine at the selected box until all the other + * mines are placed, this avoids checking in the mine creation loop. */ + p_board->box[selected_col][selected_row].IsMine = TRUE; /* create mines */ i = 0; @@ -568,11 +570,13 @@ void CreateBoxes( BOARD *p_board ) } } + /* Remove temporarily placed mine for selected box */ + p_board->box[selected_col][selected_row].IsMine = FALSE; + /* * Now we label the remaining boxes with the * number of mines surrounding them. */ - for( col = 1; col < p_board->cols + 1; col++ ) for( row = 1; row < p_board->rows + 1; row++ ) { for( i = -1; i <= 1; i++ ) @@ -838,8 +842,12 @@ void TestMines( BOARD *p_board, POINT pt, int msg ) p_board->press.x, p_board->press.y ); p_board->press.x = 0; p_board->press.y = 0; - if( p_board->box[col][row].FlagType != FLAG ) + if( p_board->box[col][row].FlagType != FLAG + && p_board->status != PLAYING ) + { p_board->status = PLAYING; + PlaceMines( p_board, col, row ); + } CompleteBox( p_board, col, row ); break; diff --git a/programs/winemine/main.h b/programs/winemine/main.h index 37fa768..16fcb2e 100644 --- a/programs/winemine/main.h +++ b/programs/winemine/main.h @@ -134,7 +134,7 @@ void CheckLevel( BOARD *p_board ); void CreateBoard( BOARD *p_board ); -void CreateBoxes( BOARD *p_board ); +void PlaceMines ( BOARD *p_board, int selected_col, int selected_row ); void TestBoard( HWND hWnd, BOARD *p_board, int x, int y, int msg );

1 0

Kai Blin : netapi32: tests/access: Don' t clutter up standalone Windows boxes.
by Alexandre Julliard 25 Jun '08

25 Jun '08

Module: wine Branch: master Commit: 2d02cb056d30277093d9ae80ff564349a9c3fce6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d02cb056d30277093d9ae80f… Author: Kai Blin <kai.blin(a)gmail.com> Date: Tue Jun 24 19:29:19 2008 +0200 netapi32: tests/access: Don't clutter up standalone Windows boxes. On Windows XP (and newer), calling NetUserChangePassword with a NULL domainname parameter creates a user home directory, iff the machine is not member of a domain. As we don't want to clutter up the folder containing the home directories, specify \\127.0.0.1 as domainname to access the local samdb. --- dlls/netapi32/tests/access.c | 19 ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/netapi32/tests/access.c b/dlls/netapi32/tests/access.c index eae713f..8af585d 100644 --- a/dlls/netapi32/tests/access.c +++ b/dlls/netapi32/tests/access.c @@ -52,6 +52,7 @@ static WCHAR sTooLongPassword[] = {'a','b','c','d','e','f','g','h','a','b','c',' static WCHAR sTestUserName[] = {'t', 'e', 's', 't', 'u', 's', 'e', 'r', 0}; static WCHAR sTestUserOldPass[] = {'O', 'l', 'd', 'P', 'a', 's', 's', 'W', '0', 'r', 'd', 'S', 'e', 't', '!', '~', 0}; static WCHAR sTestUserNewPass[] = {'N', 'e', 'w', 'P', 'a', 's', 's', 'W', '0', 'r', 'd', 'S', 'e', 't', '!', '~', 0}; +static const WCHAR sLoopbackPath[] = {'\\','\\','1','2','7','.','0','.','0','.','1', 0}; static const WCHAR sBadNetPath[] = {'\\','\\','B','a',' ',' ','p','a','t','h',0}; static const WCHAR sInvalidName[] = {'\\',0}; static const WCHAR sInvalidName2[] = {'\\','\\',0}; @@ -294,13 +295,21 @@ static void run_userhandling_tests(void) if(ret != NERR_Success) return; - ret = pNetUserChangePassword(NULL, sNonexistentUser, sTestUserOldPass, - sTestUserNewPass); + /* On Windows XP (and newer), calling NetUserChangePassword with a NULL + * domainname parameter creates a user home directory, iff the machine is + * not member of a domain. + * As we don't want to clutter up the folder containing the home + * directories, specify \\127.0.0.1 as domainname to access the local samdb. + * Note that \\localhost does not work. + */ + + ret = pNetUserChangePassword(sLoopbackPath, sNonexistentUser, + sTestUserOldPass, sTestUserNewPass); ok(ret == NERR_UserNotFound || ret == ERROR_INVALID_PASSWORD || ret == ERROR_CANT_ACCESS_DOMAIN_INFO, "Changing password for nonexistent user returned 0x%08x.\n", ret); - ret = pNetUserChangePassword(NULL, sTestUserName, sTestUserOldPass, + ret = pNetUserChangePassword(sLoopbackPath, sTestUserName, sTestUserOldPass, sTestUserOldPass); /* Apparently NERR_PasswordTooShort can be returned on windows xp if a * strict password policy is enforced @@ -309,7 +318,7 @@ static void run_userhandling_tests(void) ret == ERROR_CANT_ACCESS_DOMAIN_INFO || ret == ERROR_INVALID_PASSWORD, "Changing old password to old password returned 0x%08x.\n", ret); - ret = pNetUserChangePassword(NULL, sTestUserName, sTestUserNewPass, + ret = pNetUserChangePassword(sLoopbackPath, sTestUserName, sTestUserNewPass, sTestUserOldPass); ok(ret == ERROR_INVALID_PASSWORD || ret == ERROR_CANT_ACCESS_DOMAIN_INFO, "Trying to change password giving an invalid password returned 0x%08x.\n", ret); @@ -319,7 +328,7 @@ static void run_userhandling_tests(void) ok(ret == ERROR_PASSWORD_RESTRICTION, "Changing to a password that's too long returned 0x%08x.\n", ret); - ret = pNetUserChangePassword(NULL, sTestUserName, sTestUserOldPass, + ret = pNetUserChangePassword(sLoopbackPath, sTestUserName, sTestUserOldPass, sTestUserNewPass); ok(ret == NERR_Success || ret == ERROR_CANT_ACCESS_DOMAIN_INFO || ret == ERROR_INVALID_PASSWORD, "Changing the password correctly returned 0x%08x.\n", ret);

1 0

Dylan Smith : winemine: Beginner mode should have one more row and column.
by Alexandre Julliard 25 Jun '08

25 Jun '08

Module: wine Branch: master Commit: 8f1a85e4d5feff011898e3bfc7c8f93f6b586dc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f1a85e4d5feff011898e3bfc… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Jun 24 14:09:34 2008 -0400 winemine: Beginner mode should have one more row and column. Windows uses a 9x9 instead of 8x8 board for beginner mode. --- programs/winemine/main.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winemine/main.h b/programs/winemine/main.h index 1b818cb..37fa768 100644 --- a/programs/winemine/main.h +++ b/programs/winemine/main.h @@ -19,8 +19,8 @@ #include <windows.h> #define BEGINNER_MINES 10 -#define BEGINNER_COLS 8 -#define BEGINNER_ROWS 8 +#define BEGINNER_COLS 9 +#define BEGINNER_ROWS 9 #define ADVANCED_MINES 40 #define ADVANCED_COLS 16

1 0

H. Verbeet : d3d9: Use color_match() in fog_with_shader_test().
by Alexandre Julliard 25 Jun '08

25 Jun '08

Module: wine Branch: master Commit: 079686b707d494db1306d9a62bc1d184050c1c0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=079686b707d494db1306d9a62… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Wed Jun 25 00:32:08 2008 +0200 d3d9: Use color_match() in fog_with_shader_test(). --- dlls/d3d9/tests/visual.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index ad5bab2..1a9b5fc 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -1463,9 +1463,7 @@ static void fog_with_shader_test(IDirect3DDevice9 *device) /* As the red and green component are the result of blending use 5% tolerance on the expected value */ color = getPixelColor(device, 128, 240); - ok((unsigned char)(color) == ((unsigned char)test_data[i].color[j]) - && abs( ((unsigned char)(color>>8)) - (unsigned char)(test_data[i].color[j]>>8) ) < 13 - && abs( ((unsigned char)(color>>16)) - (unsigned char)(test_data[i].color[j]>>16) ) < 13, + ok(color_match(color, test_data[i].color[j], 13), "fog vs%i ps%i fvm%i ftm%i %d: got color %08x, expected %08x +-5%%\n", test_data[i].vshader, test_data[i].pshader, test_data[i].vfog, test_data[i].tfog, j, color, test_data[i].color[j]); }

1 0

Hwang YunSong(황윤성) : winhlp32: Updated Korean resource.
by Alexandre Julliard 25 Jun '08

25 Jun '08

Module: wine Branch: master Commit: 8ce4a6fdeca27e78aa90a7a5fc185a94b99a2039 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ce4a6fdeca27e78aa90a7a5f… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Wed Jun 25 09:55:42 2008 +0900 winhlp32: Updated Korean resource. --- programs/winhlp32/Ko.rc | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/programs/winhlp32/Ko.rc b/programs/winhlp32/Ko.rc index 26c8352..32289db 100644 --- a/programs/winhlp32/Ko.rc +++ b/programs/winhlp32/Ko.rc @@ -39,21 +39,21 @@ MAIN_MENU MENU LANGUAGE LANG_KOREAN, SUBLANG_NEUTRAL POPUP "å��(&B)" { MENUITEM "��(&D)...", MNID_BKMK_DEFINE } - POPUP "&Options" { - POPUP "Help always visible" + POPUP "�ɼ�(&O)" { + POPUP "�� ̱�" BEGIN - MENUITEM "Default", MNID_OPTS_HELP_DEFAULT - MENUITEM "Visible", MNID_OPTS_HELP_VISIBLE - MENUITEM "Non visible", MNID_OPTS_HELP_NONVISIBLE + MENUITEM "�⺻", MNID_OPTS_HELP_DEFAULT + MENUITEM "��̱�", MNID_OPTS_HELP_VISIBLE + MENUITEM "�� ʱ�", MNID_OPTS_HELP_NONVISIBLE END - MENUITEM "History", MNID_OPTS_HISTORY - POPUP "Fonts" + MENUITEM "��", MNID_OPTS_HISTORY + POPUP "�۲�" BEGIN - MENUITEM "Small", MNID_OPTS_FONTS_SMALL - MENUITEM "Normal", MNID_OPTS_FONTS_NORMAL - MENUITEM "Large", MNID_OPTS_FONTS_LARGE + MENUITEM "�۰�", MNID_OPTS_FONTS_SMALL + MENUITEM "��", MNID_OPTS_FONTS_NORMAL + MENUITEM "ũ��", MNID_OPTS_FONTS_LARGE END - MENUITEM "Use system colors", MNID_OPTS_SYSTEM_COLORS + MENUITEM "�ý�� ", MNID_OPTS_SYSTEM_COLORS } POPUP "��(&H)" { MENUITEM "�� (&O)", MNID_HELP_HELPON

1 0

H. Verbeet : wined3d: Explicitly enable depth buffer writing in depth_blt() .
by Alexandre Julliard 25 Jun '08

25 Jun '08

Module: wine Branch: master Commit: c433562a68743088283f61656b950cfe50347e59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c433562a68743088283f61656… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Wed Jun 25 00:32:00 2008 +0200 wined3d: Explicitly enable depth buffer writing in depth_blt(). This prevents conflicts with WINED3DRS_ZWRITEENABLE. --- dlls/wined3d/drawprim.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index b5e59b8..7214bf8 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -732,6 +732,7 @@ static void depth_blt(IWineD3DDevice *iface, GLuint texture) { glDisable(GL_STENCIL_TEST); glEnable(GL_DEPTH_TEST); glDepthFunc(GL_ALWAYS); + glDepthMask(GL_TRUE); glBlendFunc(GL_ZERO, GL_ONE); GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB));

1 0

James Hawkins : urlmon: Fix a few test failures in IE7.
by Alexandre Julliard 25 Jun '08

25 Jun '08

Module: wine Branch: master Commit: 75a10719ac123f82cad6c566e3a5a3f91549db08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75a10719ac123f82cad6c566e… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Jun 24 16:53:51 2008 -0500 urlmon: Fix a few test failures in IE7. --- dlls/urlmon/tests/protocol.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 7aff617..bc666eb 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -1342,8 +1342,10 @@ static void test_file_protocol_fail(void) SET_EXPECT(GetBindInfo); expect_hrResult = MK_E_SYNTAX; hres = IInternetProtocol_Start(protocol, wszIndexHtml, &protocol_sink, &bind_info, 0, 0); - ok(hres == MK_E_SYNTAX, "Start failed: %08x, expected MK_E_SYNTAX\n", hres); - CHECK_CALLED(GetBindInfo); + ok(hres == MK_E_SYNTAX || + hres == E_INVALIDARG, + "Start failed: %08x, expected MK_E_SYNTAX or E_INVALIDARG\n", hres); + CLEAR_CALLED(GetBindInfo); /* GetBindInfo not called in IE7 */ SET_EXPECT(GetBindInfo); if(!(bindf & BINDF_FROMURLMON)) @@ -1387,12 +1389,12 @@ static void test_file_protocol_fail(void) SET_EXPECT(GetBindInfo); hres = IInternetProtocol_Start(protocol, NULL, &protocol_sink, &bind_info, 0, 0); ok(hres == E_INVALIDARG, "Start failed: %08x, expected E_INVALIDARG\n", hres); - CHECK_CALLED(GetBindInfo); + CLEAR_CALLED(GetBindInfo); /* GetBindInfo not called in IE7 */ SET_EXPECT(GetBindInfo); hres = IInternetProtocol_Start(protocol, emptyW, &protocol_sink, &bind_info, 0, 0); ok(hres == E_INVALIDARG, "Start failed: %08x, expected E_INVALIDARG\n", hres); - CHECK_CALLED(GetBindInfo); + CLEAR_CALLED(GetBindInfo); /* GetBindInfo not called in IE7 */ IInternetProtocol_Release(protocol); }

1 0

James Hawkins : msi: Add another MsiGetFileVersionTest.
by Alexandre Julliard 25 Jun '08

25 Jun '08

Module: wine Branch: master Commit: 6056fd1b0571938f5785b84b006095517c6f18dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=6056fd1b0571938f5785b84b0… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Jun 24 21:26:20 2008 -0500 msi: Add another MsiGetFileVersionTest. --- dlls/msi/tests/msi.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 7f90165..52cfd74 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -2290,6 +2290,10 @@ static void test_MsiGetFileVersion(void) ok(!lstrcmpA(lang, langcheck), "Expected %s, got %s\n", langcheck, lang); ok(langsz == langchecksz, "Expected %d, got %d\n", langchecksz, langsz); + /* check neither version nor language */ + r = MsiGetFileVersionA(path, NULL, NULL, NULL, NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + /* get pcchVersionBuf */ versz = MAX_PATH; r = MsiGetFileVersionA(path, NULL, &versz, NULL, NULL);

1 0

Jacek Caban : mshtml: Added IHTMLSelectElement::get_type implementation.
by Alexandre Julliard 25 Jun '08

25 Jun '08

Module: wine Branch: master Commit: 1d6c28459be7c44d9aa897f9b5ac1e523523f021 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d6c28459be7c44d9aa897f9b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 24 15:24:59 2008 -0500 mshtml: Added IHTMLSelectElement::get_type implementation. --- dlls/mshtml/htmlselect.c | 22 ++++++++++++++++++++-- dlls/mshtml/tests/dom.c | 12 ++++++++++++ 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index 9bd2693..a432b6d 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -223,8 +223,26 @@ static HRESULT WINAPI HTMLSelectElement_get_selectedIndex(IHTMLSelectElement *if static HRESULT WINAPI HTMLSelectElement_get_type(IHTMLSelectElement *iface, BSTR *p) { HTMLSelectElement *This = HTMLSELECT_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + const PRUnichar *type; + nsAString type_str; + nsresult nsres; + HRESULT hres = S_OK; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&type_str, NULL); + nsres = nsIDOMHTMLSelectElement_GetType(This->nsselect, &type_str); + if(NS_SUCCEEDED(nsres)) { + nsAString_GetData(&type_str, &type); + *p = *type ? SysAllocString(type) : NULL; + }else { + ERR("GetType failed: %08x\n", nsres); + hres = E_FAIL; + } + + nsAString_Finish(&type_str); + + return hres; } static HRESULT WINAPI HTMLSelectElement_put_value(IHTMLSelectElement *iface, BSTR v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 3c51ec7..5a3101b 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -656,6 +656,17 @@ static void _test_select_set_value(unsigned line, IHTMLSelectElement *select, co ok_(__FILE__,line) (hres == S_OK, "put_value failed: %08x\n", hres); } +#define test_select_type(s,t) _test_select_type(__LINE__,s,t) +static void _test_select_type(unsigned line, IHTMLSelectElement *select, const char *extype) +{ + BSTR type; + HRESULT hres; + + hres = IHTMLSelectElement_get_type(select, &type); + ok_(__FILE__,line) (hres == S_OK, "get_type failed: %08x\n", hres); + ok_(__FILE__,line) (!strcmp_wa(type, extype), "type=%s, expected %s\n", dbgstr_w(type), extype); +} + #define test_range_text(r,t) _test_range_text(__LINE__,r,t) static void _test_range_text(unsigned line, IHTMLTxtRange *range, const char *extext) { @@ -1368,6 +1379,7 @@ static IHTMLElement *get_doc_elem_by_id(IHTMLDocument2 *doc, LPCWSTR id) static void test_select_elem(IHTMLSelectElement *select) { + test_select_type(select, "select-one"); test_select_length(select, 2); test_select_selidx(select, 0); test_select_put_selidx(select, 1);

1 0

Jacek Caban : mshtml: Forward HTMLSelectElement' s IDispatch functions to IDispatchEx implementation.
by Alexandre Julliard 25 Jun '08

25 Jun '08

Module: wine Branch: master Commit: 7d978d557f421c04dd602365115fca9be279dcff URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d978d557f421c04dd6023651… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 24 15:25:19 2008 -0500 mshtml: Forward HTMLSelectElement's IDispatch functions to IDispatchEx implementation. --- dlls/mshtml/htmlselect.c | 19 +++++++++---------- 1 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index a432b6d..9c7cf71 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -68,16 +68,16 @@ static ULONG WINAPI HTMLSelectElement_Release(IHTMLSelectElement *iface) static HRESULT WINAPI HTMLSelectElement_GetTypeInfoCount(IHTMLSelectElement *iface, UINT *pctinfo) { HTMLSelectElement *This = HTMLSELECT_THIS(iface); - FIXME("(%p)->(%p)\n", This, pctinfo); - return E_NOTIMPL; + + return IDispatchEx_GetTypeInfoCount(DISPATCHEX(&This->element.node.dispex), pctinfo); } static HRESULT WINAPI HTMLSelectElement_GetTypeInfo(IHTMLSelectElement *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { HTMLSelectElement *This = HTMLSELECT_THIS(iface); - FIXME("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); - return E_NOTIMPL; + + return IDispatchEx_GetTypeInfo(DISPATCHEX(&This->element.node.dispex), iTInfo, lcid, ppTInfo); } static HRESULT WINAPI HTMLSelectElement_GetIDsOfNames(IHTMLSelectElement *iface, REFIID riid, @@ -85,9 +85,8 @@ static HRESULT WINAPI HTMLSelectElement_GetIDsOfNames(IHTMLSelectElement *iface, LCID lcid, DISPID *rgDispId) { HTMLSelectElement *This = HTMLSELECT_THIS(iface); - FIXME("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, - lcid, rgDispId); - return E_NOTIMPL; + + return IDispatchEx_GetIDsOfNames(DISPATCHEX(&This->element.node.dispex), riid, rgszNames, cNames, lcid, rgDispId); } static HRESULT WINAPI HTMLSelectElement_Invoke(IHTMLSelectElement *iface, DISPID dispIdMember, @@ -95,9 +94,9 @@ static HRESULT WINAPI HTMLSelectElement_Invoke(IHTMLSelectElement *iface, DISPID VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { HTMLSelectElement *This = HTMLSELECT_THIS(iface); - FIXME("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - return E_NOTIMPL; + + return IDispatchEx_Invoke(DISPATCHEX(&This->element.node.dispex), dispIdMember, riid, lcid, + wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); } static HRESULT WINAPI HTMLSelectElement_put_size(IHTMLSelectElement *iface, long v)

1 0