wine-commits August 2010

wine-commits@winehq.org

2 participants
884 discussions

Henri Verbeet : ddraw: Merge gamma.c into surface.c.
by Alexandre Julliard 19 Aug '10

19 Aug '10

Module: wine Branch: master Commit: 3eba8b5d22870b86d9fb371bec65dcb9e504e5b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3eba8b5d22870b86d9fb371be… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 18 19:26:18 2010 +0200 ddraw: Merge gamma.c into surface.c. --- dlls/ddraw/Makefile.in | 1 - dlls/ddraw/gamma.c | 220 ------------------------------------------------ dlls/ddraw/surface.c | 120 ++++++++++++++++++++++++++ 3 files changed, 120 insertions(+), 221 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3eba8b5d22870b86d9fb3…

1 0

Andrew Eikum : oleaut32: Implement ITypeInfo2::GetCustData.
by Alexandre Julliard 19 Aug '10

19 Aug '10

Module: wine Branch: master Commit: 9d3e2f1b517594c85361c9916ba31a243a0a96cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d3e2f1b517594c85361c9916… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Aug 18 12:21:52 2010 -0500 oleaut32: Implement ITypeInfo2::GetCustData. --- dlls/oleaut32/tests/typelib.c | 36 ++++++++++++++----- dlls/oleaut32/typelib2.c | 77 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 102 insertions(+), 11 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 9843327..0c7e9ab 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -1076,10 +1076,12 @@ static void test_CreateTypeLib(void) { static OLECHAR prop1W[] = {'P','r','o','p','1',0}; static OLECHAR param1W[] = {'p','a','r','a','m','1',0}; static OLECHAR param2W[] = {'p','a','r','a','m','2',0}; + static OLECHAR asdfW[] = {'A','s','d','f',0}; static OLECHAR *names1[] = {func1W, param1W, param2W}; static OLECHAR *names2[] = {func2W, param1W, param2W}; static OLECHAR *propname[] = {prop1W, param1W}; static const GUID custguid = {0xbf611abe,0x5b38,0x11df,{0x91,0x5c,0x08,0x02,0x79,0x79,0x94,0x70}}; + static const GUID bogusguid = {0xbf611abe,0x5b38,0x11df,{0x91,0x5c,0x08,0x02,0x79,0x79,0x94,0x71}}; char filename[MAX_PATH]; WCHAR filenameW[MAX_PATH]; @@ -1444,15 +1446,12 @@ static void test_CreateTypeLib(void) { ok(hres == S_OK, "got %08x\n", hres); hres = ITypeInfo2_GetCustData(ti2, NULL, NULL); - todo_wine ok(hres == E_INVALIDARG, "got %08x\n", hres); hres = ITypeInfo2_GetCustData(ti2, &custguid, NULL); - todo_wine ok(hres == E_INVALIDARG, "got %08x\n", hres); hres = ITypeInfo2_GetCustData(ti2, &custguid, &cust_data); - todo_wine ok(hres == S_OK, "got %08x\n", hres); hres = ICreateTypeInfo2_SetCustData(createti2, NULL, NULL); @@ -1474,12 +1473,9 @@ static void test_CreateTypeLib(void) { V_VT(&cust_data) = VT_EMPTY; hres = ITypeInfo2_GetCustData(ti2, &custguid, &cust_data); - todo_wine ok(hres == S_OK, "got %08x\n", hres); - todo_wine ok(V_VT(&cust_data) == VT_UI4, "got %d\n", V_VT(&cust_data)); - todo_wine ok(V_I4(&cust_data) == 0xdeadbeef, "got 0x%08x\n", V_I4(&cust_data)); V_VT(&cust_data) = VT_UI4; @@ -1492,14 +1488,36 @@ static void test_CreateTypeLib(void) { V_VT(&cust_data) = VT_EMPTY; hres = ITypeInfo2_GetCustData(ti2, &custguid, &cust_data); - todo_wine ok(hres == S_OK, "got %08x\n", hres); - todo_wine ok(V_VT(&cust_data) == VT_UI4, "got %d\n", V_VT(&cust_data)); - todo_wine ok(V_I4(&cust_data) == 12345678, "got 0x%08x\n", V_I4(&cust_data)); + V_VT(&cust_data) = VT_BSTR; + V_BSTR(&cust_data) = SysAllocString(asdfW); + + hres = ICreateTypeInfo2_SetCustData(createti2, &custguid, &cust_data); + ok(hres == S_OK, "got %08x\n", hres); + + SysFreeString(V_BSTR(&cust_data)); + V_I4(&cust_data) = 0; + V_VT(&cust_data) = VT_EMPTY; + + hres = ITypeInfo2_GetCustData(ti2, &custguid, &cust_data); + ok(hres == S_OK, "got %08x\n", hres); + + ok(V_VT(&cust_data) == VT_BSTR, "got %d\n", V_VT(&cust_data)); + ok(!lstrcmpW(V_BSTR(&cust_data), asdfW), "got %s\n", wine_dbgstr_w(V_BSTR(&cust_data))); + SysFreeString(V_BSTR(&cust_data)); + + V_VT(&cust_data) = VT_UI4; + V_UI4(&cust_data) = 17; + + hres = ITypeInfo2_GetCustData(ti2, &bogusguid, &cust_data); + ok(hres == S_OK, "got %08x\n", hres); + + ok(V_VT(&cust_data) == VT_EMPTY, "got: %d\n", V_VT(&cust_data)); + ITypeInfo2_Release(ti2); ICreateTypeInfo2_Release(createti2); ICreateTypeInfo_Release(createti); diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index 8009a68..d1b48ff 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -951,6 +951,64 @@ static int ctl2_find_custdata( } /**************************************************************************** + * ctl2_decode_variant + * + * Decodes a variant + * + * RETURNS + * + * Success: S_OK + * Failure: Error code from winerror.h + */ +static HRESULT ctl2_decode_variant( + ICreateTypeLib2Impl *This, /* [I] The typelib that contains the variant */ + int data_offs, /* [I] Offset within the data array, or the encoded value itself */ + VARIANT *value) /* [O] Decoded value */ +{ + char *encoded_data; + VARTYPE type; + + if (data_offs & 0x80000000) { + /* data_offs contains the encoded value */ + V_VT(value) = (data_offs & ~0x80000000) >> 26; + V_UI4(value) = data_offs & ~0xFF000000; + return S_OK; + } + + encoded_data = &This->typelib_segment_data[MSFT_SEG_CUSTDATA][data_offs]; + type = *encoded_data; + + switch(type) { + case VT_I4: + case VT_R4: + case VT_UI4: + case VT_INT: + case VT_UINT: + case VT_HRESULT: + case VT_PTR: { + V_VT(value) = type; + V_UI4(value) = *(unsigned*)(encoded_data + 2); + return S_OK; + } + case VT_BSTR: { + unsigned len, i; + + len = *(unsigned*)(encoded_data + 2); + + V_VT(value) = type; + V_BSTR(value) = SysAllocStringByteLen(NULL, len * sizeof(OLECHAR)); + for (i = 0; i < len; ++i) + V_BSTR(value)[i] = *(encoded_data + 6 + i); + + return S_OK; + } + default: + FIXME("Don't yet have decoder for this VARTYPE: %u\n", type); + return E_NOTIMPL; + } +} + +/**************************************************************************** * ctl2_set_custdata * * Adds a custom data element to an object in a type library. @@ -3610,8 +3668,23 @@ static HRESULT WINAPI ITypeInfo2_fnGetCustData( REFGUID guid, /* [I] The GUID under which the custom data is stored. */ VARIANT* pVarVal) /* [O] The custom data. */ { - FIXME("(%p,%s,%p), stub!\n", iface, debugstr_guid(guid), pVarVal); - return E_OUTOFMEMORY; + ICreateTypeInfo2Impl *This = impl_from_ITypeInfo2(iface); + MSFT_CDGuid *cdentry; + int offset; + + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(guid), pVarVal); + + if (!guid || !pVarVal) + return E_INVALIDARG; + + VariantClear(pVarVal); + + offset = ctl2_find_custdata(This->typelib, guid, This->typeinfo->oCustData); + if (offset == -1) + return S_OK; + + cdentry = (MSFT_CDGuid *)&This->typelib->typelib_segment_data[MSFT_SEG_CUSTDATAGUID][offset]; + return ctl2_decode_variant(This->typelib, cdentry->DataOffset, pVarVal); } /******************************************************************************

1 0

Andrew Eikum : oleaut32: Ensure that CyclicList nodes have a type.
by Alexandre Julliard 19 Aug '10

19 Aug '10

Module: wine Branch: master Commit: 9c53c8e7b38db657232dfac728fc5b8504571db8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c53c8e7b38db657232dfac72… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Aug 18 12:21:37 2010 -0500 oleaut32: Ensure that CyclicList nodes have a type. Some code checks against the type of a CyclicList node, so we should make sure that it's always initialized. --- dlls/oleaut32/typelib2.c | 27 ++++++++++++++++----------- 1 files changed, 16 insertions(+), 11 deletions(-) diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index cc8c7a2..8009a68 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -118,15 +118,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(typelib2); /*================== Implementation Structures ===================================*/ /* Used for storing cyclic list. Tail address is kept */ -enum tagCyclicListElementType { +typedef enum tagCyclicListElementType { + CyclicListSentinel, CyclicListFunc, CyclicListVar -}; +} CyclicListElementType; typedef struct tagCyclicList { struct tagCyclicList *next; int indice; int name; - enum tagCyclicListElementType type; + CyclicListElementType type; union { int val; @@ -218,6 +219,14 @@ static inline ICreateTypeInfo2Impl *impl_from_ITypeInfo2( ITypeInfo2 *iface ) static ULONG WINAPI ICreateTypeLib2_fnRelease(ICreateTypeLib2 *iface); +static CyclicList *alloc_cyclic_list_item(CyclicListElementType type) +{ + CyclicList *ret = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(CyclicList)); + if (!ret) + return NULL; + ret->type = type; + return ret; +} /*================== Internal functions ===================================*/ @@ -1793,19 +1802,18 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddFuncDesc( } if (!This->typedata) { - This->typedata = HeapAlloc(GetProcessHeap(), 0, sizeof(CyclicList)); + This->typedata = alloc_cyclic_list_item(CyclicListSentinel); if(!This->typedata) return E_OUTOFMEMORY; This->typedata->next = This->typedata; - This->typedata->u.val = 0; if(This->dual) This->dual->typedata = This->typedata; } /* allocate type data space for us */ - insert = HeapAlloc(GetProcessHeap(), 0, sizeof(CyclicList)); + insert = alloc_cyclic_list_item(CyclicListFunc); if(!insert) return E_OUTOFMEMORY; insert->u.data = HeapAlloc(GetProcessHeap(), 0, sizeof(int[6])+sizeof(int[(num_defaults?4:3)])*pFuncDesc->cParams); @@ -1861,7 +1869,6 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddFuncDesc( /* update the index data */ insert->indice = pFuncDesc->memid; insert->name = -1; - insert->type = CyclicListFunc; /* insert type data to list */ if(index == This->typeinfo->cElement) { @@ -2076,19 +2083,18 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddVarDesc( } if (!This->typedata) { - This->typedata = HeapAlloc(GetProcessHeap(), 0, sizeof(CyclicList)); + This->typedata = alloc_cyclic_list_item(CyclicListSentinel); if(!This->typedata) return E_OUTOFMEMORY; This->typedata->next = This->typedata; - This->typedata->u.val = 0; if(This->dual) This->dual->typedata = This->typedata; } /* allocate type data space for us */ - insert = HeapAlloc(GetProcessHeap(), 0, sizeof(CyclicList)); + insert = alloc_cyclic_list_item(CyclicListVar); if(!insert) return E_OUTOFMEMORY; insert->u.data = HeapAlloc(GetProcessHeap(), 0, sizeof(int[5])); @@ -2115,7 +2121,6 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddVarDesc( /* update the index data */ insert->indice = 0x40000000 + index; insert->name = -1; - insert->type = CyclicListVar; /* figure out type widths and whatnot */ ctl2_encode_typedesc(This->typelib, &pVarDesc->elemdescVar.tdesc,

1 0

Andrew Eikum : oleaut32: Overwrite previous CustData segment.
by Alexandre Julliard 19 Aug '10

19 Aug '10

Module: wine Branch: master Commit: a8dbeb1e60098d78c6875e7dcb023d5c97c27d60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8dbeb1e60098d78c6875e7dc… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Aug 18 12:21:22 2010 -0500 oleaut32: Overwrite previous CustData segment. This eliminates the diff between Wine's and Windows XP's generated TLB files. --- dlls/oleaut32/typelib2.c | 36 ++++++++++++++++++++++++++++++++---- 1 files changed, 32 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index b2c086b..cc8c7a2 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -921,6 +921,26 @@ static HRESULT ctl2_encode_variant( } } +static int ctl2_find_custdata( + ICreateTypeLib2Impl *This, + REFGUID guid, + int offset) +{ + while (offset != -1) { + MSFT_CDGuid *cdentry = + (MSFT_CDGuid *)&This->typelib_segment_data[MSFT_SEG_CUSTDATAGUID][offset]; + MSFT_GuidEntry *guidentry = + (MSFT_GuidEntry *)&This->typelib_segment_data[MSFT_SEG_GUID][cdentry->GuidOffset]; + + if (IsEqualGUID(guidentry, guid)) + return offset; + + offset = cdentry->next; + } + + return -1; +} + /**************************************************************************** * ctl2_set_custdata * @@ -943,6 +963,7 @@ static HRESULT ctl2_set_custdata( int guidoffset; int custoffset; int *custdata; + BOOL new_segment = FALSE; switch(V_VT(pVarVal)) { @@ -971,14 +992,21 @@ static HRESULT ctl2_set_custdata( if (status) return status; - custoffset = ctl2_alloc_segment(This, MSFT_SEG_CUSTDATAGUID, 12, 0); - if (custoffset == -1) return E_OUTOFMEMORY; + custoffset = ctl2_find_custdata(This, guid, *offset); + if (custoffset == -1) { + custoffset = ctl2_alloc_segment(This, MSFT_SEG_CUSTDATAGUID, 12, 0); + if (custoffset == -1) + return E_OUTOFMEMORY; + new_segment = TRUE; + } custdata = (int *)&This->typelib_segment_data[MSFT_SEG_CUSTDATAGUID][custoffset]; custdata[0] = guidoffset; custdata[1] = dataoffset; - custdata[2] = *offset; - *offset = custoffset; + if (new_segment) { + custdata[2] = *offset; + *offset = custoffset; + } return S_OK; }

1 0

Andrew Eikum : oleaut32: Use correct bitpattern if referenced type is not user defined.
by Alexandre Julliard 19 Aug '10

19 Aug '10

Module: wine Branch: master Commit: a0c0d2693d99452ee9e0ccd6f76252e9e64eb951 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0c0d2693d99452ee9e0ccd6f… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Aug 18 12:21:11 2010 -0500 oleaut32: Use correct bitpattern if referenced type is not user defined. This reduces the diff between the TLB file output by Wine and Windows XP when running the typelib test module. --- dlls/oleaut32/typelib2.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index 92d4ab0..b2c086b 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -1109,7 +1109,7 @@ static int ctl2_encode_typedesc( mix_field = typedata[0]>>16; break; default: - mix_field = 0x7fff; + mix_field = ((typedata[0] >> 16) == 0x7fff) ? 0x7fff : 0x7ffe; break; } }

1 0

Mariusz Pluciński : gameux: Add definitions of resource identifiers to header file.
by Alexandre Julliard 18 Aug '10

18 Aug '10

Module: wine Branch: master Commit: 83335590369da812440ecbda1c88ead24f1ec7dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=83335590369da812440ecbda1… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Wed Aug 18 17:18:33 2010 +0200 gameux: Add definitions of resource identifiers to header file. --- include/gameux.idl | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/include/gameux.idl b/include/gameux.idl index f9ec1e5..773e784 100644 --- a/include/gameux.idl +++ b/include/gameux.idl @@ -32,6 +32,18 @@ library gameuxLib { importlib("stdole2.tlb"); + cpp_quote("#define ID_GDF_XML __GDF_XML") + cpp_quote("#define ID_GDF_THUMBNAIL __GDF_THUMBNAIL") + cpp_quote("#define ID_ICON_ICO __ICON_ICO") + + cpp_quote("#if defined(__GNUC__)") + cpp_quote("#define ID_GDF_XML_STR (const WCHAR[]){'_','_','G','D','F','_','X','M','L',0}") + cpp_quote("#define ID_GDF_THUMBNAIL_STR (const WCHAR[]){'_','_','G','D','F','_','T','H','U','M','B','N','A','I','L',0}") + cpp_quote("#elif defined(_MSC_VER)") + cpp_quote("#define ID_GDF_XML_STR L\"__GDF_XML\"") + cpp_quote("#define ID_GDF_THUMBNAIL_STR L\"__GDF_THUMBNAIL\"") + cpp_quote("#endif") + typedef enum { GIS_NOT_INSTALLED = 1,

1 0

Jörg Höhle : kernel32/tests: GetVolumeInformationA X: succeeds iff drive's default dir is root.
by Alexandre Julliard 18 Aug '10

18 Aug '10

Module: wine Branch: master Commit: fc872628d9640c1441f8d6e332cccc62b6638cea URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc872628d9640c1441f8d6e33… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Jul 28 21:23:47 2010 +0200 kernel32/tests: GetVolumeInformationA X: succeeds iff drive's default dir is root. --- dlls/kernel32/tests/volume.c | 128 +++++++++++++++++++++++++++++++----------- 1 files changed, 94 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fc872628d9640c1441f8d…

1 0

Roderick Colenbrander : winex11: X11DRV_nores_SetCurrentMode return DISP_CHANGE_SUCCESSFUL when switching to the current mode .
by Alexandre Julliard 18 Aug '10

18 Aug '10

Module: wine Branch: master Commit: 2c39733eabd66c73eea370f513912da6dd9df14c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c39733eabd66c73eea370f51… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Tue Aug 17 20:35:29 2010 +0100 winex11: X11DRV_nores_SetCurrentMode return DISP_CHANGE_SUCCESSFUL when switching to the current mode. --- dlls/winex11.drv/settings.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index 7f0753a..9c40225 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -150,7 +150,8 @@ static int X11DRV_nores_GetCurrentMode(void) static LONG X11DRV_nores_SetCurrentMode(int mode) { - TRACE("Ignoring mode change request\n"); + if (mode == 0) return DISP_CHANGE_SUCCESSFUL; + TRACE("Ignoring mode change request mode=%d\n", mode); return DISP_CHANGE_FAILED; }

1 0

Marko Nikolic : advapi32/tests: Removed sign comparison warnings in eventlog tests.
by Alexandre Julliard 18 Aug '10

18 Aug '10

Module: wine Branch: master Commit: f3a645f0deed7b18aca9487a5852f8bdc85bbd96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3a645f0deed7b18aca9487a5… Author: Marko Nikolic <grkoma(a)gmail.com> Date: Tue Aug 17 15:39:24 2010 +0200 advapi32/tests: Removed sign comparison warnings in eventlog tests. --- dlls/advapi32/tests/eventlog.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/tests/eventlog.c b/dlls/advapi32/tests/eventlog.c index 88a02c7..5b46eaf 100644 --- a/dlls/advapi32/tests/eventlog.c +++ b/dlls/advapi32/tests/eventlog.c @@ -633,7 +633,7 @@ static BOOL create_new_eventlog(void) HKEY key, eventkey; BOOL bret = FALSE; LONG lret; - int i; + DWORD i; /* First create our eventlog */ lret = RegOpenKeyA(HKEY_LOCAL_MACHINE, eventlogsvc, &key); @@ -711,7 +711,7 @@ static void test_readwrite(void) DWORD sidsize, count; BOOL ret, sidavailable; BOOL on_vista = FALSE; /* Used to indicate Vista, W2K8 or Win7 */ - int i; + DWORD i; char *localcomputer = NULL; DWORD size; @@ -1095,7 +1095,7 @@ static void cleanup_eventlog(void) BOOL bret; LONG lret; HKEY key; - int i; + DWORD i; char winesvc[MAX_PATH]; /* Delete the registry tree */

1 0

Jacek Caban : mshtml: Avoid asynchronous parse_complete call.
by Alexandre Julliard 18 Aug '10

18 Aug '10

Module: wine Branch: master Commit: 8507db18a88a176a91ec6cc73f91a726de89e255 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8507db18a88a176a91ec6cc73… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 18 13:39:29 2010 +0200 mshtml: Avoid asynchronous parse_complete call. --- dlls/mshtml/mutation.c | 29 ++++++++--------------------- 1 files changed, 8 insertions(+), 21 deletions(-) diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index 8cf43fb..edcb2cc 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -312,10 +312,8 @@ static void call_explorer_69(HTMLDocumentObj *doc) FIXME("handle result\n"); } -static void parse_complete_proc(task_t *task) +static void parse_complete(HTMLDocumentObj *doc) { - HTMLDocumentObj *doc = ((docobj_task_t*)task)->doc; - TRACE("(%p)\n", doc); if(doc->usermode == EDITMODE) @@ -328,35 +326,24 @@ static void parse_complete_proc(task_t *task) call_explorer_69(doc); /* FIXME: IE7 calls EnableModelless(TRUE), EnableModelless(FALSE) and sets interactive state here */ - - set_ready_state(doc->basedoc.window, READYSTATE_INTERACTIVE); } static void handle_end_load(HTMLDocumentNode *This) { - docobj_task_t *task; - TRACE("\n"); if(!This->basedoc.doc_obj) return; - if(This != This->basedoc.doc_obj->basedoc.doc_node) { - set_ready_state(This->basedoc.window, READYSTATE_INTERACTIVE); - return; + if(This == This->basedoc.doc_obj->basedoc.doc_node) { + /* + * This should be done in the worker thread that parses HTML, + * but we don't have such thread (Gecko parses HTML for us). + */ + parse_complete(This->basedoc.doc_obj); } - task = heap_alloc(sizeof(docobj_task_t)); - if(!task) - return; - - task->doc = This->basedoc.doc_obj; - - /* - * This should be done in the worker thread that parses HTML, - * but we don't have such thread (Gecko parses HTML for us). - */ - push_task(&task->header, &parse_complete_proc, This->basedoc.doc_obj->basedoc.task_magic); + set_ready_state(This->basedoc.window, READYSTATE_INTERACTIVE); } static nsresult NSAPI nsRunnable_Run(nsIRunnable *iface)

1 0

← Newer
1
...
46
47
48
49
50
51
52
...
89
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 August 2010