wine-commits October 2012

wine-commits@winehq.org

2 participants
960 discussions

Piotr Caban : msvcrt: Fixed exception information on 64-bit systems.
by Alexandre Julliard 11 Oct '12

11 Oct '12

Module: wine Branch: master Commit: 488693e4075bbd85525a2a9c9ce68cf5fe92aa50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=488693e4075bbd85525a2a9c9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 11 13:20:03 2012 +0200 msvcrt: Fixed exception information on 64-bit systems. --- dlls/msvcrt/cpp.c | 33 ++------------- dlls/msvcrt/cppexcept.h | 97 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 102 insertions(+), 28 deletions(-) diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index 8a8af42..ed5f751 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -666,34 +666,6 @@ __ASM_VTABLE(__non_rtti_object, } #endif -#define DEFINE_EXCEPTION_TYPE_INFO(name, base_classes, cl1, cl2) \ -static const cxx_type_info name ## _cxx_type_info = \ -{ \ - 0, \ - &name ## _type_info, \ - { 0, -1, 0 }, \ - sizeof(name), \ - (cxx_copy_ctor)THISCALL(MSVCRT_ ## name ## _copy_ctor) \ -}; \ -\ -static const cxx_type_info_table name ## _type_info_table = \ -{ \ - base_classes+1, \ - { \ - &name ## _cxx_type_info, \ - cl1, \ - cl2 \ - } \ -}; \ -\ -const cxx_exception_type name ## _exception_type = \ -{ \ - 0, \ - (void *)THISCALL(MSVCRT_ ## name ## _dtor), \ - NULL, \ - &name ## _type_info_table \ -} - DEFINE_RTTI_DATA0( type_info, 0, ".?AVtype_info@@" ); DEFINE_RTTI_DATA0( exception, 0, ".?AVexception@@" ); DEFINE_RTTI_DATA1( bad_typeid, 0, &exception_rtti_base_descriptor, ".?AVbad_typeid@@" ); @@ -713,6 +685,11 @@ void msvcrt_init_exception(void *base) init_bad_typeid_rtti(base); init_bad_cast_rtti(base); init___non_rtti_object_rtti(base); + + init_exception_cxx(base); + init_bad_typeid_cxx(base); + init_bad_cast_cxx(base); + init___non_rtti_object_cxx(base); #endif } diff --git a/dlls/msvcrt/cppexcept.h b/dlls/msvcrt/cppexcept.h index 81066bf..d9ed2fa 100644 --- a/dlls/msvcrt/cppexcept.h +++ b/dlls/msvcrt/cppexcept.h @@ -55,6 +55,7 @@ typedef struct } this_ptr_offsets; /* complete information about a C++ type */ +#ifndef __x86_64__ typedef struct __cxx_type_info { UINT flags; /* flags (see CLASS_* flags below) */ @@ -63,15 +64,34 @@ typedef struct __cxx_type_info unsigned int size; /* object size */ cxx_copy_ctor copy_ctor; /* copy constructor */ } cxx_type_info; +#else +typedef struct __cxx_type_info +{ + UINT flags; + unsigned int type_info; + this_ptr_offsets offsets; + unsigned int size; + unsigned int copy_ctor; +} cxx_type_info; +#endif + #define CLASS_IS_SIMPLE_TYPE 1 #define CLASS_HAS_VIRTUAL_BASE_CLASS 4 /* table of C++ types that apply for a given object */ +#ifndef __x86_64__ typedef struct __cxx_type_info_table { UINT count; /* number of types */ const cxx_type_info *info[3]; /* variable length, we declare it large enough for static RTTI */ } cxx_type_info_table; +#else +typedef struct __cxx_type_info_table +{ + UINT count; + unsigned int info[3]; +} cxx_type_info_table; +#endif struct __cxx_exception_frame; struct __cxx_function_descr; @@ -82,6 +102,7 @@ typedef DWORD (*cxx_exc_custom_handler)( PEXCEPTION_RECORD, struct __cxx_excepti EXCEPTION_REGISTRATION_RECORD *nested_frame, DWORD unknown3 ); /* type information for an exception object */ +#ifndef __x86_64__ typedef struct __cxx_exception_type { UINT flags; /* TYPE_FLAG flags */ @@ -89,6 +110,15 @@ typedef struct __cxx_exception_type cxx_exc_custom_handler custom_handler; /* custom handler for this exception */ const cxx_type_info_table *type_info_table; /* list of types for this exception object */ } cxx_exception_type; +#else +typedef struct +{ + UINT flags; + unsigned int destructor; + unsigned int custom_handler; + unsigned int type_info_table; +} cxx_exception_type; +#endif void WINAPI _CxxThrowException(exception*,const cxx_exception_type*); int CDECL _XcptFilter(NTSTATUS, PEXCEPTION_POINTERS); @@ -119,4 +149,71 @@ static inline void *get_this_pointer( const this_ptr_offsets *off, void *object return this_ptr; } +#ifndef __x86_64__ +#define DEFINE_EXCEPTION_TYPE_INFO(type, base_no, cl1, cl2) \ +\ +static const cxx_type_info type ## _cxx_type_info = { \ + 0, \ + & type ##_type_info, \ + { 0, -1, 0 }, \ + sizeof(type), \ + (cxx_copy_ctor)THISCALL(MSVCRT_ ## type ##_copy_ctor) \ +}; \ +\ +static const cxx_type_info_table type ## _type_info_table = { \ + base_no+1, \ + { \ + & type ## _cxx_type_info, \ + cl1, \ + cl2 \ + } \ +}; \ +\ +static const cxx_exception_type type ## _exception_type = { \ + 0, \ + (cxx_copy_ctor)THISCALL(MSVCRT_ ## type ## _dtor), \ + NULL, \ + & type ## _type_info_table \ +}; + +#else + +#define DEFINE_EXCEPTION_TYPE_INFO(type, base_no, cl1, cl2) \ +\ +static cxx_type_info type ## _cxx_type_info = { \ + 0, \ + 0xdeadbeef, \ + { 0, -1, 0 }, \ + sizeof(type), \ + 0xdeadbeef \ +}; \ +\ +static cxx_type_info_table type ## _type_info_table = { \ + base_no+1, \ + { \ + 0xdeadbeef, \ + 0xdeadbeef, \ + 0xdeadbeef \ + } \ +}; \ +\ +static cxx_exception_type type ##_exception_type = { \ + 0, \ + 0xdeadbeef, \ + 0, \ + 0xdeadbeef \ +}; \ +\ +static void init_ ## type ## _cxx(char *base) \ +{ \ + type ## _cxx_type_info.type_info = (char *)&type ## _type_info - base; \ + type ## _cxx_type_info.copy_ctor = (char *)MSVCRT_ ## type ## _copy_ctor - base; \ + type ## _type_info_table.info[0] = (char *)&type ## _cxx_type_info - base; \ + type ## _type_info_table.info[1] = (char *)cl1 - base; \ + type ## _type_info_table.info[2] = (char *)cl2 - base; \ + type ## _exception_type.destructor = (char *)MSVCRT_ ## type ## _dtor - base; \ + type ## _exception_type.type_info_table = (char *)&type ## _type_info_table - base; \ +} +#endif + #endif /* __MSVCRT_CPPEXCEPT_H */

