August 2010 - Wine-commits - list.winehq.org

Henri Verbeet : ddraw: Add a separate function for light initialization.
by Alexandre Julliard 19 Aug '10

19 Aug '10

Module: wine Branch: master Commit: c892ed497c7faecfe9060a2e4b146812269701c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c892ed497c7faecfe9060a2e4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 18 19:26:21 2010 +0200 ddraw: Add a separate function for light initialization. --- dlls/ddraw/ddraw.c | 4 +--- dlls/ddraw/ddraw_private.h | 4 +--- dlls/ddraw/light.c | 9 ++++++++- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 55753c4..28af7d0 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4375,9 +4375,7 @@ static HRESULT WINAPI d3d3_CreateLight(IDirect3D3 *iface, IDirect3DLight **light return DDERR_OUTOFMEMORY; } - object->lpVtbl = &IDirect3DLight_Vtbl; - object->ref = 1; - object->ddraw = ddraw_from_d3d3(iface); + d3d_light_init(object, ddraw_from_d3d3(iface)); TRACE("Created light %p.\n", object); *light = (IDirect3DLight *)object; diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index fe65b79..f7ea61d 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -525,12 +525,10 @@ struct IDirect3DLightImpl IDirect3DLightImpl *next; }; -/* Vtable */ -extern const IDirect3DLightVtbl IDirect3DLight_Vtbl DECLSPEC_HIDDEN; - /* Helper functions */ void light_activate(IDirect3DLightImpl *light) DECLSPEC_HIDDEN; void light_deactivate(IDirect3DLightImpl *light) DECLSPEC_HIDDEN; +void d3d_light_init(IDirect3DLightImpl *light, IDirectDrawImpl *ddraw) DECLSPEC_HIDDEN; /****************************************************************************** * IDirect3DMaterial implementation structure - Wraps to D3D7 diff --git a/dlls/ddraw/light.c b/dlls/ddraw/light.c index 9726d86..3cf26b5 100644 --- a/dlls/ddraw/light.c +++ b/dlls/ddraw/light.c @@ -287,7 +287,7 @@ IDirect3DLightImpl_GetLight(IDirect3DLight *iface, return DD_OK; } -const IDirect3DLightVtbl IDirect3DLight_Vtbl = +static const struct IDirect3DLightVtbl d3d_light_vtbl = { /*** IUnknown Methods ***/ IDirect3DLightImpl_QueryInterface, @@ -298,3 +298,10 @@ const IDirect3DLightVtbl IDirect3DLight_Vtbl = IDirect3DLightImpl_SetLight, IDirect3DLightImpl_GetLight }; + +void d3d_light_init(IDirect3DLightImpl *light, IDirectDrawImpl *ddraw) +{ + light->lpVtbl = &d3d_light_vtbl; + light->ref = 1; + light->ddraw = ddraw; +}

1 0

Henri Verbeet : ddraw: Add a separate function for material initialization.
by Alexandre Julliard 19 Aug '10

19 Aug '10

