wine-commits March 2010

wine-commits@winehq.org

3 participants
919 discussions

Jacek Caban : mshtml: Make sure that readState is READYSTATE_LOADING in read_stream_data.
by Alexandre Julliard 18 Mar '10

18 Mar '10

Module: wine Branch: master Commit: 2b94ad52871294847b34304c3ba5b08adcc9b481 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b94ad52871294847b34304c3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 18 01:04:15 2010 +0100 mshtml: Make sure that readState is READYSTATE_LOADING in read_stream_data. --- dlls/mshtml/navigate.c | 5 ++++- dlls/mshtml/tests/events.c | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index a09ea7f..cc2aeb3 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -972,8 +972,11 @@ static HRESULT read_stream_data(nsChannelBSC *This, IStream *stream) on_start_nsrequest(This); - if(This->window) + if(This->window) { update_window_doc(This->window); + if(This->window->readystate != READYSTATE_LOADING) + set_ready_state(This->window, READYSTATE_LOADING); + } } This->bsc.readed += This->nsstream->buf_size; diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index 16f727f..d2d1db7 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -1310,7 +1310,6 @@ static void test_onreadystatechange(IHTMLDocument2 *doc) SET_EXPECT(iframe_onreadystatechange_interactive); SET_EXPECT(iframe_onreadystatechange_complete); pump_msgs(&called_iframe_onreadystatechange_complete); - todo_wine CHECK_CALLED(iframe_onreadystatechange_loading); CHECK_CALLED(iframe_onreadystatechange_interactive); CHECK_CALLED(iframe_onreadystatechange_complete);

1 0

Nikolay Sivov : shlwapi: Add a forward to DelayLoadFailureHook.
by Alexandre Julliard 18 Mar '10

18 Mar '10

Module: wine Branch: master Commit: d16bf5f9ba95394dff19bfe38e67238b91bac866 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d16bf5f9ba95394dff19bfe38… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 18 02:22:50 2010 +0300 shlwapi: Add a forward to DelayLoadFailureHook. --- dlls/shlwapi/shlwapi.spec | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index 6047646..d899232 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -559,6 +559,7 @@ @ stdcall ColorAdjustLuma(long long long) @ stdcall ColorHLSToRGB(long long long) @ stdcall ColorRGBToHLS(long ptr ptr ptr) +@ stdcall DelayLoadFailureHook(str str) kernel32.DelayLoadFailureHook @ stdcall -private DllGetVersion(ptr) @ stdcall GetMenuPosFromID(ptr long) @ stdcall HashData (ptr long ptr long)

1 0

Nikolay Sivov : urlmon: Add CoInternetIsFeatureEnabled stub.
by Alexandre Julliard 18 Mar '10

18 Mar '10

Module: wine Branch: master Commit: dd50af9464221a4ac927a972971f495abc9d9c3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd50af9464221a4ac927a9729… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 18 01:24:42 2010 +0300 urlmon: Add CoInternetIsFeatureEnabled stub. --- dlls/urlmon/internet.c | 9 +++++++++ dlls/urlmon/urlmon.spec | 1 + 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/internet.c b/dlls/urlmon/internet.c index 6a79e48..3d41def 100644 --- a/dlls/urlmon/internet.c +++ b/dlls/urlmon/internet.c @@ -405,3 +405,12 @@ HRESULT WINAPI CoInternetSetFeatureEnabled(INTERNETFEATURELIST feature, DWORD fl FIXME("%d, 0x%08x, %x, stub\n", feature, flags, enable); return E_NOTIMPL; } + +/*********************************************************************** + * CoInternetIsFeatureEnabled (URLMON.@) + */ +HRESULT WINAPI CoInternetIsFeatureEnabled(INTERNETFEATURELIST feature, DWORD flags) +{ + FIXME("%d, 0x%08x, stub\n", feature, flags); + return E_NOTIMPL; +} diff --git a/dlls/urlmon/urlmon.spec b/dlls/urlmon/urlmon.spec index 4c08bb2..e79850c 100644 --- a/dlls/urlmon/urlmon.spec +++ b/dlls/urlmon/urlmon.spec @@ -17,6 +17,7 @@ @ stub CoInternetGetProtocolFlags @ stdcall CoInternetGetSecurityUrl(ptr ptr long long) @ stdcall CoInternetGetSession(long ptr long) +@ stdcall CoInternetIsFeatureEnabled(long long) @ stdcall CoInternetParseUrl(wstr long long wstr long ptr long) @ stdcall CoInternetQueryInfo(ptr long long ptr long ptr long) @ stdcall CoInternetSetFeatureEnabled(long long long)