1 0

Piotr Caban : msvcp: Sync implementations.
by Alexandre Julliard 11 Oct '12

11 Oct '12

Module: wine Branch: master Commit: 9f5532bf23dbec2c985140c56441aba70944a6a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f5532bf23dbec2c985140c56… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 11 12:36:16 2012 +0200 msvcp: Sync implementations. --- dlls/msvcp100/cxx.h | 119 +++++++++++++++++++++++ dlls/msvcp100/exception.c | 237 +++----------------------------------------- dlls/msvcp100/ios.c | 9 +- dlls/msvcp100/locale.c | 5 +- dlls/msvcp60/cxx.h | 119 +++++++++++++++++++++++ dlls/msvcp60/exception.c | 237 +++----------------------------------------- dlls/msvcp60/ios.c | 9 +- dlls/msvcp60/locale.c | 5 +- dlls/msvcp71/cxx.h | 119 +++++++++++++++++++++++ dlls/msvcp71/exception.c | 237 +++----------------------------------------- dlls/msvcp71/ios.c | 31 +++--- dlls/msvcp71/locale.c | 5 +- dlls/msvcp71/msvcp71.spec | 8 +- dlls/msvcp71/string.c | 27 ----- 14 files changed, 448 insertions(+), 719 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9f5532bf23dbec2c98514…

