October 2009 - Wine-commits

Henri Verbeet : d3d9: Free "elements" in a vertexdeclaration_init() error path (Valgrind).
by Alexandre Julliard 22 Oct '09

22 Oct '09

Module: wine Branch: master Commit: 66961840a5447af4e584acaa5b26a02bcf58f928 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66961840a5447af4e584acaa5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 22 10:09:57 2009 +0200 d3d9: Free "elements" in a vertexdeclaration_init() error path (Valgrind). --- dlls/d3d9/vertexdeclaration.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/vertexdeclaration.c b/dlls/d3d9/vertexdeclaration.c index 9cb0528..cd0829f 100644 --- a/dlls/d3d9/vertexdeclaration.c +++ b/dlls/d3d9/vertexdeclaration.c @@ -405,6 +405,7 @@ HRESULT vertexdeclaration_init(IDirect3DVertexDeclaration9Impl *declaration, HeapFree(GetProcessHeap(), 0, wined3d_elements); if (FAILED(hr)) { + HeapFree(GetProcessHeap(), 0, declaration->elements); WARN("Failed to create wined3d vertex declaration, hr %#x.\n", hr); return hr; }

1 0

Juan Lang : rsaenh: Add more tests of the RC2 key length.
by Alexandre Julliard 22 Oct '09

22 Oct '09

Module: wine Branch: master Commit: a1502846af3d93564d460aab4ec9afe048359b6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1502846af3d93564d460aab4… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 21 13:33:18 2009 -0700 rsaenh: Add more tests of the RC2 key length. --- dlls/advapi32/tests/crypt.c | 84 +++++++++++++++++++++++++++++++++++++++--- 1 files changed, 78 insertions(+), 6 deletions(-) diff --git a/dlls/advapi32/tests/crypt.c b/dlls/advapi32/tests/crypt.c index e4b5934..022d3e6 100644 --- a/dlls/advapi32/tests/crypt.c +++ b/dlls/advapi32/tests/crypt.c @@ -939,13 +939,13 @@ static const unsigned char key[key_length] = { 0xbf, 0xf6, 0x83, 0x4b, 0x3e, 0xa3, 0x23, 0xdd, 0x96, 0x78, 0x70, 0x8e, 0xa1, 0x9d, 0x3b, 0x40 }; -static void hashtest(void) +static void test_rc2_keylen(void) { struct KeyBlob { BLOBHEADER header; DWORD key_size; - BYTE key_data[key_length]; + BYTE key_data[2048]; } key_blob; HCRYPTPROV provider; @@ -961,20 +961,92 @@ static void hashtest(void) key_blob.header.bVersion = CUR_BLOB_VERSION; key_blob.header.reserved = 0; key_blob.header.aiKeyAlg = CALG_RC2; - key_blob.key_size = key_length; + key_blob.key_size = sizeof(key); memcpy(key_blob.key_data, key, key_length); + /* Importing a 16-byte key works with the default provider. */ SetLastError(0xdeadbeef); ret = pCryptImportKey(provider, (BYTE*)&key_blob, - sizeof(BLOBHEADER)+sizeof(DWORD)+key_length, + sizeof(BLOBHEADER)+sizeof(DWORD)+key_blob.key_size, 0, CRYPT_IPSEC_HMAC_KEY, &hkey); /* CRYPT_IPSEC_HMAC_KEY is not supported on W2K and lower */ ok(ret || broken(!ret && GetLastError() == NTE_BAD_FLAGS), - "CryptImportKey error %u\n", GetLastError()); + "CryptImportKey error %08x\n", GetLastError()); pCryptDestroyKey(hkey); pCryptReleaseContext(provider, 0); + + SetLastError(0xdeadbeef); + ret = pCryptAcquireContextA(&provider, NULL, MS_DEF_PROV, + PROV_RSA_FULL, CRYPT_VERIFYCONTEXT); + ok(ret, "CryptAcquireContext error %08x\n", GetLastError()); + + /* Importing a 16-byte key doesn't work with the base provider.. */ + SetLastError(0xdeadbeef); + ret = pCryptImportKey(provider, (BYTE*)&key_blob, + sizeof(BLOBHEADER)+sizeof(DWORD)+key_blob.key_size, + 0, 0, &hkey); + todo_wine + ok(!ret && GetLastError() == NTE_BAD_DATA, + "expected NTE_BAD_DATA, got %08x\n", GetLastError()); + /* but importing an 8-bit (7-byte) key does.. */ + key_blob.key_size = 7; + SetLastError(0xdeadbeef); + ret = pCryptImportKey(provider, (BYTE*)&key_blob, + sizeof(BLOBHEADER)+sizeof(DWORD)+key_blob.key_size, + 0, 0, &hkey); + ok(ret, "CryptAcquireContext error %08x\n", GetLastError()); + pCryptDestroyKey(hkey); + /* as does importing a 16-byte key with the base provider when + * CRYPT_IPSEC_HMAC_KEY is specified. + */ + key_blob.key_size = sizeof(key); + SetLastError(0xdeadbeef); + ret = pCryptImportKey(provider, (BYTE*)&key_blob, + sizeof(BLOBHEADER)+sizeof(DWORD)+key_blob.key_size, + 0, CRYPT_IPSEC_HMAC_KEY, &hkey); + /* CRYPT_IPSEC_HMAC_KEY is not supported on W2K and lower */ + ok(ret || + broken(!ret && GetLastError() == NTE_BAD_FLAGS), + "CryptImportKey error %08x\n", GetLastError()); + pCryptDestroyKey(hkey); + + pCryptReleaseContext(provider, 0); + + key_blob.key_size = sizeof(key); + SetLastError(0xdeadbeef); + ret = pCryptAcquireContextA(&provider, NULL, NULL, + PROV_RSA_FULL, CRYPT_VERIFYCONTEXT); + ok(ret, "CryptAcquireContext error %08x\n", GetLastError()); + + /* Importing a 16-byte key also works with the default provider when + * CRYPT_IPSEC_HMAC_KEY is specified. + */ + SetLastError(0xdeadbeef); + ret = pCryptImportKey(provider, (BYTE*)&key_blob, + sizeof(BLOBHEADER)+sizeof(DWORD)+key_blob.key_size, + 0, CRYPT_IPSEC_HMAC_KEY, &hkey); + ok(ret || + broken(!ret && GetLastError() == NTE_BAD_FLAGS), + "CryptImportKey error %08x\n", GetLastError()); + pCryptDestroyKey(hkey); + + /* There is no apparent limit to the size of the input key when + * CRYPT_IPSEC_HMAC_KEY is specified. + */ + key_blob.key_size = sizeof(key_blob.key_data); + SetLastError(0xdeadbeef); + ret = pCryptImportKey(provider, (BYTE*)&key_blob, + sizeof(BLOBHEADER)+sizeof(DWORD)+key_blob.key_size, + 0, CRYPT_IPSEC_HMAC_KEY, &hkey); + todo_wine + ok(ret || + broken(!ret && GetLastError() == NTE_BAD_FLAGS), + "CryptImportKey error %08x\n", GetLastError()); + pCryptDestroyKey(hkey); + + pCryptReleaseContext(provider, 0); } START_TEST(crypt) @@ -982,7 +1054,7 @@ START_TEST(crypt) init_function_pointers(); if (pCryptAcquireContextA && pCryptReleaseContext) { - hashtest(); + test_rc2_keylen(); init_environment(); test_acquire_context(); test_incorrect_api_usage();

1 0

Juan Lang : rsaenh: Fail if CRYPT_IPSEC_HMAC_KEY is passed to CryptImportKey.
by Alexandre Julliard 22 Oct '09

22 Oct '09

Module: wine Branch: master Commit: a48aae26e60b76695d0661ac8fa9001712f5a743 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a48aae26e60b76695d0661ac8… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 21 13:42:37 2009 -0700 rsaenh: Fail if CRYPT_IPSEC_HMAC_KEY is passed to CryptImportKey. --- dlls/advapi32/tests/crypt.c | 5 ++++- dlls/rsaenh/rsaenh.c | 6 ++++++ 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/crypt.c b/dlls/advapi32/tests/crypt.c index 022d3e6..35ce974 100644 --- a/dlls/advapi32/tests/crypt.c +++ b/dlls/advapi32/tests/crypt.c @@ -949,7 +949,7 @@ static void test_rc2_keylen(void) } key_blob; HCRYPTPROV provider; - HCRYPTKEY hkey; + HCRYPTKEY hkey = 0; BOOL ret; SetLastError(0xdeadbeef); @@ -970,6 +970,7 @@ static void test_rc2_keylen(void) sizeof(BLOBHEADER)+sizeof(DWORD)+key_blob.key_size, 0, CRYPT_IPSEC_HMAC_KEY, &hkey); /* CRYPT_IPSEC_HMAC_KEY is not supported on W2K and lower */ + todo_wine ok(ret || broken(!ret && GetLastError() == NTE_BAD_FLAGS), "CryptImportKey error %08x\n", GetLastError()); @@ -1007,6 +1008,7 @@ static void test_rc2_keylen(void) sizeof(BLOBHEADER)+sizeof(DWORD)+key_blob.key_size, 0, CRYPT_IPSEC_HMAC_KEY, &hkey); /* CRYPT_IPSEC_HMAC_KEY is not supported on W2K and lower */ + todo_wine ok(ret || broken(!ret && GetLastError() == NTE_BAD_FLAGS), "CryptImportKey error %08x\n", GetLastError()); @@ -1027,6 +1029,7 @@ static void test_rc2_keylen(void) ret = pCryptImportKey(provider, (BYTE*)&key_blob, sizeof(BLOBHEADER)+sizeof(DWORD)+key_blob.key_size, 0, CRYPT_IPSEC_HMAC_KEY, &hkey); + todo_wine ok(ret || broken(!ret && GetLastError() == NTE_BAD_FLAGS), "CryptImportKey error %08x\n", GetLastError()); diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 1b23391..a6c852a 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -3011,6 +3011,12 @@ BOOL WINAPI RSAENH_CPImportKey(HCRYPTPROV hProv, CONST BYTE *pbData, DWORD dwDat TRACE("(hProv=%08lx, pbData=%p, dwDataLen=%d, hPubKey=%08lx, dwFlags=%08x, phKey=%p)\n", hProv, pbData, dwDataLen, hPubKey, dwFlags, phKey); + if (dwFlags & CRYPT_IPSEC_HMAC_KEY) + { + FIXME("unimplemented for CRYPT_IPSEC_HMAC_KEY\n"); + SetLastError(NTE_BAD_FLAGS); + return FALSE; + } return import_key(hProv, pbData, dwDataLen, hPubKey, dwFlags, TRUE, phKey); }