Module: wine Branch: master Commit: bf26c2c869ef49a69dd192fed58b8f393b69a5d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf26c2c869ef49a69dd192fed… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 18 19:26:22 2010 +0200 ddraw: Add a separate function for material initialization. --- dlls/ddraw/ddraw.c | 6 +----- dlls/ddraw/ddraw_private.h | 6 +----- dlls/ddraw/material.c | 15 ++++++++++++--- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 28af7d0..7541671 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4432,11 +4432,7 @@ static HRESULT WINAPI d3d3_CreateMaterial(IDirect3D3 *iface, IDirect3DMaterial3 return DDERR_OUTOFMEMORY; } - object->lpVtbl = &IDirect3DMaterial3_Vtbl; - object->IDirect3DMaterial2_vtbl = &IDirect3DMaterial2_Vtbl; - object->IDirect3DMaterial_vtbl = &IDirect3DMaterial_Vtbl; - object->ref = 1; - object->ddraw = ddraw_from_d3d3(iface); + d3d_material_init(object, ddraw_from_d3d3(iface)); TRACE("Created material %p.\n", object); *material = (IDirect3DMaterial3 *)object; diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index f7ea61d..6ea61fe 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -548,13 +548,9 @@ struct IDirect3DMaterialImpl DWORD Handle; }; -/* VTables in various versions */ -extern const IDirect3DMaterialVtbl IDirect3DMaterial_Vtbl DECLSPEC_HIDDEN; -extern const IDirect3DMaterial2Vtbl IDirect3DMaterial2_Vtbl DECLSPEC_HIDDEN; -extern const IDirect3DMaterial3Vtbl IDirect3DMaterial3_Vtbl DECLSPEC_HIDDEN; - /* Helper functions */ void material_activate(IDirect3DMaterialImpl* This) DECLSPEC_HIDDEN; +void d3d_material_init(IDirect3DMaterialImpl *material, IDirectDrawImpl *ddraw) DECLSPEC_HIDDEN; /***************************************************************************** * IDirect3DViewport - Wraps to D3D7 diff --git a/dlls/ddraw/material.c b/dlls/ddraw/material.c index 68da7ff..10f4ab5 100644 --- a/dlls/ddraw/material.c +++ b/dlls/ddraw/material.c @@ -448,7 +448,7 @@ void material_activate(IDirect3DMaterialImpl* This) IDirect3DDevice7_SetMaterial((IDirect3DDevice7 *)This->active_device, &d3d7mat); } -const IDirect3DMaterial3Vtbl IDirect3DMaterial3_Vtbl = +static const struct IDirect3DMaterial3Vtbl d3d_material3_vtbl = { /*** IUnknown Methods ***/ IDirect3DMaterialImpl_QueryInterface, @@ -460,7 +460,7 @@ const IDirect3DMaterial3Vtbl IDirect3DMaterial3_Vtbl = IDirect3DMaterialImpl_GetHandle, }; -const IDirect3DMaterial2Vtbl IDirect3DMaterial2_Vtbl = +static const struct IDirect3DMaterial2Vtbl d3d_material2_vtbl = { /*** IUnknown Methods ***/ Thunk_IDirect3DMaterialImpl_2_QueryInterface, @@ -472,7 +472,7 @@ const IDirect3DMaterial2Vtbl IDirect3DMaterial2_Vtbl = Thunk_IDirect3DMaterialImpl_2_GetHandle, }; -const IDirect3DMaterialVtbl IDirect3DMaterial_Vtbl = +static const struct IDirect3DMaterialVtbl d3d_material1_vtbl = { /*** IUnknown Methods ***/ Thunk_IDirect3DMaterialImpl_1_QueryInterface, @@ -486,3 +486,12 @@ const IDirect3DMaterialVtbl IDirect3DMaterial_Vtbl = IDirect3DMaterialImpl_Reserve, IDirect3DMaterialImpl_Unreserve }; + +void d3d_material_init(IDirect3DMaterialImpl *material, IDirectDrawImpl *ddraw) +{ + material->lpVtbl = &d3d_material3_vtbl; + material->IDirect3DMaterial2_vtbl = &d3d_material2_vtbl; + material->IDirect3DMaterial_vtbl = &d3d_material1_vtbl; + material->ref = 1; + material->ddraw = ddraw; +}

1 0

Henri Verbeet : ddraw: Add a separate function for viewport initialization.
by Alexandre Julliard 19 Aug '10

19 Aug '10