1 0

Aric Stewart : msctf: Uninitialize context prior to releasing it.
by Alexandre Julliard 11 Oct '12

11 Oct '12

Module: wine Branch: master Commit: ed4c7fa95fa5ee0b2fef95b73bc9ffd1751b2602 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed4c7fa95fa5ee0b2fef95b73… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Oct 11 09:49:13 2012 -0500 msctf: Uninitialize context prior to releasing it. --- dlls/msctf/documentmgr.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msctf/documentmgr.c b/dlls/msctf/documentmgr.c index 884b098..c9aebb2 100644 --- a/dlls/msctf/documentmgr.c +++ b/dlls/msctf/documentmgr.c @@ -186,14 +186,14 @@ static HRESULT WINAPI DocumentMgr_Pop(ITfDocumentMgr *iface, DWORD dwFlags) if (This->contextStack[0]) { ITfThreadMgrEventSink_OnPopContext(This->ThreadMgrSink,This->contextStack[0]); - ITfContext_Release(This->contextStack[0]); Context_Uninitialize(This->contextStack[0]); + ITfContext_Release(This->contextStack[0]); } if (This->contextStack[1]) { ITfThreadMgrEventSink_OnPopContext(This->ThreadMgrSink,This->contextStack[1]); - ITfContext_Release(This->contextStack[1]); Context_Uninitialize(This->contextStack[1]); + ITfContext_Release(This->contextStack[1]); } This->contextStack[0] = This->contextStack[1] = NULL; ITfThreadMgrEventSink_OnUninitDocumentMgr(This->ThreadMgrSink, iface); @@ -207,8 +207,8 @@ static HRESULT WINAPI DocumentMgr_Pop(ITfDocumentMgr *iface, DWORD dwFlags) return E_FAIL; ITfThreadMgrEventSink_OnPopContext(This->ThreadMgrSink,This->contextStack[0]); - ITfContext_Release(This->contextStack[0]); Context_Uninitialize(This->contextStack[0]); + ITfContext_Release(This->contextStack[0]); This->contextStack[0] = This->contextStack[1]; This->contextStack[1] = NULL;

1 0

Lucas Zawacki : dinput: Implement DIPROP_INSTANCENAME for joystick.
by Alexandre Julliard 11 Oct '12

11 Oct '12

Module: wine Branch: master Commit: 478f0b6691d221ecb4fd0f4ff63068e23d116f83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=478f0b6691d221ecb4fd0f4ff… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Thu Oct 11 10:45:27 2012 -0300 dinput: Implement DIPROP_INSTANCENAME for joystick. --- dlls/dinput/joystick.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index 8c0b5e5..d32acec 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -328,6 +328,17 @@ HRESULT WINAPI JoystickWGenericImpl_GetProperty(LPDIRECTINPUTDEVICE8W iface, REF } break; } + case (DWORD_PTR) DIPROP_INSTANCENAME: { + DIPROPSTRING *ps = (DIPROPSTRING*) pdiph; + DIDEVICEINSTANCEW didev; + + didev.dwSize = sizeof(didev); + + IDirectInputDevice_GetDeviceInfo(iface, &didev); + lstrcpynW(ps->wsz, didev.tszInstanceName, MAX_PATH); + + return DI_OK; + } default: return IDirectInputDevice2WImpl_GetProperty(iface, rguid, pdiph); }