1 0

Juan Lang : rsaenh: Revert part of d3c482250a8232e9657ecefb3e61fff0194e3fbe .
by Alexandre Julliard 22 Oct '09

22 Oct '09

Module: wine Branch: master Commit: 9d9ae93a5848da95ff5932d6f75701194ea3b4c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d9ae93a5848da95ff5932d6f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 21 13:47:27 2009 -0700 rsaenh: Revert part of d3c482250a8232e9657ecefb3e61fff0194e3fbe. --- dlls/advapi32/tests/crypt.c | 1 - dlls/rsaenh/rsaenh.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/tests/crypt.c b/dlls/advapi32/tests/crypt.c index 35ce974..0b3f90f 100644 --- a/dlls/advapi32/tests/crypt.c +++ b/dlls/advapi32/tests/crypt.c @@ -988,7 +988,6 @@ static void test_rc2_keylen(void) ret = pCryptImportKey(provider, (BYTE*)&key_blob, sizeof(BLOBHEADER)+sizeof(DWORD)+key_blob.key_size, 0, 0, &hkey); - todo_wine ok(!ret && GetLastError() == NTE_BAD_DATA, "expected NTE_BAD_DATA, got %08x\n", GetLastError()); /* but importing an 8-bit (7-byte) key does.. */ diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index a6c852a..4f13c17 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -159,7 +159,7 @@ typedef struct tagKEYCONTAINER static const PROV_ENUMALGS_EX aProvEnumAlgsEx[5][RSAENH_MAX_ENUMALGS+1] = { { - {CALG_RC2, 40, 5, 128,0, 4,"RC2", 24,"RSA Data Security's RC2"}, + {CALG_RC2, 40, 40, 56,0, 4,"RC2", 24,"RSA Data Security's RC2"}, {CALG_RC4, 40, 40, 56,0, 4,"RC4", 24,"RSA Data Security's RC4"}, {CALG_DES, 56, 56, 56,0, 4,"DES", 31,"Data Encryption Standard (DES)"}, {CALG_SHA, 160,160, 160,CRYPT_FLAG_SIGNING, 6,"SHA-1", 30,"Secure Hash Algorithm (SHA-1)"}, @@ -826,7 +826,7 @@ static HCRYPTKEY new_key(HCRYPTPROV hProv, ALG_ID aiAlgid, DWORD dwFlags, CRYPTK { TRACE("key len %d out of bounds (%d, %d)\n", dwKeyLen, peaAlgidInfo->dwMinLen, peaAlgidInfo->dwMaxLen); - SetLastError(NTE_BAD_FLAGS); + SetLastError(NTE_BAD_DATA); return (HCRYPTKEY)INVALID_HANDLE_VALUE; } }

1 0

Alexandre Julliard : widl: Fix the prototype of generated exception filters .
by Alexandre Julliard 22 Oct '09

22 Oct '09

Module: wine Branch: master Commit: d527ca3382a1a968f184af3a83f6f1e482e4c442 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d527ca3382a1a968f184af3a8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 22 13:04:09 2009 +0200 widl: Fix the prototype of generated exception filters. --- tools/widl/typegen.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 59f93ed..b41dcbe 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -4063,7 +4063,7 @@ void write_exceptions( FILE *file ) fprintf( file, "#undef RpcAbnormalTermination\n"); fprintf( file, "\n"); fprintf( file, "struct __exception_frame;\n"); - fprintf( file, "typedef int (*__filter_func)(EXCEPTION_RECORD *, struct __exception_frame *);\n"); + fprintf( file, "typedef int (*__filter_func)(struct __exception_frame *);\n"); fprintf( file, "typedef void (*__finally_func)(struct __exception_frame *);\n"); fprintf( file, "\n"); fprintf( file, "#define __DECL_EXCEPTION_FRAME \\\n"); @@ -4110,7 +4110,7 @@ void write_exceptions( FILE *file ) fprintf( file, " return ExceptionContinueSearch;\n"); fprintf( file, " }\n" ); fprintf( file, " exc_frame->code = record->ExceptionCode;\n"); - fprintf( file, " if (exc_frame->filter_level && exc_frame->filter( record, exc_frame ) == EXCEPTION_EXECUTE_HANDLER)\n" ); + fprintf( file, " if (exc_frame->filter_level && exc_frame->filter( exc_frame ) == EXCEPTION_EXECUTE_HANDLER)\n" ); fprintf( file, " __wine_rtl_unwind( frame, record, __widl_unwind_target );\n"); fprintf( file, " return ExceptionContinueSearch;\n"); fprintf( file, "}\n");

1 0

Alexandre Julliard : ole32/tests: Set returned pointer to NULL in CreateInstance (Valgrind).
by Alexandre Julliard 22 Oct '09

22 Oct '09

Module: wine Branch: master Commit: f7bd47f78b71211abcc97e536d9c1b1a15df4736 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7bd47f78b71211abcc97e536… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 22 13:04:30 2009 +0200 ole32/tests: Set returned pointer to NULL in CreateInstance (Valgrind). --- dlls/ole32/tests/marshal.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index af2ae6e..4239b55 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -1799,6 +1799,7 @@ static HRESULT WINAPI TestRE_IClassFactory_CreateInstance( BOOL ret = SendMessageTimeout(hwnd_app, WM_NULL, 0, 0, SMTO_BLOCK, 5000, &res); ok(ret, "Timed out sending a message to originating window during RPC call\n"); } + *ppvObj = NULL; return S_FALSE; }

1 0

Eric Pouech : winmm: Create a real function for MMSYSTEM.timeGetTime.
by Alexandre Julliard 22 Oct '09

22 Oct '09

Module: wine Branch: master Commit: 3abaed0f22fb8a0beec7df511738a14255ba25b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3abaed0f22fb8a0beec7df511… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Wed Oct 21 21:00:56 2009 +0200 winmm: Create a real function for MMSYSTEM.timeGetTime. --- dlls/winmm/mmsystem.c | 8 ++++++++ dlls/winmm/mmsystem.spec | 2 +- dlls/winmm/time.c | 1 - 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/mmsystem.c b/dlls/winmm/mmsystem.c index d560773..d3214f7 100644 --- a/dlls/winmm/mmsystem.c +++ b/dlls/winmm/mmsystem.c @@ -2509,6 +2509,14 @@ MMRESULT16 WINAPI timeEndPeriod16(UINT16 wPeriod) return timeEndPeriod(wPeriod); } +/************************************************************************** + * timeGetTime [MMSYSTEM.607] + */ +DWORD WINAPI timeGetTime16(void) +{ + return timeGetTime(); +} + /* ################################################### * # JOYSTICK # * ################################################### diff --git a/dlls/winmm/mmsystem.spec b/dlls/winmm/mmsystem.spec index 516f027..66d1e9b 100644 --- a/dlls/winmm/mmsystem.spec +++ b/dlls/winmm/mmsystem.spec @@ -103,7 +103,7 @@ 604 pascal timeGetDevCaps(ptr word) timeGetDevCaps16 605 pascal timeBeginPeriod(word) timeBeginPeriod16 606 pascal timeEndPeriod(word) timeEndPeriod16 -607 pascal timeGetTime() timeGetTime +607 pascal timeGetTime() timeGetTime16 701 pascal mciSendCommand(word word long long) mciSendCommand16 702 pascal mciSendString(str ptr word word) mciSendString16 703 pascal mciGetDeviceID(ptr) mciGetDeviceID16 diff --git a/dlls/winmm/time.c b/dlls/winmm/time.c index fcf31f0..85577c2 100644 --- a/dlls/winmm/time.c +++ b/dlls/winmm/time.c @@ -438,7 +438,6 @@ MMRESULT WINAPI timeEndPeriod(UINT wPeriod) } /************************************************************************** - * timeGetTime [MMSYSTEM.607] * timeGetTime [WINMM.@] */ DWORD WINAPI timeGetTime(void)