1 0

Nikolay Sivov : urlmon: Add stub IUriBuilder interface.
by Alexandre Julliard 18 Mar '10

18 Mar '10

Module: wine Branch: master Commit: 1ad867467e3c094765bfe41b1ae7c9af08391453 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ad867467e3c094765bfe41b1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 18 01:19:02 2010 +0300 urlmon: Add stub IUriBuilder interface. --- dlls/urlmon/uri.c | 278 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/urlmon/urlmon.spec | 1 + include/urlmon.idl | 100 +++++++++++++++++ 3 files changed, 378 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1ad867467e3c094765bfe…

1 0

Piotr Caban : oleaut32: Improve ITypeInfo2 GetRefTypeOfImplType implementation.
by Alexandre Julliard 18 Mar '10

18 Mar '10

Module: wine Branch: master Commit: 926d3a88e7b5f9878bb8af35a3317a807721621b URL: http://source.winehq.org/git/wine.git/?a=commit;h=926d3a88e7b5f9878bb8af35a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 17 22:06:11 2010 +0100 oleaut32: Improve ITypeInfo2 GetRefTypeOfImplType implementation. --- dlls/oleaut32/typelib2.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index 71d725c..8816e9d 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -3016,17 +3016,18 @@ static HRESULT WINAPI ITypeInfo2_fnGetRefTypeOfImplType( if(!pRefType) return E_INVALIDARG; - if(index == -1) { - if((This->typeinfo->typekind&0xf)==TKIND_DISPATCH - && (This->typeinfo->flags&TYPEFLAG_FDUAL)) { + if(This->typeinfo->flags&TYPEFLAG_FDUAL) { + if(index == -1) { *pRefType = -2; return S_OK; } - return TYPE_E_ELEMENTNOTFOUND; + if(This->typekind == TKIND_DISPATCH) + return ITypeInfo2_GetRefTypeOfImplType((ITypeInfo2*)&This->dual->lpVtblTypeInfo2, + index, pRefType); } - if(index >= This->typeinfo->cImplTypes) + if(index>=This->typeinfo->cImplTypes) return TYPE_E_ELEMENTNOTFOUND; if(This->typekind == TKIND_INTERFACE) {

1 0

Piotr Caban : oleaut32: Improve ICreateTypeInfo2 AddImplType implementation .
by Alexandre Julliard 18 Mar '10

18 Mar '10

Module: wine Branch: master Commit: 15956152e559d8db116eb9e4f14679d1c84853c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15956152e559d8db116eb9e4f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 17 22:05:53 2010 +0100 oleaut32: Improve ICreateTypeInfo2 AddImplType implementation. --- dlls/oleaut32/typelib2.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index a6e12cd..71d725c 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -1853,6 +1853,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddImplType( ref->flags = 0; ref->oCustData = -1; ref->onext = -1; + This->typeinfo->cImplTypes++; } else if (This->typekind == TKIND_INTERFACE) { if (This->typeinfo->cImplTypes && index==1) return TYPE_E_BADMODULEKIND; @@ -1860,14 +1861,18 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddImplType( if( index != 0) return TYPE_E_ELEMENTNOTFOUND; This->typeinfo->datatype1 = hRefType; + This->typeinfo->cImplTypes = 1; } else if (This->typekind == TKIND_DISPATCH) { - FIXME("dispatch case unhandled.\n"); + if(index != 0) return TYPE_E_ELEMENTNOTFOUND; + + /* FIXME: Check if referenced typeinfo is IDispatch */ + This->typeinfo->flags |= TYPEFLAG_FDISPATCHABLE; + This->typeinfo->cImplTypes = 1; } else { FIXME("AddImplType unsupported on typekind %d\n", This->typekind); return E_OUTOFMEMORY; } - This->typeinfo->cImplTypes++; return S_OK; }

1 0