1 0

Lucas Zawacki : dinput/tests: Test for DIPROP_INSTANCENAME and DIPROP_GUIDANDPATH.
by Alexandre Julliard 11 Oct '12

11 Oct '12

Module: wine Branch: master Commit: 913cbb9f218095c344aab5aab801751b96ffe67c URL: http://source.winehq.org/git/wine.git/?a=commit;h=913cbb9f218095c344aab5aab… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Thu Oct 11 10:45:26 2012 -0300 dinput/tests: Test for DIPROP_INSTANCENAME and DIPROP_GUIDANDPATH. --- dlls/dinput/tests/joystick.c | 26 ++++++++++++++++++++++++++ include/dinput.h | 2 ++ 2 files changed, 28 insertions(+), 0 deletions(-) diff --git a/dlls/dinput/tests/joystick.c b/dlls/dinput/tests/joystick.c index a49ee2e..2fe12ba 100644 --- a/dlls/dinput/tests/joystick.c +++ b/dlls/dinput/tests/joystick.c @@ -181,6 +181,9 @@ static BOOL CALLBACK EnumJoysticks( DIDEVICEINSTANCE inst; DIDEVICEINSTANCE_DX3 inst3; DIPROPDWORD dipw; + DIPROPSTRING dps; + DIPROPGUIDANDPATH dpg; + WCHAR nameBuffer[MAX_PATH]; HWND hWnd = get_hwnd(); char oldstate[248], curstate[248]; @@ -216,6 +219,29 @@ static BOOL CALLBACK EnumJoysticks( hr = IDirectInputDevice_GetProperty(pJoystick, DIPROP_JOYSTICKID, &dipw.diph); ok(SUCCEEDED(hr), "IDirectInputDevice_GetProperty() for DIPROP_JOYSTICKID failed\n"); + /* Test for INSTANCENAME property */ + memset(&dps, 0, sizeof(dps)); + dps.diph.dwSize = sizeof(DIPROPSTRING); + dps.diph.dwHeaderSize = sizeof(DIPROPHEADER); + dps.diph.dwHow = DIPH_DEVICE; + + hr = IDirectInputDevice_GetProperty(pJoystick, DIPROP_INSTANCENAME, &dps.diph); + ok(SUCCEEDED(hr), "IDirectInput_GetProperty() for DIPROP_INSTANCENAME failed: %08x\n", hr); + + /* Test if instance name is the same as present in DIDEVICEINSTANCE */ + MultiByteToWideChar(CP_ACP, 0, lpddi->tszInstanceName, -1, nameBuffer, MAX_PATH); + ok(!lstrcmpW(nameBuffer, dps.wsz), "DIPROP_INSTANCENAME returned is wrong. Expected: %s Got: %s\n", + wine_dbgstr_w(nameBuffer), wine_dbgstr_w(dps.wsz)); + + /* Test for GUIDPATH properties */ + memset(&dpg, 0, sizeof(dpg)); + dpg.diph.dwSize = sizeof(DIPROPGUIDANDPATH); + dpg.diph.dwHeaderSize = sizeof(DIPROPHEADER); + dpg.diph.dwHow = DIPH_DEVICE; + + hr = IDirectInputDevice_GetProperty(pJoystick, DIPROP_GUIDANDPATH, &dpg.diph); + todo_wine ok(SUCCEEDED(hr), "IDirectInput_GetProperty() for DIPROP_GUIDANDPATH failed: %08x\n", hr); + hr = IDirectInputDevice_SetDataFormat(pJoystick, NULL); ok(hr==E_POINTER,"IDirectInputDevice_SetDataFormat() should have returned " "E_POINTER, returned: %08x\n", hr); diff --git a/include/dinput.h b/include/dinput.h index 3125800..8c779c2 100644 --- a/include/dinput.h +++ b/include/dinput.h @@ -905,6 +905,8 @@ typedef const DIPROPSTRING *LPCDIPROPSTRING; #define DIPROP_CALIBRATION MAKEDIPROP(11) #define DIPROP_GUIDANDPATH MAKEDIPROP(12) + +#define DIPROP_INSTANCENAME MAKEDIPROP(13) #define DIPROP_JOYSTICKID MAKEDIPROP(15) #define DIPROP_KEYNAME MAKEDIPROP(20) #define DIPROP_VIDPID MAKEDIPROP(24)