1 0

Jacek Caban : mshtml: Moved nsdoc to HTMLDocumentNode object.
by Alexandre Julliard 22 Oct '09

22 Oct '09

Module: wine Branch: master Commit: f9eff688918f68ae4eb793032474e69dfa689f55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9eff688918f68ae4eb793032… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 21 21:27:42 2009 +0200 mshtml: Moved nsdoc to HTMLDocumentNode object. --- dlls/mshtml/editor.c | 6 ++-- dlls/mshtml/htmlbody.c | 4 +- dlls/mshtml/htmlcurstyle.c | 4 +- dlls/mshtml/htmldoc.c | 67 +++++++++++++++++++++-------------------- dlls/mshtml/htmldoc3.c | 18 +++++----- dlls/mshtml/htmldoc5.c | 8 ++-- dlls/mshtml/htmlelem.c | 14 ++++---- dlls/mshtml/htmlevent.c | 4 +- dlls/mshtml/htmloption.c | 4 +- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/mutation.c | 6 ++-- dlls/mshtml/nsembed.c | 9 ++--- dlls/mshtml/nsevents.c | 4 +- dlls/mshtml/persist.c | 6 ++-- dlls/mshtml/selection.c | 4 +- dlls/mshtml/txtrange.c | 8 ++-- 16 files changed, 84 insertions(+), 84 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f9eff688918f68ae4eb79…