Piotr Caban : oleaut32: Fix ITypeInfo GetImplTypeFlags for dispinterfaces.
by Alexandre Julliard 18 Mar '10

18 Mar '10

Module: wine Branch: master Commit: d2319ae841dadf086d86819410e4b0085f167f55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2319ae841dadf086d8681941… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 17 22:05:36 2010 +0100 oleaut32: Fix ITypeInfo GetImplTypeFlags for dispinterfaces. --- dlls/oleaut32/typelib.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 08a39b9..b09f7ab 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5581,6 +5581,11 @@ static HRESULT WINAPI ITypeInfo_fnGetImplTypeFlags( ITypeInfo2 *iface, return S_OK; } *pImplTypeFlags=0; + + if(This->TypeAttr.typekind==TKIND_DISPATCH && !index) + return S_OK; + + WARN("ImplType %d not found\n", index); return TYPE_E_ELEMENTNOTFOUND; }

1 0

Piotr Caban : oleaut32/tests: Make tests working on older systems, prevent crash on some wine boxes.
by Alexandre Julliard 18 Mar '10

18 Mar '10

Module: wine Branch: master Commit: cca98c460dfcebb56043335c07dfbe7ef22dc8df URL: http://source.winehq.org/git/wine.git/?a=commit;h=cca98c460dfcebb56043335c0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 17 22:05:20 2010 +0100 oleaut32/tests: Make tests working on older systems, prevent crash on some wine boxes. --- dlls/oleaut32/tests/typelib.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 6e44f58..8a8766a 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -1076,6 +1076,10 @@ static void test_CreateTypeLib(void) { hres = ICreateTypeInfo_AddRefTypeInfo(createti, unknown, &hreftype); ok(hres == S_OK, "got %08x\n", hres); + if(hres != S_OK) { + skip("Skipping some tests\n"); + return; + } hres = ICreateTypeInfo_AddImplType(createti, 1, hreftype); ok(hres == TYPE_E_ELEMENTNOTFOUND, "got %08x\n", hres); @@ -1434,18 +1438,18 @@ static void test_CreateTypeLib(void) { hres = ICreateTypeLib2_SaveAllChanges(createtl); ok(hres == S_OK, "got %08x\n", hres); - hres = LoadTypeLibEx(filenameW, REGKIND_NONE, &tl); - ok(hres == S_OK, "got %08x\n", hres); - ok(ITypeInfo_Release(interface2)==0, "Object should be freed\n"); ok(ITypeInfo_Release(interface1)==0, "Object should be freed\n"); ok(ITypeInfo_Release(dual)==0, "Object should be freed\n"); ok(ICreateTypeLib2_Release(createtl)==0, "Object should be freed\n"); + ok(ITypeInfo_Release(dispatch)==0, "Object should be freed\n"); ok(ITypeInfo_Release(unknown)==0, "Object should be freed\n"); + ok(ITypeLib_Release(stdole)==0, "Object should be freed\n"); + hres = LoadTypeLibEx(filenameW, REGKIND_NONE, &tl); + ok(hres == S_OK, "got %08x\n", hres); ok(ITypeLib_Release(tl)==0, "Object should be freed\n"); - ok(ITypeLib_Release(stdole)==0, "Object should be freed\n"); DeleteFileA(filename); }

1 0

Piotr Caban : oleaut32: Improve ITypeInfo2 GetTypeAttr implementation.
by Alexandre Julliard 18 Mar '10

18 Mar '10