1 0

Aric Stewart : imm32: Unregister IME class on process detach.
by Alexandre Julliard 11 Oct '12

11 Oct '12

Module: wine Branch: master Commit: 59c144f197f75acaa9c1247026ec2ca8cfa373e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59c144f197f75acaa9c124702… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Oct 11 07:46:45 2012 -0500 imm32: Unregister IME class on process detach. --- dlls/imm32/imm.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 206938d..edd9e71 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -110,6 +110,8 @@ static const WCHAR szImeFileW[] = {'I','m','e',' ','F','i','l','e',0}; static const WCHAR szLayoutTextW[] = {'L','a','y','o','u','t',' ','T','e','x','t',0}; static const WCHAR szImeRegFmt[] = {'S','y','s','t','e','m','\\','C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\','C','o','n','t','r','o','l','\\','K','e','y','b','o','a','r','d',' ','L','a','y','o','u','t','s','\\','%','0','8','l','x',0}; +static const WCHAR szwIME[] = {'I','M','E',0}; + static LRESULT WINAPI DefIME_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam); @@ -378,7 +380,6 @@ static void IMM_RegisterMessages(void) static void IMM_RegisterIMEClass(void) { - static const WCHAR szwIME[] = {'I','M','E',0}; WNDCLASSW wndClass; ZeroMemory(&wndClass, sizeof(WNDCLASSW)); @@ -413,6 +414,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpReserved) IMM_FreeThreadData(); IMM_FreeAllImmHkl(); TlsFree(tlsIndex); + UnregisterClassW(szwIME, NULL); break; } return TRUE; @@ -1507,7 +1509,6 @@ BOOL WINAPI ImmGetConversionStatus( */ HWND WINAPI ImmGetDefaultIMEWnd(HWND hWnd) { - static const WCHAR szwIME[] = {'I','M','E',0}; if (IMM_GetThreadData()->hwndDefault == NULL) IMM_GetThreadData()->hwndDefault = CreateWindowExW( WS_EX_TOOLWINDOW, szwIME, NULL, WS_POPUP, 0, 0, 1, 1, 0, 0, 0, 0);

1 0

Aric Stewart : imm32: Remove unused parameter to IMM_RegisterIMEClass.
by Alexandre Julliard 11 Oct '12

11 Oct '12

Module: wine Branch: master Commit: db07083e4c07341104d00fec12eb68371a5d17ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=db07083e4c07341104d00fec1… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Oct 11 07:46:28 2012 -0500 imm32: Remove unused parameter to IMM_RegisterIMEClass. --- dlls/imm32/imm.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 6f262f5..206938d 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -376,7 +376,7 @@ static void IMM_RegisterMessages(void) WM_MSIME_DOCUMENTFEED = RegisterWindowMessageA("MSIMEDocumentFeed"); } -static void IMM_RegisterIMEClass(HINSTANCE hInstDLL) +static void IMM_RegisterIMEClass(void) { static const WCHAR szwIME[] = {'I','M','E',0}; WNDCLASSW wndClass; @@ -402,7 +402,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpReserved) tlsIndex = TlsAlloc(); if (tlsIndex == TLS_OUT_OF_INDEXES) return FALSE; - IMM_RegisterIMEClass(hInstDLL); + IMM_RegisterIMEClass(); break; case DLL_THREAD_ATTACH: break;

1 0

Jacek Caban : mshtml: Added createStyleSheet and get_styleSheet tests.
by Alexandre Julliard 11 Oct '12

11 Oct '12

