wine-commits April 2013

wine-commits@winehq.org

2 participants
579 discussions

Volkan Gezer : po: Updated Turkish translation.
by Alexandre Julliard 29 Apr '13

29 Apr '13

Module: wine Branch: master Commit: 1d17274c8b3d446c64629bb3e852c810c0862e29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d17274c8b3d446c64629bb3e… Author: Volkan Gezer <volkangezer(a)gmail.com> Date: Sun Apr 28 16:57:57 2013 +0200 po: Updated Turkish translation. --- po/tr.po | 1339 ++++++++++++++++++++++++++++++++++++-------------------------- 1 files changed, 771 insertions(+), 568 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1d17274c8b3d446c64629…

1 0

Jactry Zeng : msvcrt: Fixed typo of _strncoll and _strncoll_l.
by Alexandre Julliard 29 Apr '13

29 Apr '13

Module: wine Branch: master Commit: 7cd91b6452e300104e087601801fb1acee9f91c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cd91b6452e300104e0876018… Author: Jactry Zeng <jactry92(a)gmail.com> Date: Mon Apr 29 12:45:16 2013 +0800 msvcrt: Fixed typo of _strncoll and _strncoll_l. --- dlls/msvcrt/mbcs.c | 2 +- dlls/msvcrt/msvcrt.h | 2 +- dlls/msvcrt/msvcrt.spec | 4 ++-- dlls/msvcrt/string.c | 8 ++++---- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index fdc5422..3d50d6c 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -819,7 +819,7 @@ int CDECL _mbsnbcoll_l(const unsigned char *str1, const unsigned char *str2, MSV mbcinfo = locale->mbcinfo; if(!mbcinfo->ismbcodepage) - return MSVCRT_strncoll_l((const char*)str1, (const char*)str2, len, locale); + return MSVCRT__strncoll_l((const char*)str1, (const char*)str2, len, locale); return CompareStringA(mbcinfo->mblcid, 0, (const char*)str1, len, (const char*)str2, len)-CSTR_EQUAL; } diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index c688dea..b51ff81 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -987,7 +987,7 @@ void __cdecl MSVCRT__invalid_parameter(const MSVCRT_wchar_t *expr, const MSVCRT_ int __cdecl MSVCRT__toupper_l(int,MSVCRT__locale_t); int __cdecl MSVCRT__tolower_l(int,MSVCRT__locale_t); int __cdecl MSVCRT__strnicoll_l(const char*, const char*, MSVCRT_size_t, MSVCRT__locale_t); -int __cdecl MSVCRT_strncoll_l(const char*, const char*, MSVCRT_size_t, MSVCRT__locale_t); +int __cdecl MSVCRT__strncoll_l(const char*, const char*, MSVCRT_size_t, MSVCRT__locale_t); unsigned int __cdecl _get_output_format(void); /* Maybe one day we'll enable the invalid parameter handlers with the full set of information (msvcrXXd) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 725e191..0af2423 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -963,8 +963,8 @@ @ cdecl _strlwr_l(str ptr) @ cdecl _strlwr_s(ptr long) @ cdecl _strlwr_s_l(ptr long ptr) -@ cdecl _strncoll(str str long) MSVCRT_strncoll_l -@ cdecl _strncoll_l(str str long ptr) MSVCRT_strncoll +@ cdecl _strncoll(str str long) MSVCRT__strncoll +@ cdecl _strncoll_l(str str long ptr) MSVCRT__strncoll_l @ cdecl _strnicmp(str str long) MSVCRT__strnicmp @ cdecl _strnicmp_l(str str long ptr) MSVCRT__strnicmp_l @ cdecl _strnicoll(str str long) MSVCRT__strnicoll diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 6049dce..9ad4cef 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -527,7 +527,7 @@ int CDECL MSVCRT__stricoll( const char* str1, const char* str2 ) /********************************************************************* * _strncoll_l (MSVCRT.@) */ -int CDECL MSVCRT_strncoll_l( const char* str1, const char* str2, MSVCRT_size_t count, MSVCRT__locale_t locale ) +int CDECL MSVCRT__strncoll_l( const char* str1, const char* str2, MSVCRT_size_t count, MSVCRT__locale_t locale ) { MSVCRT_pthreadlocinfo locinfo; @@ -540,11 +540,11 @@ int CDECL MSVCRT_strncoll_l( const char* str1, const char* str2, MSVCRT_size_t c } /********************************************************************* - * strncoll (MSVCRT.@) + * _strncoll (MSVCRT.@) */ -int CDECL MSVCRT_strncoll( const char* str1, const char* str2, MSVCRT_size_t count ) +int CDECL MSVCRT__strncoll( const char* str1, const char* str2, MSVCRT_size_t count ) { - return MSVCRT_strncoll_l(str1, str2, count, NULL); + return MSVCRT__strncoll_l(str1, str2, count, NULL); } /*********************************************************************

1 0

Christian Costa : d3dxof: Get rid of is_template_available.
by Alexandre Julliard 29 Apr '13

29 Apr '13

Module: wine Branch: master Commit: 6668a641456253b908231d870733b0a3a32a8133 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6668a641456253b908231d870… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sun Apr 28 22:46:17 2013 +0200 d3dxof: Get rid of is_template_available. --- dlls/d3dxof/parsing.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index 086959f..546166a 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -884,11 +884,6 @@ static WORD check_TOKEN(parse_buffer * buf) return buf->current_token; } -static BOOL is_template_available(parse_buffer * buf) -{ - return check_TOKEN(buf) == TOKEN_TEMPLATE; -} - static inline BOOL is_primitive_type(WORD token) { BOOL ret; @@ -1133,7 +1128,7 @@ static BOOL parse_template(parse_buffer * buf) BOOL parse_templates(parse_buffer * buf) { - while (buf->rem_bytes && is_template_available(buf)) + while (buf->rem_bytes && (check_TOKEN(buf) == TOKEN_TEMPLATE)) { if (!parse_template(buf)) {

1 0

Christian Costa : d3dxof: Introduce TOKEN_NONE and TOKEN_ERROR to differentiate end of file from error .
by Alexandre Julliard 29 Apr '13

29 Apr '13

Module: wine Branch: master Commit: 1b8b6294455cadcb1b9979d559810ee936c806a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b8b6294455cadcb1b9979d55… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sun Apr 28 22:46:09 2013 +0200 d3dxof: Introduce TOKEN_NONE and TOKEN_ERROR to differentiate end of file from error. --- dlls/d3dxof/parsing.c | 36 +++++++++++++++++++----------------- 1 files changed, 19 insertions(+), 17 deletions(-) diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index 16621ff..086959f 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -45,6 +45,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dxof_parsing); #define XOFFILE_FORMAT_FLOAT_BITS_32 MAKEFOUR('0','0','3','2') #define XOFFILE_FORMAT_FLOAT_BITS_64 MAKEFOUR('0','0','6','4') +#define TOKEN_ERROR 0xffff +#define TOKEN_NONE 0 #define TOKEN_NAME 1 #define TOKEN_STRING 2 #define TOKEN_INTEGER 3 @@ -644,7 +646,7 @@ static WORD parse_TOKEN(parse_buffer * buf) { char c; if (!read_bytes(buf, &c, 1)) - return 0; + return TOKEN_NONE; /*TRACE("char = '%c'\n", is_space(c) ? ' ' : c);*/ if ((c == '#') || (c == '/')) { @@ -652,15 +654,15 @@ static WORD parse_TOKEN(parse_buffer * buf) if (c == '/') { if (!read_bytes(buf, &c, 1)) - return 0; + return TOKEN_ERROR; if (c != '/') - return 0; + return TOKEN_ERROR; } c = 0; while (c != 0x0A) { if (!read_bytes(buf, &c, 1)) - return 0; + return TOKEN_NONE; } continue; } @@ -710,7 +712,7 @@ static WORD parse_TOKEN(parse_buffer * buf) } FIXME("Unrecognize element\n"); - return 0; + return TOKEN_ERROR; } } } @@ -722,13 +724,13 @@ static WORD parse_TOKEN(parse_buffer * buf) if (!nb_elem) { if (!read_bytes(buf, &token, 2)) - return 0; + return TOKEN_NONE; /* Convert integer and float list into separate elements */ if (token == TOKEN_INTEGER_LIST) { if (!read_bytes(buf, &nb_elem, 4)) - return 0; + return TOKEN_ERROR; token = TOKEN_INTEGER; is_float = FALSE; TRACE("Integer list (TOKEN_INTEGER_LIST) of size %d\n", nb_elem); @@ -736,7 +738,7 @@ static WORD parse_TOKEN(parse_buffer * buf) else if (token == TOKEN_FLOAT_LIST) { if (!read_bytes(buf, &nb_elem, 4)) - return 0; + return TOKEN_ERROR; token = TOKEN_FLOAT; is_float = TRUE; TRACE("Float list (TOKEN_FLOAT_LIST) of size %d\n", nb_elem); @@ -751,7 +753,7 @@ static WORD parse_TOKEN(parse_buffer * buf) DWORD integer; if (!read_bytes(buf, &integer, 4)) - return 0; + return TOKEN_ERROR; *(DWORD*)buf->value = integer; } @@ -767,9 +769,9 @@ static WORD parse_TOKEN(parse_buffer * buf) char strname[100]; if (!read_bytes(buf, &count, 4)) - return 0; + return TOKEN_ERROR; if (!read_bytes(buf, strname, count)) - return 0; + return TOKEN_ERROR; strname[count] = 0; /*TRACE("name = %s\n", strname);*/ @@ -781,7 +783,7 @@ static WORD parse_TOKEN(parse_buffer * buf) DWORD integer; if (!read_bytes(buf, &integer, 4)) - return 0; + return TOKEN_ERROR; /*TRACE("integer = %ld\n", integer);*/ *(DWORD*)buf->value = integer; @@ -793,7 +795,7 @@ static WORD parse_TOKEN(parse_buffer * buf) GUID class_id; if (!read_bytes(buf, &class_id, 16)) - return 0; + return TOKEN_ERROR; sprintf(strguid, CLSIDFMT, class_id.Data1, class_id.Data2, class_id.Data3, class_id.Data4[0], class_id.Data4[1], class_id.Data4[2], class_id.Data4[3], class_id.Data4[4], class_id.Data4[5], class_id.Data4[6], class_id.Data4[7]); @@ -808,12 +810,12 @@ static WORD parse_TOKEN(parse_buffer * buf) WORD tmp_token; char strname[100]; if (!read_bytes(buf, &count, 4)) - return 0; + return TOKEN_ERROR; if (!read_bytes(buf, strname, count)) - return 0; + return TOKEN_ERROR; strname[count] = 0; if (!read_bytes(buf, &tmp_token, 2)) - return 0; + return TOKEN_ERROR; if ((tmp_token != TOKEN_COMMA) && (tmp_token != TOKEN_SEMICOLON)) ERR("No comma or semicolon (got %d)\n", tmp_token); /*TRACE("name = %s\n", strname);*/ @@ -849,7 +851,7 @@ static WORD parse_TOKEN(parse_buffer * buf) case TOKEN_ARRAY: break; default: - return 0; + return TOKEN_ERROR; } }