Module: wine Branch: master Commit: 921bd1bf9a55908cf97b321668e5d73be51696f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=921bd1bf9a55908cf97b32166… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 18 19:26:23 2010 +0200 ddraw: Add a separate function for viewport initialization. --- dlls/ddraw/ddraw.c | 5 +---- dlls/ddraw/ddraw_private.h | 4 +--- dlls/ddraw/viewport.c | 10 +++++++++- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 7541671..7d97a91 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4505,10 +4505,7 @@ static HRESULT WINAPI d3d3_CreateViewport(IDirect3D3 *iface, IDirect3DViewport3 return DDERR_OUTOFMEMORY; } - object->lpVtbl = &IDirect3DViewport3_Vtbl; - object->ref = 1; - object->ddraw = ddraw_from_d3d3(iface); - object->use_vp2 = 0xff; + d3d_viewport_init(object, ddraw_from_d3d3(iface)); TRACE("Created viewport %p.\n", object); *viewport = (IDirect3DViewport3 *)object; diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 6ea61fe..81d2fd3 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -587,11 +587,9 @@ struct IDirect3DViewportImpl IDirect3DMaterialImpl *background; }; -/* Vtable */ -extern const IDirect3DViewport3Vtbl IDirect3DViewport3_Vtbl DECLSPEC_HIDDEN; - /* Helper functions */ void viewport_activate(IDirect3DViewportImpl* This, BOOL ignore_lights) DECLSPEC_HIDDEN; +void d3d_viewport_init(IDirect3DViewportImpl *viewport, IDirectDrawImpl *ddraw) DECLSPEC_HIDDEN; /***************************************************************************** * IDirect3DExecuteBuffer - Wraps to D3D7 diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index 56572e3..118e03a 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -1078,7 +1078,7 @@ IDirect3DViewportImpl_Clear2(IDirect3DViewport3 *iface, * The VTable *****************************************************************************/ -const IDirect3DViewport3Vtbl IDirect3DViewport3_Vtbl = +static const struct IDirect3DViewport3Vtbl d3d_viewport_vtbl = { /*** IUnknown Methods ***/ IDirect3DViewportImpl_QueryInterface, @@ -1106,3 +1106,11 @@ const IDirect3DViewport3Vtbl IDirect3DViewport3_Vtbl = IDirect3DViewportImpl_GetBackgroundDepth2, IDirect3DViewportImpl_Clear2, }; + +void d3d_viewport_init(IDirect3DViewportImpl *viewport, IDirectDrawImpl *ddraw) +{ + viewport->lpVtbl = &d3d_viewport_vtbl; + viewport->ref = 1; + viewport->ddraw = ddraw; + viewport->use_vp2 = 0xff; +}

1 0

Henri Verbeet : ddraw: Add a separate function for parent initialization.
by Alexandre Julliard 19 Aug '10

19 Aug '10

Module: wine Branch: master Commit: 759fd517aa98b0ef8f7a73b06ac74eb77e687f5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=759fd517aa98b0ef8f7a73b06… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 18 19:26:24 2010 +0200 ddraw: Add a separate function for parent initialization. --- dlls/ddraw/ddraw.c | 7 +++---- dlls/ddraw/ddraw_private.h | 2 +- dlls/ddraw/parent.c | 8 +++++++- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 7d97a91..df79f0e 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4701,8 +4701,8 @@ static HRESULT WINAPI d3d7_CreateDevice(IDirect3D7 *iface, REFCLSID riid, LeaveCriticalSection(&ddraw_cs); return DDERR_OUTOFMEMORY; } - index_buffer_parent->lpVtbl = &IParent_Vtbl; - index_buffer_parent->ref = 1; + + ddraw_parent_init(index_buffer_parent); /* Create an Index Buffer. WineD3D needs one for Drawing indexed primitives * Create a (hopefully) long enough buffer, and copy the indices into it @@ -5928,8 +5928,7 @@ static HRESULT STDMETHODCALLTYPE device_parent_CreateSwapChain(IWineD3DDevicePar return DDERR_OUTOFVIDEOMEMORY; } - object->lpVtbl = &IParent_Vtbl; - object->ref = 1; + ddraw_parent_init(object); hr = IWineD3DDevice_CreateSwapChain(This->wineD3DDevice, present_parameters, swapchain, (IUnknown *)object, This->ImplType); diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 81d2fd3..40f3bfd 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -315,7 +315,7 @@ struct IParentImpl }; -extern const IParentVtbl IParent_Vtbl DECLSPEC_HIDDEN; +void ddraw_parent_init(IParentImpl *parent) DECLSPEC_HIDDEN; /***************************************************************************** * IDirect3DDevice implementation diff --git a/dlls/ddraw/parent.c b/dlls/ddraw/parent.c index 2d8f519..705d587 100644 --- a/dlls/ddraw/parent.c +++ b/dlls/ddraw/parent.c @@ -121,9 +121,15 @@ static ULONG WINAPI IParentImpl_Release(IParent *iface) /***************************************************************************** * The VTable *****************************************************************************/ -const IParentVtbl IParent_Vtbl = +static const struct IParentVtbl ddraw_parent_vtbl = { IParentImpl_QueryInterface, IParentImpl_AddRef, IParentImpl_Release, }; + +void ddraw_parent_init(IParentImpl *parent) +{ + parent->lpVtbl = &ddraw_parent_vtbl; + parent->ref = 1; +}

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: Call nsILoadGroup::AddRequest from AsyncOpen.
by Alexandre Julliard 18 Aug '10