Module: wine Branch: master Commit: c9e5181ff3f17086e911c14a7950173f6b106375 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9e5181ff3f17086e911c14a7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 11 14:08:42 2012 +0200 mshtml: Added createStyleSheet and get_styleSheet tests. --- dlls/mshtml/tests/dom.c | 92 ++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 87 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 7f1682e..371da77 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1980,8 +1980,21 @@ static void _test_elem_all(unsigned line, IUnknown *unk, const elem_type_t *elem IDispatch_Release(disp); } -#define test_elem_getelembytag(u,t,l) _test_elem_getelembytag(__LINE__,u,t,l) -static void _test_elem_getelembytag(unsigned line, IUnknown *unk, elem_type_t type, LONG exlen) +#define test_doc_all(a,b,c) _test_doc_all(__LINE__,a,b,c) +static void _test_doc_all(unsigned line, IHTMLDocument2 *doc, const elem_type_t *elem_types, LONG exlen) +{ + IHTMLElementCollection *col; + HRESULT hres; + + hres = IHTMLDocument2_get_all(doc, &col); + ok_(__FILE__,line)(hres == S_OK, "get_all failed: %08x\n", hres); + + _test_elem_collection(line, (IUnknown*)col, elem_types, exlen); + IHTMLElementCollection_Release(col); +} + +#define test_elem_getelembytag(a,b,c,d) _test_elem_getelembytag(__LINE__,a,b,c,d) +static void _test_elem_getelembytag(unsigned line, IUnknown *unk, elem_type_t type, LONG exlen, IHTMLElement **ret) { IHTMLElement2 *elem = _get_elem2_iface(line, unk); IHTMLElementCollection *col = NULL; @@ -2006,6 +2019,22 @@ static void _test_elem_getelembytag(unsigned line, IUnknown *unk, elem_type_t ty _test_elem_collection(line, (IUnknown*)col, types, exlen); HeapFree(GetProcessHeap(), 0, types); + + if(ret) { + IDispatch *disp; + VARIANT v; + + V_VT(&v) = VT_I4; + V_I4(&v) = 0; + disp = NULL; + hres = IHTMLElementCollection_item(col, v, v, &disp); + ok(hres == S_OK, "item failed: %08x\n", hres); + ok(disp != NULL, "disp == NULL\n"); + *ret = _get_elem_iface(line, (IUnknown*)disp); + IDispatch_Release(disp); + } + + IHTMLElementCollection_Release(col); } #define test_elem_innertext(e,t) _test_elem_innertext(__LINE__,e,t) @@ -5365,9 +5394,9 @@ static void test_elems(IHTMLDocument2 *doc) ok(elem2 == NULL, "elem2 != NULL\n"); IHTMLElement_Release(elem3); - test_elem_getelembytag((IUnknown*)elem, ET_OPTION, 2); - test_elem_getelembytag((IUnknown*)elem, ET_SELECT, 0); - test_elem_getelembytag((IUnknown*)elem, ET_HTML, 0); + test_elem_getelembytag((IUnknown*)elem, ET_OPTION, 2, NULL); + test_elem_getelembytag((IUnknown*)elem, ET_SELECT, 0, NULL); + test_elem_getelembytag((IUnknown*)elem, ET_HTML, 0, NULL); test_elem_innertext(elem, "opt1opt2"); @@ -6097,6 +6126,58 @@ static void test_null_write(IHTMLDocument2 *doc) "Expected IHTMLDocument2::writeln to return S_OK, got 0x%08x\n", hres); } +static void test_create_stylesheet(IHTMLDocument2 *doc) +{ + IHTMLStyleSheet *stylesheet, *stylesheet2; + IHTMLStyleElement *style_elem; + IHTMLElement *doc_elem, *elem; + HRESULT hres; + + static const elem_type_t all_types[] = { + ET_HTML, + ET_HEAD, + ET_TITLE, + ET_BODY, + ET_DIV + }; + + static const elem_type_t all_types2[] = { + ET_HTML, + ET_HEAD, + ET_TITLE, + ET_STYLE, + ET_BODY, + ET_DIV + }; + + test_doc_all(doc, all_types, sizeof(all_types)/sizeof(*all_types)); + + hres = IHTMLDocument2_createStyleSheet(doc, NULL, -1, &stylesheet); + ok(hres == S_OK, "createStyleSheet failed: %08x\n", hres); + + test_doc_all(doc, all_types2, sizeof(all_types2)/sizeof(*all_types2)); + + doc_elem = get_doc_elem(doc); + + test_elem_getelembytag((IUnknown*)doc_elem, ET_STYLE, 1, &elem); + IHTMLElement_Release(doc_elem); + + hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLStyleElement, (void**)&style_elem); + IHTMLElement_Release(elem); + ok(hres == S_OK, "Could not get IHTMLStyleElement iface: %08x\n", hres); + + stylesheet2 = NULL; + hres = IHTMLStyleElement_get_styleSheet(style_elem, &stylesheet2); + ok(hres == S_OK, "get_styleSheet failed: %08x\n", hres); + ok(stylesheet2 != NULL, "stylesheet2 == NULL\n"); + ok(iface_cmp((IUnknown*)stylesheet, (IUnknown*)stylesheet2), "stylesheet != stylesheet2\n"); + + IHTMLStyleSheet_Release(stylesheet2); + IHTMLStyleSheet_Release(stylesheet); + + IHTMLStyleElement_Release(style_elem); +} + static void test_exec(IUnknown *unk, const GUID *grpid, DWORD cmdid, VARIANT *in, VARIANT *out) { IOleCommandTarget *cmdtrg; @@ -6571,6 +6652,7 @@ START_TEST(dom) run_domtest(doc_blank, test_create_elems); run_domtest(doc_blank, test_defaults); run_domtest(doc_blank, test_null_write); + run_domtest(emptydiv_str, test_create_stylesheet); run_domtest(indent_test_str, test_indent); run_domtest(cond_comment_str, test_cond_comment); run_domtest(frameset_str, test_frameset);