1 0

Christian Costa : d3dxof: Return correct error code in case of parsing failure.
by Alexandre Julliard 29 Apr '13

29 Apr '13

Module: wine Branch: master Commit: a4d3dbf6a1d9cf14c1094c4da886f931bfaeff22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4d3dbf6a1d9cf14c1094c4da… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sun Apr 28 22:46:01 2013 +0200 d3dxof: Return correct error code in case of parsing failure. --- dlls/d3dxof/d3dxof.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index c865fd8..5a08b21 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -241,8 +241,9 @@ static HRESULT WINAPI IDirectXFileImpl_CreateEnumObject(IDirectXFile* iface, LPV if (FAILED(hr)) goto error; - if (!parse_templates(&object->buf)) { - hr = DXFILEERR_BADVALUE; + if (!parse_templates(&object->buf)) + { + hr = DXFILEERR_PARSEERROR; goto error; } @@ -319,8 +320,9 @@ static HRESULT WINAPI IDirectXFileImpl_RegisterTemplates(IDirectXFile* iface, LP if (FAILED(hr)) goto cleanup; - if (!parse_templates(&buf)) { - hr = DXFILEERR_BADVALUE; + if (!parse_templates(&buf)) + { + hr = DXFILEERR_PARSEERROR; goto cleanup; } @@ -1002,7 +1004,7 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetNextDataObject(IDirectXFileE /* Check if there are templates defined before the object */ if (!parse_templates(&This->buf)) - return DXFILEERR_BADVALUE; + return DXFILEERR_PARSEERROR; if (!This->buf.rem_bytes) return DXFILEERR_NOMOREOBJECTS;

1 0

Christian Costa : d3dxof: Add some template tests.
by Alexandre Julliard 29 Apr '13

29 Apr '13

Module: wine Branch: master Commit: 692783a9340d5c3f75e42b127319b50a4ca751e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=692783a9340d5c3f75e42b127… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sun Apr 28 22:45:51 2013 +0200 d3dxof: Add some template tests. --- dlls/d3dxof/tests/d3dxof.c | 54 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 54 insertions(+), 0 deletions(-) diff --git a/dlls/d3dxof/tests/d3dxof.c b/dlls/d3dxof/tests/d3dxof.c index e25b4ab..43a7fde 100644 --- a/dlls/d3dxof/tests/d3dxof.c +++ b/dlls/d3dxof/tests/d3dxof.c @@ -140,6 +140,22 @@ static char object_syntax_string_with_separator[] = "\"foo;bar\";\n" "}\n"; +static char templates_bad_file_type1[] = +"xOf 0302txt 0064\n"; + +static char templates_bad_file_version[] = +"xof 0102txt 0064\n"; + +static char templates_bad_file_type2[] = +"xof 0302foo 0064\n"; + +static char templates_bad_file_float_size[] = +"xof 0302txt 0050\n"; + +static char templates_parse_error[] = +"xof 0302txt 0064" +"foobar;\n"; + static void init_function_pointers(void) { /* We have to use LoadLibrary as no d3dxof functions are referenced directly */ @@ -379,6 +395,43 @@ static void test_file_types(void) IDirectXFile_Release(dxfile); } +static void test_templates(void) +{ + HRESULT ret; + IDirectXFile *dxfile = NULL; + + if (!pDirectXFileCreate) + { + win_skip("DirectXFileCreate is not available\n"); + return; + } + + ret = pDirectXFileCreate(&dxfile); + ok(ret == DXFILE_OK, "DirectXFileCreate: %x\n", ret); + if (!dxfile) + { + skip("Couldn't create DirectXFile interface\n"); + return; + } + + ret = IDirectXFile_RegisterTemplates(dxfile, templates_bad_file_type1, sizeof(templates_bad_file_type1) - 1); + ok(ret == DXFILEERR_BADFILETYPE, "RegisterTemplates returned %#x, expected %#x\n", ret, DXFILEERR_BADFILETYPE); + + ret = IDirectXFile_RegisterTemplates(dxfile, templates_bad_file_version, sizeof(templates_bad_file_version) - 1); + ok(ret == DXFILEERR_BADFILEVERSION, "RegisterTemplates returned %#x, expected %#x\n", ret, DXFILEERR_BADFILEVERSION); + + ret = IDirectXFile_RegisterTemplates(dxfile, templates_bad_file_type2, sizeof(templates_bad_file_type2) - 1); + ok(ret == DXFILEERR_BADFILETYPE, "RegisterTemplates returned %#x, expected %#x\n", ret, DXFILEERR_BADFILETYPE); + + ret = IDirectXFile_RegisterTemplates(dxfile, templates_bad_file_float_size, sizeof(templates_bad_file_float_size) - 1); + ok(ret == DXFILEERR_BADFILEFLOATSIZE, "RegisterTemplates returned %#x, expected %#x\n", ret, DXFILEERR_BADFILEFLOATSIZE); + + ret = IDirectXFile_RegisterTemplates(dxfile, templates_parse_error, sizeof(templates_parse_error) - 1); + todo_wine ok(ret == DXFILEERR_PARSEERROR, "RegisterTemplates returned %#x, expected %#x\n", ret, DXFILEERR_PARSEERROR); + + IDirectXFile_Release(dxfile); +} + static void test_compressed_files(void) { HRESULT hr; @@ -788,6 +841,7 @@ START_TEST(d3dxof) test_refcount(); test_CreateEnumObject(); test_file_types(); + test_templates(); test_compressed_files(); test_getname(); test_syntax();

1 0

Piotr Caban : mshtml: Init nsAString in HTMLElement2_get_dir.
by Alexandre Julliard 29 Apr '13

29 Apr '13

Module: wine Branch: master Commit: 123fd68b53d43790044cebb551600fba9495ff01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=123fd68b53d43790044cebb55… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 29 18:42:13 2013 +0200 mshtml: Init nsAString in HTMLElement2_get_dir. --- dlls/mshtml/htmlelem2.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/htmlelem2.c b/dlls/mshtml/htmlelem2.c index 24aaba5..5762765 100644 --- a/dlls/mshtml/htmlelem2.c +++ b/dlls/mshtml/htmlelem2.c @@ -982,6 +982,7 @@ static HRESULT WINAPI HTMLElement2_get_dir(IHTMLElement2 *iface, BSTR *p) return S_OK; } + nsAString_Init(&dir_str, NULL); nsres = nsIDOMHTMLElement_GetDir(This->nselem, &dir_str); return return_nsstr(nsres, &dir_str, p); }

1 0

Piotr Caban : mshtml: Fixed timer setting in remove_target_tasks.
by Alexandre Julliard 29 Apr '13

29 Apr '13

Module: wine Branch: master Commit: 448a621c5e18c28aafb0fb441f2f8acad020f6d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=448a621c5e18c28aafb0fb441… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 29 14:41:05 2013 +0200 mshtml: Fixed timer setting in remove_target_tasks. --- dlls/mshtml/task.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/task.c b/dlls/mshtml/task.c index f9f12d5..6baac63 100644 --- a/dlls/mshtml/task.c +++ b/dlls/mshtml/task.c @@ -128,8 +128,10 @@ void remove_target_tasks(LONG target) } if(!list_empty(&thread_data->timer_list)) { + DWORD tc = GetTickCount(); + timer = LIST_ENTRY(list_head(&thread_data->timer_list), task_timer_t, entry); - SetTimer(thread_data->thread_hwnd, TIMER_ID, timer->time - GetTickCount(), NULL); + SetTimer(thread_data->thread_hwnd, TIMER_ID, max( (int)(timer->time - tc), 0 ), NULL); } while(thread_data->task_queue_head && thread_data->task_queue_head->target_magic == target) {

1 0

Piotr Caban : mshtml: Release nsISupports object in get_node function.
by Alexandre Julliard 29 Apr '13

29 Apr '13

Module: wine Branch: master Commit: 41603e00641de1699a595e5c1ba70baecfed0f26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41603e00641de1699a595e5c1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 29 11:52:18 2013 +0200 mshtml: Release nsISupports object in get_node function. --- dlls/mshtml/htmlnode.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 2169c33..00468d0 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -1212,6 +1212,7 @@ HRESULT get_node(HTMLDocumentNode *This, nsIDOMNode *nsnode, BOOL create, HTMLDO if(unk) { *ret = get_node_obj((IHTMLDOMNode*)unk); + nsISupports_Release(unk); return NS_OK; }

1 0

Jacek Caban : mshtml: Pass proper JSContext to nsIDOMHTMLDocument:: Write and Open.
by Alexandre Julliard 29 Apr '13

29 Apr '13

Module: wine Branch: master Commit: 9fd64018984b6ae155dc84297dacd31e8b8f884e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fd64018984b6ae155dc84297… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 29 10:47:19 2013 +0200 mshtml: Pass proper JSContext to nsIDOMHTMLDocument::Write and Open. --- dlls/mshtml/htmldoc.c | 9 ++++++--- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/mutation.c | 17 +++++++++++++++++ 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index c6a7193..8b5a160 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -833,6 +833,7 @@ static HRESULT WINAPI HTMLDocument_get_nameProp(IHTMLDocument2 *iface, BSTR *p) static HRESULT document_write(HTMLDocument *This, SAFEARRAY *psarray, BOOL ln) { VARIANT *var, tmp; + JSContext *jsctx; nsAString nsstr; ULONG i, argc; nsresult nsres; @@ -859,6 +860,7 @@ static HRESULT document_write(HTMLDocument *This, SAFEARRAY *psarray, BOOL ln) V_VT(&tmp) = VT_EMPTY; + jsctx = get_context_from_document(This->doc_node->nsdoc); argc = psarray->rgsabound[0].cElements; for(i=0; i < argc; i++) { if(V_VT(var+i) == VT_BSTR) { @@ -873,9 +875,9 @@ static HRESULT document_write(HTMLDocument *This, SAFEARRAY *psarray, BOOL ln) } if(!ln || i != argc-1) - nsres = nsIDOMHTMLDocument_Write(This->doc_node->nsdoc, &nsstr, NULL /* FIXME! */); + nsres = nsIDOMHTMLDocument_Write(This->doc_node->nsdoc, &nsstr, jsctx); else - nsres = nsIDOMHTMLDocument_Writeln(This->doc_node->nsdoc, &nsstr, NULL /* FIXME! */); + nsres = nsIDOMHTMLDocument_Writeln(This->doc_node->nsdoc, &nsstr, jsctx); nsAString_Finish(&nsstr); if(V_VT(var+i) != VT_BSTR) VariantClear(&tmp); @@ -930,7 +932,8 @@ static HRESULT WINAPI HTMLDocument_open(IHTMLDocument2 *iface, BSTR url, VARIANT || V_VT(&features) != VT_ERROR || V_VT(&replace) != VT_ERROR) FIXME("unsupported args\n"); - nsres = nsIDOMHTMLDocument_Open(This->doc_node->nsdoc, NULL, NULL, NULL, NULL, 0, &tmp); + nsres = nsIDOMHTMLDocument_Open(This->doc_node->nsdoc, NULL, NULL, NULL, + get_context_from_document(This->doc_node->nsdoc), 0, &tmp); if(NS_FAILED(nsres)) { ERR("Open failed: %08x\n", nsres); return E_FAIL; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 421bf8a..0bbdb9d 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -781,6 +781,7 @@ void NSContainer_Release(NSContainer*) DECLSPEC_HIDDEN; void init_mutation(nsIComponentManager*) DECLSPEC_HIDDEN; void init_document_mutation(HTMLDocumentNode*) DECLSPEC_HIDDEN; void release_document_mutation(HTMLDocumentNode*) DECLSPEC_HIDDEN; +JSContext *get_context_from_document(nsIDOMHTMLDocument*) DECLSPEC_HIDDEN; void HTMLDocument_LockContainer(HTMLDocumentObj*,BOOL) DECLSPEC_HIDDEN; void show_context_menu(HTMLDocumentObj*,DWORD,POINT*,IDispatch*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index 3bae9f7..7eb53d3 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -19,6 +19,7 @@ #include "config.h" #include <stdarg.h> +#include <assert.h> #define COBJMACROS @@ -775,6 +776,22 @@ void release_document_mutation(HTMLDocumentNode *doc) nsIDocument_Release(nsdoc); } +JSContext *get_context_from_document(nsIDOMHTMLDocument *nsdoc) +{ + nsIDocument *doc; + JSContext *ctx; + nsresult nsres; + + nsres = nsIDOMHTMLDocument_QueryInterface(nsdoc, &IID_nsIDocument, (void**)&doc); + assert(nsres == NS_OK); + + ctx = nsIContentUtils_GetContextFromDocument(content_utils, doc); + nsIDocument_Release(doc); + + TRACE("ret %p\n", ctx); + return ctx; +} + void init_mutation(nsIComponentManager *component_manager) { nsIFactory *factory;

1 0

← Newer
1
2
3
4
5
6
7
...
58
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 April 2013