18 Aug '10

Module: wine Branch: master Commit: a14d142555922a98775af0daf638c9d7822f1a36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a14d142555922a98775af0daf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 18 13:38:30 2010 +0200 mshtml: Call nsILoadGroup::AddRequest from AsyncOpen. --- dlls/mshtml/navigate.c | 41 ++++++++++++++--------------------------- dlls/mshtml/nsio.c | 6 ++++++ 2 files changed, 20 insertions(+), 27 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 5cd63c1..64830c3 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -982,18 +982,25 @@ static void on_stop_nsrequest(nsChannelBSC *This, HRESULT result) { nsresult nsres; - if(!This->nslistener) - return; - if(!This->bsc.readed && SUCCEEDED(result)) { TRACE("No data read! Calling OnStartRequest\n"); on_start_nsrequest(This); } - nsres = nsIStreamListener_OnStopRequest(This->nslistener, (nsIRequest*)NSCHANNEL(This->nschannel), - This->nscontext, SUCCEEDED(result) ? NS_OK : NS_ERROR_FAILURE); - if(NS_FAILED(nsres)) - WARN("OnStopRequest failed: %08x\n", nsres); + if(This->nslistener) { + nsres = nsIStreamListener_OnStopRequest(This->nslistener, + (nsIRequest*)NSCHANNEL(This->nschannel), + This->nscontext, SUCCEEDED(result) ? NS_OK : NS_ERROR_FAILURE); + if(NS_FAILED(nsres)) + WARN("OnStopRequet failed: %08x\n", nsres); + } + + if(This->nschannel->load_group) { + nsres = nsILoadGroup_RemoveRequest(This->nschannel->load_group, + (nsIRequest*)NSCHANNEL(This->nschannel), NULL, NS_OK); + if(NS_FAILED(nsres)) + ERR("RemoveRequest failed: %08x\n", nsres); + } } static HRESULT read_stream_data(nsChannelBSC *This, IStream *stream) @@ -1073,20 +1080,6 @@ static HRESULT read_stream_data(nsChannelBSC *This, IStream *stream) return S_OK; } -static void add_nsrequest(nsChannelBSC *This) -{ - nsresult nsres; - - if(!This->nschannel || !This->nschannel->load_group) - return; - - nsres = nsILoadGroup_AddRequest(This->nschannel->load_group, - (nsIRequest*)NSCHANNEL(This->nschannel), This->nscontext); - - if(NS_FAILED(nsres)) - ERR("AddRequest failed:%08x\n", nsres); -} - #define NSCHANNELBSC_THIS(bsc) ((nsChannelBSC*) bsc) static void nsChannelBSC_destroy(BSCallback *bsc) @@ -1106,10 +1099,6 @@ static void nsChannelBSC_destroy(BSCallback *bsc) static HRESULT nsChannelBSC_start_binding(BSCallback *bsc) { - nsChannelBSC *This = NSCHANNELBSC_THIS(bsc); - - add_nsrequest(This); - return S_OK; } @@ -1393,8 +1382,6 @@ HRESULT channelbsc_load_stream(nsChannelBSC *bscallback, IStream *stream) if(!bscallback->nschannel->content_type) return E_OUTOFMEMORY; - add_nsrequest(bscallback); - hres = read_stream_data(bscallback, stream); IBindStatusCallback_OnStopBinding(STATUSCLB(&bscallback->bsc), hres, ERROR_SUCCESS); diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index d88ccde..758bac0 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1035,6 +1035,12 @@ static nsresult NSAPI nsChannel_AsyncOpen(nsIHttpChannel *iface, nsIStreamListen if(open) nsres = async_open(This, window, This->uri->is_doc_uri, aListener, aContext); + if(NS_SUCCEEDED(nsres) && This->load_group) { + nsres = nsILoadGroup_AddRequest(This->load_group, (nsIRequest*)NSCHANNEL(This), aContext); + if(NS_FAILED(nsres)) + ERR("AddRequest failed: %08x\n", nsres); + } + IHTMLWindow2_Release(HTMLWINDOW2(window)); return nsres; }

1 0