1 0

Jacek Caban : mshtml: Moved nsIDocumentObserver implementation to HTMLDocumentNode object.
by Alexandre Julliard 22 Oct '09

22 Oct '09

Module: wine Branch: master Commit: 5894e3be7524a93e693ecb24ccb0fb0d9188c990 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5894e3be7524a93e693ecb24c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 21 21:28:09 2009 +0200 mshtml: Moved nsIDocumentObserver implementation to HTMLDocumentNode object. --- dlls/mshtml/htmldoc.c | 3 +- dlls/mshtml/mshtml_private.h | 37 +++++++-------- dlls/mshtml/mutation.c | 102 +++++++++++++++++++++-------------------- dlls/mshtml/nsembed.c | 7 +-- 4 files changed, 74 insertions(+), 75 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5894e3be7524a93e693ec…

1 0

Jacek Caban : mshtml: Moved Wine[Add|Remove] Observer calls to HTMLDocumentNode constructor/destructor.
by Alexandre Julliard 22 Oct '09

22 Oct '09

Module: wine Branch: master Commit: 250ec843a537bb8f620e3254fbdda70a46994f00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=250ec843a537bb8f620e3254f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 21 21:28:39 2009 +0200 mshtml: Moved Wine[Add|Remove]Observer calls to HTMLDocumentNode constructor/destructor. --- dlls/mshtml/htmldoc.c | 8 +++--- dlls/mshtml/mshtml_private.h | 3 +- dlls/mshtml/mutation.c | 57 ++++++++++++++++++++---------------------- dlls/mshtml/nsembed.c | 2 - 4 files changed, 32 insertions(+), 38 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index f6cb876..5e34ced 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1769,8 +1769,10 @@ static void HTMLDocumentNode_destructor(HTMLDOMNode *iface) detach_ranges(This); release_nodes(This); - if(This->nsdoc) + if(This->nsdoc) { + release_mutation(This); nsIDOMHTMLDocument_Release(This->nsdoc); + } destroy_htmldoc(&This->basedoc); } @@ -1811,7 +1813,6 @@ HRESULT create_doc_from_nsdoc(nsIDOMHTMLDocument *nsdoc, HTMLDocumentObj *doc_ob doc->basedoc.doc_node = doc; doc->basedoc.doc_obj = doc_obj; - init_mutation(doc); init_dispex(&doc->node.dispex, (IUnknown*)HTMLDOMNODE(&doc->node), &HTMLDocumentNode_dispex); init_doc(&doc->basedoc, (IUnknown*)HTMLDOMNODE(&doc->node), DISPATCHEX(&doc->node.dispex)); HTMLDocumentNode_SecMgr_Init(doc); @@ -1819,6 +1820,7 @@ HRESULT create_doc_from_nsdoc(nsIDOMHTMLDocument *nsdoc, HTMLDocumentObj *doc_ob nsIDOMHTMLDocument_AddRef(nsdoc); doc->nsdoc = nsdoc; + init_mutation(doc); doc->basedoc.window = window; @@ -1887,8 +1889,6 @@ static ULONG WINAPI CustomDoc_Release(ICustomDoc *iface) set_document_bscallback(&This->basedoc, NULL); set_current_mon(&This->basedoc, NULL); if(This->basedoc.doc_node) { - if(This->basedoc.doc_node->nsdoc) - remove_mutation_observer(This->basedoc.doc_node); This->basedoc.doc_node->basedoc.doc_obj = NULL; IHTMLDocument2_Release(HTMLDOC(&This->basedoc.doc_node->basedoc)); } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 92688e1..85421d1 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -601,8 +601,7 @@ NSContainer *NSContainer_Create(HTMLDocumentObj*,NSContainer*); void NSContainer_Release(NSContainer*); void init_mutation(HTMLDocumentNode*); -void set_mutation_observer(HTMLDocumentNode*); -void remove_mutation_observer(HTMLDocumentNode*); +void release_mutation(HTMLDocumentNode*); void HTMLDocument_LockContainer(HTMLDocumentObj*,BOOL); void show_context_menu(HTMLDocumentObj*,DWORD,POINT*,IDispatch*); diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index f2c510a..20ef121 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -40,36 +40,6 @@ enum { MUTATION_SCRIPT }; -void set_mutation_observer(HTMLDocumentNode *doc) -{ - nsIDOMNSDocument *nsdoc; - nsresult nsres; - - nsres = nsIDOMHTMLDocument_QueryInterface(doc->nsdoc, &IID_nsIDOMNSDocument, (void**)&nsdoc); - if(NS_FAILED(nsres)) { - ERR("Could not get nsIDOMNSDocument: %08x\n", nsres); - return; - } - - nsIDOMNSDocument_WineAddObserver(nsdoc, NSDOCOBS(doc)); - nsIDOMNSDocument_Release(nsdoc); -} - -void remove_mutation_observer(HTMLDocumentNode *doc) -{ - nsIDOMNSDocument *nsdoc; - nsresult nsres; - - nsres = nsIDOMHTMLDocument_QueryInterface(doc->nsdoc, &IID_nsIDOMNSDocument, (void**)&nsdoc); - if(NS_FAILED(nsres)) { - ERR("Could not get nsIDOMNSDocument: %08x\n", nsres); - return; - } - - nsIDOMNSDocument_WineRemoveObserver(nsdoc, NSDOCOBS(doc)); - nsIDOMNSDocument_Release(nsdoc); -} - #define IE_MAJOR_VERSION 7 #define IE_MINOR_VERSION 0 @@ -612,6 +582,33 @@ static const nsIDocumentObserverVtbl nsDocumentObserverVtbl = { void init_mutation(HTMLDocumentNode *doc) { + nsIDOMNSDocument *nsdoc; + nsresult nsres; + doc->lpIDocumentObserverVtbl = &nsDocumentObserverVtbl; doc->lpIRunnableVtbl = &nsRunnableVtbl; + + nsres = nsIDOMHTMLDocument_QueryInterface(doc->nsdoc, &IID_nsIDOMNSDocument, (void**)&nsdoc); + if(NS_FAILED(nsres)) { + ERR("Could not get nsIDOMNSDocument: %08x\n", nsres); + return; + } + + nsIDOMNSDocument_WineAddObserver(nsdoc, NSDOCOBS(doc)); + nsIDOMNSDocument_Release(nsdoc); +} + +void release_mutation(HTMLDocumentNode *doc) +{ + nsIDOMNSDocument *nsdoc; + nsresult nsres; + + nsres = nsIDOMHTMLDocument_QueryInterface(doc->nsdoc, &IID_nsIDOMNSDocument, (void**)&nsdoc); + if(NS_FAILED(nsres)) { + ERR("Could not get nsIDOMNSDocument: %08x\n", nsres); + return; + } + + nsIDOMNSDocument_WineRemoveObserver(nsdoc, NSDOCOBS(doc)); + nsIDOMNSDocument_Release(nsdoc); } diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 565b688..463c4ee 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -838,7 +838,6 @@ void update_nsdocument(HTMLDocumentObj *doc) if(doc->basedoc.doc_node && doc->basedoc.doc_node->nsdoc) { doc_node = doc->basedoc.doc_node; - remove_mutation_observer(doc_node); doc_node->basedoc.doc_obj = NULL; IHTMLDocument2_Release(HTMLDOC(&doc_node->basedoc)); doc->basedoc.doc_node = NULL; @@ -856,7 +855,6 @@ void update_nsdocument(HTMLDocumentObj *doc) return; } - set_mutation_observer(doc_node); doc->basedoc.doc_node = doc_node; window_set_docnode(doc->basedoc.window, doc_node); }

1 0