Module: wine Branch: master Commit: 45306f8671c3d8f12c2f2bfcfb9096bc4426878a URL: http://source.winehq.org/git/wine.git/?a=commit;h=45306f8671c3d8f12c2f2bfcf… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 17 22:04:53 2010 +0100 oleaut32: Improve ITypeInfo2 GetTypeAttr implementation. --- dlls/oleaut32/tests/typelib.c | 2 +- dlls/oleaut32/typelib2.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 797ac02..6e44f58 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -1386,7 +1386,7 @@ static void test_CreateTypeLib(void) { ok(hres == S_OK, "got %08x\n", hres); ok(typeattr->cbSizeInstance == 4, "cbSizeInstance = %d\n", typeattr->cbSizeInstance); ok(typeattr->typekind == 4, "typekind = %d\n", typeattr->typekind); - todo_wine ok(typeattr->cFuncs == 8, "cFuncs = %d\n", typeattr->cFuncs); + ok(typeattr->cFuncs == 8, "cFuncs = %d\n", typeattr->cFuncs); ok(typeattr->cVars == 0, "cVars = %d\n", typeattr->cVars); ok(typeattr->cImplTypes == 1, "cImplTypes = %d\n", typeattr->cImplTypes); ok(typeattr->cbSizeVft == 28, "cbSizeVft = %d\n", typeattr->cbSizeVft); diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index 08b8684..a6e12cd 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -2919,6 +2919,8 @@ static HRESULT WINAPI ITypeInfo2_fnGetTypeAttr( (*ppTypeAttr)->cbSizeInstance = This->typeinfo->size; (*ppTypeAttr)->typekind = This->typekind; (*ppTypeAttr)->cFuncs = This->typeinfo->cElement&0xffff; + if(This->typeinfo->flags&TYPEFLAG_FDUAL && This->typekind==TKIND_DISPATCH) + (*ppTypeAttr)->cFuncs += 7; (*ppTypeAttr)->cVars = This->typeinfo->cElement>>16; (*ppTypeAttr)->cImplTypes = This->typeinfo->cImplTypes; (*ppTypeAttr)->cbSizeVft = This->typekind==TKIND_DISPATCH ? 28 : This->typeinfo->cbSizeVft;

1 0

Henri Verbeet : wined3d: Avoid some common invalid context accesses.
by Alexandre Julliard 18 Mar '10

18 Mar '10

Module: wine Branch: master Commit: 7c930589bc40097eb0ebb84310a3ea0ae6999edb URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c930589bc40097eb0ebb8431… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 17 21:59:54 2010 +0100 wined3d: Avoid some common invalid context accesses. Unfortunately there are plenty of other places left. Perhaps we should consider creating our own window when the context becomes invalid and making the context current on that instead. --- dlls/wined3d/device.c | 13 +++++++++++++ dlls/wined3d/drawprim.c | 6 ++++++ dlls/wined3d/swapchain.c | 6 ++++++ 3 files changed, 25 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 2d3ec56..bd13451 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4369,6 +4369,12 @@ HRESULT IWineD3DDeviceImpl_ClearSurface(IWineD3DDeviceImpl *This, IWineD3DSurfac } context = context_acquire(This, (IWineD3DSurface *)target, CTXUSAGE_CLEAR); + if (!context->valid) + { + context_release(context); + WARN("Invalid context, skipping clear.\n"); + return WINED3D_OK; + } target->get_drawable_size(context, &drawable_width, &drawable_height); @@ -5842,6 +5848,13 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, WINED else if (!surface_is_offscreen(dst_surface)) context = context_acquire(This, dst_surface, CTXUSAGE_RESOURCELOAD); else context = context_acquire(This, NULL, CTXUSAGE_RESOURCELOAD); + if (!context->valid) + { + context_release(context); + WARN("Invalid context, skipping blit.\n"); + return; + } + gl_info = context->gl_info; if (!surface_is_offscreen(src_surface)) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 0ed0e11..da7aab4 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -596,6 +596,12 @@ void drawPrimitive(IWineD3DDevice *iface, UINT index_count, UINT StartIdx, UINT This->isInDraw = TRUE; context = context_acquire(This, This->render_targets[0], CTXUSAGE_DRAWPRIM); + if (!context->valid) + { + context_release(context); + WARN("Invalid context, skipping draw.\n"); + return; + } if (This->stencilBufferTarget) { /* Note that this depends on the context_acquire() call above to set diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index dfe194d..776aa68 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -223,6 +223,12 @@ static HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface, CO IWineD3DSwapChain_SetDestWindowOverride(iface, hDestWindowOverride); context = context_acquire(This->device, This->backBuffer[0], CTXUSAGE_RESOURCELOAD); + if (!context->valid) + { + context_release(context); + WARN("Invalid context, skipping present.\n"); + return WINED3D_OK; + } /* Render the cursor onto the back buffer, using our nifty directdraw blitting code :-) */ if (This->device->bCursorVisible && This->device->cursorTexture)

1 0

← Newer
1
...
45
46
47
48
49
50
51
...
92
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 March 2010