1 0

Jacek Caban : mshtml: Added IHTMLIFrameElement3:: get_contentDocument implementation.
by Alexandre Julliard 11 Oct '12

11 Oct '12

Module: wine Branch: master Commit: 8d1dc99ea135b38d601509daf23a7e0637980d93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d1dc99ea135b38d601509daf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 11 14:09:01 2012 +0200 mshtml: Added IHTMLIFrameElement3::get_contentDocument implementation. --- dlls/mshtml/htmliframe.c | 15 +++++++++++++-- dlls/mshtml/tests/dom.c | 13 +++++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmliframe.c b/dlls/mshtml/htmliframe.c index 0fc3d5f..0e7b218 100644 --- a/dlls/mshtml/htmliframe.c +++ b/dlls/mshtml/htmliframe.c @@ -318,8 +318,19 @@ static HRESULT WINAPI HTMLIFrameElement3_Invoke(IHTMLIFrameElement3 *iface, DISP static HRESULT WINAPI HTMLIFrameElement3_get_contentDocument(IHTMLIFrameElement3 *iface, IDispatch **p) { HTMLIFrame *This = impl_from_IHTMLIFrameElement3(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + IHTMLDocument2 *doc; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, p); + + if(!This->framebase.content_window) { + *p = NULL; + return S_OK; + } + + hres = IHTMLWindow2_get_document(&This->framebase.content_window->base.IHTMLWindow2_iface, &doc); + *p = (IDispatch*)doc; + return hres; } static HRESULT WINAPI HTMLIFrameElement3_put_src(IHTMLIFrameElement3 *iface, BSTR v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 371da77..d55c3d7 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5082,6 +5082,7 @@ static void test_frame_doc(IUnknown *frame_elem, BOOL iframe) static void test_iframe_elem(IHTMLElement *elem) { IHTMLDocument2 *content_doc, *owner_doc; + IHTMLIFrameElement3 *iframe3; IHTMLElementCollection *col; IHTMLWindow2 *content_window; IHTMLElement *body; @@ -5108,6 +5109,18 @@ static void test_iframe_elem(IHTMLElement *elem) content_doc = get_window_doc(content_window); IHTMLWindow2_Release(content_window); + hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLIFrameElement3, (void**)&iframe3); + if(SUCCEEDED(hres)) { + hres = IHTMLIFrameElement3_get_contentDocument(iframe3, &disp); + ok(hres == S_OK, "get_contentDocument failed: %08x\n", hres); + ok(iface_cmp((IUnknown*)content_doc, (IUnknown*)disp), "content_doc != disp\n"); + IDispatch_Release(disp); + + IHTMLIFrameElement3_Release(iframe3); + }else { + win_skip("IHTMLIFrameElement3 not supported\n"); + } + str = a2bstr("text/html"); V_VT(&errv) = VT_ERROR; disp = NULL;

1 0

Jacek Caban : mshtml: Create script element in IHTMLDocument:: createStyleSheet.
by Alexandre Julliard 11 Oct '12

11 Oct '12

Module: wine Branch: master Commit: 163970c336e888874b2ef7e27863c6546cca1704 URL: http://source.winehq.org/git/wine.git/?a=commit;h=163970c336e888874b2ef7e27… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 11 14:08:03 2012 +0200 mshtml: Create script element in IHTMLDocument::createStyleSheet. --- dlls/mshtml/htmldoc.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 47 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 986397c..0a41522 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1442,11 +1442,55 @@ static HRESULT WINAPI HTMLDocument_createStyleSheet(IHTMLDocument2 *iface, BSTR LONG lIndex, IHTMLStyleSheet **ppnewStyleSheet) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); + nsIDOMHTMLHeadElement *head_elem; + IHTMLStyleElement *style_elem; + HTMLElement *elem; + nsresult nsres; + HRESULT hres; - FIXME("(%p)->(%s %d %p) semi-stub\n", This, debugstr_w(bstrHref), lIndex, ppnewStyleSheet); + static const WCHAR styleW[] = {'s','t','y','l','e',0}; - *ppnewStyleSheet = HTMLStyleSheet_Create(NULL); - return S_OK; + TRACE("(%p)->(%s %d %p)\n", This, debugstr_w(bstrHref), lIndex, ppnewStyleSheet); + + if(!This->doc_node->nsdoc) { + FIXME("not a real doc object\n"); + return E_NOTIMPL; + } + + if(lIndex != -1) + FIXME("Unsupported lIndex %d\n", lIndex); + + if(bstrHref) { + FIXME("semi-stub for href %s\n", debugstr_w(bstrHref)); + *ppnewStyleSheet = HTMLStyleSheet_Create(NULL); + return S_OK; + } + + hres = create_element(This->doc_node, styleW, &elem); + if(FAILED(hres)) + return hres; + + nsres = nsIDOMHTMLDocument_GetHead(This->doc_node->nsdoc, &head_elem); + if(NS_SUCCEEDED(nsres)) { + nsIDOMNode *tmp_node; + + nsres = nsIDOMHTMLHeadElement_AppendChild(head_elem, (nsIDOMNode*)elem->nselem, &tmp_node); + nsIDOMHTMLHeadElement_Release(head_elem); + if(NS_SUCCEEDED(nsres) && tmp_node) + nsIDOMNode_Release(tmp_node); + } + if(NS_FAILED(nsres)) { + IHTMLElement_Release(&elem->IHTMLElement_iface); + return E_FAIL; + } + + hres = IHTMLElement_QueryInterface(&elem->IHTMLElement_iface, &IID_IHTMLStyleElement, (void**)&style_elem); + assert(hres == S_OK); + IHTMLElement_Release(&elem->IHTMLElement_iface); + + hres = IHTMLStyleElement_get_styleSheet(style_elem, ppnewStyleSheet); + IHTMLStyleElement_Release(style_elem); + return hres; } static const IHTMLDocument2Vtbl HTMLDocumentVtbl = {

1 0

← Newer
1
...
59
60
61
62
63
64
65
...
96
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2012