December 2009 - Wine-Commits

Stefan Leichter : ntoskrnl.exe: Add stub for KeInitializeSemaphore.
by Alexandre Julliard Dec. 21, 2009

Dec. 21, 2009

Module: wine Branch: master Commit: 217828978fca3cff001603f760159fe9e93cc52a URL: http://source.winehq.org/git/wine.git/?a=commit;h=217828978fca3cff001603f76… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Mon Dec 21 10:12:41 2009 +0100 ntoskrnl.exe: Add stub for KeInitializeSemaphore. --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 5 +++++ 3 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 63d6fc9..03abe10 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -999,6 +999,15 @@ void WINAPI KeInitializeMutex(PRKMUTEX Mutex, ULONG Level) /*********************************************************************** + * KeInitializeSemaphore (NTOSKRNL.EXE.@) + */ +void WINAPI KeInitializeSemaphore( PRKSEMAPHORE Semaphore, LONG Count, LONG Limit ) +{ + FIXME( "(%p %d %d) stub\n", Semaphore , Count, Limit ); +} + + +/*********************************************************************** * KeInitializeSpinLock (NTOSKRNL.EXE.@) */ void WINAPI KeInitializeSpinLock( PKSPIN_LOCK SpinLock ) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index f6402af..f6d213f 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -551,7 +551,7 @@ @ stub KeInitializeMutant @ stdcall KeInitializeMutex(ptr long) @ stub KeInitializeQueue -@ stub KeInitializeSemaphore +@ stdcall KeInitializeSemaphore(ptr long long) @ stdcall KeInitializeSpinLock(ptr) @ stdcall KeInitializeTimer(ptr) @ stdcall KeInitializeTimerEx(ptr long) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 3bc7238..b8f5149 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -59,6 +59,11 @@ typedef struct _KEVENT { DISPATCHER_HEADER Header; } KEVENT, *PKEVENT, *RESTRICTED_POINTER PRKEVENT; +typedef struct _KSEMAPHORE { + DISPATCHER_HEADER Header; + LONG Limit; +} KSEMAPHORE, *PKSEMAPHORE, *PRKSEMAPHORE; + typedef struct _KDPC { CSHORT Type; UCHAR Number;

1 0

Mike Kaplinskiy : user32: Fix color mask handling in CreateIconIndirect.
by Alexandre Julliard Dec. 21, 2009

Dec. 21, 2009

Module: wine Branch: master Commit: 075a1e0e4db2934fd7413e9d5098360dd3cc5e6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=075a1e0e4db2934fd7413e9d5… Author: Mike Kaplinskiy <mike.kaplinskiy(a)gmail.com> Date: Mon Dec 21 00:25:10 2009 -0500 user32: Fix color mask handling in CreateIconIndirect. --- dlls/user32/cursoricon.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 248f3a0..631c469 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -2218,24 +2218,24 @@ HICON WINAPI CreateIconIndirect(PICONINFO iconinfo) } else { - HDC hdc, hdc_mem; - HBITMAP hbmp_old, hbmp_mem_old, hbmp_mono; + HDC hdc_mem, hdc_mem2; + HBITMAP hbmp_mem_old, hbmp_mem2_old, hbmp_mono; - hdc = GetDC( 0 ); - hdc_mem = CreateCompatibleDC( hdc ); + hdc_mem = CreateCompatibleDC( 0 ); + hdc_mem2 = CreateCompatibleDC( 0 ); hbmp_mono = CreateBitmap( bmpAnd.bmWidth, bmpAnd.bmHeight, 1, 1, NULL ); - hbmp_old = SelectObject( hdc, iconinfo->hbmMask ); - hbmp_mem_old = SelectObject( hdc_mem, hbmp_mono ); + hbmp_mem_old = SelectObject( hdc_mem, iconinfo->hbmMask ); + hbmp_mem2_old = SelectObject( hdc_mem2, hbmp_mono ); - BitBlt( hdc_mem, 0, 0, bmpAnd.bmWidth, bmpAnd.bmHeight, hdc, 0, 0, SRCCOPY ); + BitBlt( hdc_mem2, 0, 0, bmpAnd.bmWidth, bmpAnd.bmHeight, hdc_mem, 0, 0, SRCCOPY ); - SelectObject( hdc, hbmp_old ); SelectObject( hdc_mem, hbmp_mem_old ); + SelectObject( hdc_mem2, hbmp_mem2_old ); DeleteDC( hdc_mem ); - ReleaseDC( 0, hdc ); + DeleteDC( hdc_mem2 ); GetBitmapBits( hbmp_mono, sizeAnd, info + 1 ); DeleteObject( hbmp_mono );

1 0

Henri Verbeet : wined3d: IWineD3DPaletteImpl implements IWineD3DBase.
by Alexandre Julliard Dec. 21, 2009

Dec. 21, 2009

Module: wine Branch: master Commit: 8c7d25997889a44b697ad8ecdbe246aafae72c52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c7d25997889a44b697ad8ecd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Dec 20 20:41:39 2009 +0100 wined3d: IWineD3DPaletteImpl implements IWineD3DBase. --- dlls/wined3d/palette.c | 25 ++++++++++++++----------- 1 files changed, 14 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/palette.c b/dlls/wined3d/palette.c index c9c6182..553a08a 100644 --- a/dlls/wined3d/palette.c +++ b/dlls/wined3d/palette.c @@ -30,20 +30,23 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); #define SIZE_BITS (WINEDDPCAPS_1BIT | WINEDDPCAPS_2BIT | WINEDDPCAPS_4BIT | WINEDDPCAPS_8BIT) -static HRESULT WINAPI IWineD3DPaletteImpl_QueryInterface(IWineD3DPalette *iface, REFIID refiid, void **obj) { - IWineD3DPaletteImpl *This = (IWineD3DPaletteImpl *)iface; - TRACE("(%p)->(%s,%p)\n",This,debugstr_guid(refiid),obj); +static HRESULT WINAPI IWineD3DPaletteImpl_QueryInterface(IWineD3DPalette *iface, REFIID riid, void **object) +{ + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); - if (IsEqualGUID(refiid, &IID_IUnknown) - || IsEqualGUID(refiid, &IID_IWineD3DPalette)) { - *obj = iface; - IWineD3DPalette_AddRef(iface); + if (IsEqualGUID(riid, &IID_IWineD3DPalette) + || IsEqualGUID(riid, &IID_IWineD3DBase) + || IsEqualGUID(riid, &IID_IUnknown)) + { + IUnknown_AddRef(iface); + *object = iface; return S_OK; } - else { - *obj = NULL; - return E_NOINTERFACE; - } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + + *object = NULL; + return E_NOINTERFACE; } static ULONG WINAPI IWineD3DPaletteImpl_AddRef(IWineD3DPalette *iface) {

1 0

Nicolas Le Cam : kernel32/tests: Simplify dumpmem function.
by Alexandre Julliard Dec. 21, 2009

Dec. 21, 2009

Module: wine Branch: master Commit: 7ae21483ec455df9107649787fce9986b59bb5de URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ae21483ec455df9107649787… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Wed Dec 2 02:00:20 2009 +0100 kernel32/tests: Simplify dumpmem function. --- dlls/kernel32/tests/file.c | 43 ++++++++++++++++--------------------------- 1 files changed, 16 insertions(+), 27 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 3cc9022..90fdee2 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -702,33 +702,22 @@ static void test_CopyFileW(void) /* * Debugging routine to dump a buffer in a hexdump-like fashion. */ -static void dumpmem(unsigned char* mem, int len) { - int x,y; - char buf[200]; - int ln=0; - - for (x=0; x<len; x+=16) { - ln += sprintf(buf+ln, "%04x: ",x); - for (y=0; y<16; y++) { - if ((x+y)>len) { - ln += sprintf(buf+ln, " "); - } else { - ln += sprintf(buf+ln, "%02hhx ",mem[x+y]); - } - } - ln += sprintf(buf+ln, "- "); - for (y=0; y<16; y++) { - if ((x+y)<=len) { - if (mem[x+y]<32 || mem[x+y]>127) { - ln += sprintf(buf+ln, "."); - } else { - ln += sprintf(buf+ln, "%c",mem[x+y]); - } - } - } - sprintf(buf+ln, "\n"); - trace(buf); - ln = 0; +static void dumpmem(unsigned char *mem, int len) +{ + int x = 0; + char hex[49], *p; + char txt[17], *c; + + while (x < len) + { + p = hex; + c = txt; + do { + p += sprintf(p, "%02hhx ", mem[x]); + *c++ = (mem[x] >= 32 && mem[x] <= 127) ? mem[x] : '.'; + } while (++x % 16 && x < len); + *c = '\0'; + trace("%04x: %-48s- %s\n", x, hex, txt); } }

1 0

André Hentschel : winetest: Fix a cast.
by Alexandre Julliard Dec. 21, 2009

Dec. 21, 2009

Module: wine Branch: master Commit: 35efca6ab3ea9f3499c65e6bd8a3b0f321490ccd URL: http://source.winehq.org/git/wine.git/?a=commit;h=35efca6ab3ea9f3499c65e6bd… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Dec 19 18:00:46 2009 +0100 winetest: Fix a cast. --- programs/winetest/send.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winetest/send.c b/programs/winetest/send.c index 2b4073a..c250424 100644 --- a/programs/winetest/send.c +++ b/programs/winetest/send.c @@ -301,7 +301,7 @@ send_file_wininet (const char *name) report (R_WARNING, "File too big (%.1f MB > 1.5 MB); submitting partial report.", filesize/1024.0/1024); - filesize = (DWORD) 1.5*1024*1024; + filesize = 1.5*1024*1024; } report (R_STATUS, "Opening HTTP connection to " SERVER_NAME);

1 0

Henri Verbeet : wined3d: Cleanup IWineD3DDeviceImpl_GetRasterStatus().
by Alexandre Julliard Dec. 21, 2009

Dec. 21, 2009

Module: wine Branch: master Commit: 23bf5025c6585c09d05e28bf37482ff4ace75232 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23bf5025c6585c09d05e28bf3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Dec 20 20:41:37 2009 +0100 wined3d: Cleanup IWineD3DDeviceImpl_GetRasterStatus(). --- dlls/wined3d/device.c | 34 +++++++++++++++++++++------------- 1 files changed, 21 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index bb9e097..1c0f43e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4976,24 +4976,32 @@ static BOOL WINAPI IWineD3DDeviceImpl_GetSoftwareVertexProcessing(IWineD3DD return This->softwareVertexProcessing; } - -static HRESULT WINAPI IWineD3DDeviceImpl_GetRasterStatus(IWineD3DDevice *iface, UINT iSwapChain, WINED3DRASTER_STATUS* pRasterStatus) { - IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - IWineD3DSwapChain *swapChain; +static HRESULT WINAPI IWineD3DDeviceImpl_GetRasterStatus(IWineD3DDevice *iface, + UINT swapchain_idx, WINED3DRASTER_STATUS *raster_status) +{ + IWineD3DSwapChain *swapchain; HRESULT hr; - TRACE("(%p) : SwapChain %d returning %p\n", This, iSwapChain, pRasterStatus); + TRACE("iface %p, swapchain_idx %u, raster_status %p.\n", + iface, swapchain_idx, raster_status); - hr = IWineD3DDeviceImpl_GetSwapChain(iface, iSwapChain, &swapChain); - if(hr == WINED3D_OK){ - hr = IWineD3DSwapChain_GetRasterStatus(swapChain, pRasterStatus); - IWineD3DSwapChain_Release(swapChain); - }else{ - FIXME("(%p) IWineD3DSwapChain_GetRasterStatus returned in error\n", This); + hr = IWineD3DDeviceImpl_GetSwapChain(iface, swapchain_idx, &swapchain); + if (FAILED(hr)) + { + WARN("Failed to get swapchain %u, hr %#x.\n", swapchain_idx, hr); + return hr; } - return hr; -} + hr = IWineD3DSwapChain_GetRasterStatus(swapchain, raster_status); + IWineD3DSwapChain_Release(swapchain); + if (FAILED(hr)) + { + WARN("Failed to get raster status, hr %#x.\n", hr); + return hr; + } + + return WINED3D_OK; +} static HRESULT WINAPI IWineD3DDeviceImpl_SetNPatchMode(IWineD3DDevice *iface, float nSegments) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface;

1 0

Henri Verbeet : wined3d: IWineD3DClipperImpl implements IWineD3DBase.
by Alexandre Julliard Dec. 21, 2009

Dec. 21, 2009

Module: wine Branch: master Commit: ecf2e049a2223e89733625caa79122171be6ed27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecf2e049a2223e89733625caa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Dec 20 20:41:38 2009 +0100 wined3d: IWineD3DClipperImpl implements IWineD3DBase. Unify the QueryInterface implementation a bit with the rest of wined3d while we're at it. --- dlls/wined3d/clipper.c | 23 ++++++++++++----------- 1 files changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/clipper.c b/dlls/wined3d/clipper.c index 2d3184f..febd92b 100644 --- a/dlls/wined3d/clipper.c +++ b/dlls/wined3d/clipper.c @@ -28,22 +28,23 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); -static HRESULT WINAPI IWineD3DClipperImpl_QueryInterface(IWineD3DClipper *iface, REFIID riid, void **Obj) +static HRESULT WINAPI IWineD3DClipperImpl_QueryInterface(IWineD3DClipper *iface, REFIID riid, void **object) { - IWineD3DClipperImpl *This = (IWineD3DClipperImpl *)iface; + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); - TRACE("(%p)->(%p,%p)\n", This, riid, Obj); - if (IsEqualGUID(&IID_IUnknown, riid) - || IsEqualGUID(&IID_IWineD3DClipper, riid)) + if (IsEqualGUID(riid, &IID_IWineD3DClipper) + || IsEqualGUID(riid, &IID_IWineD3DBase) + || IsEqualGUID(riid, &IID_IUnknown)) { - *Obj = iface; - IWineD3DClipper_AddRef(iface); + IUnknown_AddRef(iface); + *object = iface; return S_OK; } - else - { - return E_NOINTERFACE; - } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + + *object = NULL; + return E_NOINTERFACE; } static ULONG WINAPI IWineD3DClipperImpl_AddRef(IWineD3DClipper *iface )

1 0

Henri Verbeet : d3d9: Add a separate function for swapchain initialization.
by Alexandre Julliard Dec. 21, 2009

Dec. 21, 2009

Module: wine Branch: master Commit: 76804fa711a25824c67393f2e96f18314e4c138c URL: http://source.winehq.org/git/wine.git/?a=commit;h=76804fa711a25824c67393f2e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Dec 20 20:41:36 2009 +0100 d3d9: Add a separate function for swapchain initialization. --- dlls/d3d9/d3d9_private.h | 5 +- dlls/d3d9/device.c | 31 ++++++++++++ dlls/d3d9/swapchain.c | 115 +++++++++++++++++++-------------------------- 3 files changed, 83 insertions(+), 68 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=76804fa711a25824c6739…

1 0

Henri Verbeet : d3d8: Add a separate function for swapchain initialization.
by Alexandre Julliard Dec. 21, 2009

Dec. 21, 2009

Module: wine Branch: master Commit: 2e27ab6b67de672251e128ea0fc167a48e417018 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e27ab6b67de672251e128ea0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Dec 20 20:41:35 2009 +0100 d3d8: Add a separate function for swapchain initialization. --- dlls/d3d8/d3d8_private.h | 8 ++--- dlls/d3d8/device.c | 81 +++++++++++---------------------------------- dlls/d3d8/swapchain.c | 58 ++++++++++++++++++++++++++++++++- 3 files changed, 80 insertions(+), 67 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2e27ab6b67de672251e12…

1 0

Jacek Caban : mshtml: Don' t use necko nsIHttpChannel in nsChannel implementation.
by Alexandre Julliard Dec. 21, 2009

Dec. 21, 2009

Module: wine Branch: master Commit: ecbe545e90b2efc9c8af7a40f7ece510b8b65b67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecbe545e90b2efc9c8af7a40f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 21 00:23:02 2009 +0100 mshtml: Don't use necko nsIHttpChannel in nsChannel implementation. --- dlls/mshtml/mshtml_private.h | 1 - dlls/mshtml/nsio.c | 99 ++++++++---------------------------------- 2 files changed, 19 insertions(+), 81 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 18bdec3..04ae719 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -434,7 +434,6 @@ typedef struct { LONG ref; nsIChannel *channel; - nsIHttpChannel *http_channel; nsIWineURI *uri; nsIInputStream *post_data_stream; nsILoadGroup *load_group; diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 4bbfd1f..101c810 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -219,8 +219,6 @@ static nsrefcnt NSAPI nsChannel_Release(nsIHttpChannel *iface) nsIWineURI_Release(This->uri); if(This->channel) nsIChannel_Release(This->channel); - if(This->http_channel) - nsIHttpChannel_Release(This->http_channel); if(This->owner) nsISupports_Release(This->owner); if(This->post_data_stream) @@ -886,10 +884,7 @@ static nsresult NSAPI nsChannel_GetRequestMethod(nsIHttpChannel *iface, nsACStri { nsChannel *This = NSCHANNEL_THIS(iface); - TRACE("(%p)->(%p)\n", This, aRequestMethod); - - if(This->http_channel) - return nsIHttpChannel_GetRequestMethod(This->http_channel, aRequestMethod); + FIXME("(%p)->(%p)\n", This, aRequestMethod); return NS_ERROR_NOT_IMPLEMENTED; } @@ -899,10 +894,7 @@ static nsresult NSAPI nsChannel_SetRequestMethod(nsIHttpChannel *iface, { nsChannel *This = NSCHANNEL_THIS(iface); - TRACE("(%p)->(%p)\n", This, aRequestMethod); - - if(This->http_channel) - return nsIHttpChannel_SetRequestMethod(This->http_channel, aRequestMethod); + FIXME("(%p)->(%p)\n", This, aRequestMethod); return NS_ERROR_NOT_IMPLEMENTED; } @@ -911,10 +903,7 @@ static nsresult NSAPI nsChannel_GetReferrer(nsIHttpChannel *iface, nsIURI **aRef { nsChannel *This = NSCHANNEL_THIS(iface); - TRACE("(%p)->(%p)\n", This, aReferrer); - - if(This->http_channel) - return nsIHttpChannel_GetReferrer(This->http_channel, aReferrer); + FIXME("(%p)->(%p)\n", This, aReferrer); return NS_ERROR_NOT_IMPLEMENTED; } @@ -923,10 +912,7 @@ static nsresult NSAPI nsChannel_SetReferrer(nsIHttpChannel *iface, nsIURI *aRefe { nsChannel *This = NSCHANNEL_THIS(iface); - TRACE("(%p)->(%p)\n", This, aReferrer); - - if(This->http_channel) - return nsIHttpChannel_SetReferrer(This->http_channel, aReferrer); + FIXME("(%p)->(%p)\n", This, aReferrer); return NS_ERROR_NOT_IMPLEMENTED; } @@ -936,10 +922,7 @@ static nsresult NSAPI nsChannel_GetRequestHeader(nsIHttpChannel *iface, { nsChannel *This = NSCHANNEL_THIS(iface); - TRACE("(%p)->(%p %p)\n", This, aHeader, _retval); - - if(This->http_channel) - return nsIHttpChannel_GetRequestHeader(This->http_channel, aHeader, _retval); + FIXME("(%p)->(%p %p)\n", This, aHeader, _retval); return NS_ERROR_NOT_IMPLEMENTED; } @@ -949,10 +932,7 @@ static nsresult NSAPI nsChannel_SetRequestHeader(nsIHttpChannel *iface, { nsChannel *This = NSCHANNEL_THIS(iface); - TRACE("(%p)->(%p %p %x)\n", This, aHeader, aValue, aMerge); - - if(This->http_channel) - return nsIHttpChannel_SetRequestHeader(This->http_channel, aHeader, aValue, aMerge); + FIXME("(%p)->(%p %p %x)\n", This, aHeader, aValue, aMerge); return NS_ERROR_NOT_IMPLEMENTED; } @@ -962,10 +942,7 @@ static nsresult NSAPI nsChannel_VisitRequestHeaders(nsIHttpChannel *iface, { nsChannel *This = NSCHANNEL_THIS(iface); - TRACE("(%p)->(%p)\n", This, aVisitor); - - if(This->http_channel) - return nsIHttpChannel_VisitRequestHeaders(This->http_channel, aVisitor); + FIXME("(%p)->(%p)\n", This, aVisitor); return NS_ERROR_NOT_IMPLEMENTED; } @@ -974,10 +951,7 @@ static nsresult NSAPI nsChannel_GetAllowPipelining(nsIHttpChannel *iface, PRBool { nsChannel *This = NSCHANNEL_THIS(iface); - TRACE("(%p)->(%p)\n", This, aAllowPipelining); - - if(This->http_channel) - return nsIHttpChannel_GetAllowPipelining(This->http_channel, aAllowPipelining); + FIXME("(%p)->(%p)\n", This, aAllowPipelining); return NS_ERROR_NOT_IMPLEMENTED; } @@ -986,10 +960,7 @@ static nsresult NSAPI nsChannel_SetAllowPipelining(nsIHttpChannel *iface, PRBool { nsChannel *This = NSCHANNEL_THIS(iface); - TRACE("(%p)->(%x)\n", This, aAllowPipelining); - - if(This->http_channel) - return nsIHttpChannel_SetAllowPipelining(This->http_channel, aAllowPipelining); + FIXME("(%p)->(%x)\n", This, aAllowPipelining); return NS_ERROR_NOT_IMPLEMENTED; } @@ -998,10 +969,7 @@ static nsresult NSAPI nsChannel_GetRedirectionLimit(nsIHttpChannel *iface, PRUin { nsChannel *This = NSCHANNEL_THIS(iface); - TRACE("(%p)->(%p)\n", This, aRedirectionLimit); - - if(This->http_channel) - return nsIHttpChannel_GetRedirectionLimit(This->http_channel, aRedirectionLimit); + FIXME("(%p)->(%p)\n", This, aRedirectionLimit); return NS_ERROR_NOT_IMPLEMENTED; } @@ -1010,10 +978,7 @@ static nsresult NSAPI nsChannel_SetRedirectionLimit(nsIHttpChannel *iface, PRUin { nsChannel *This = NSCHANNEL_THIS(iface); - TRACE("(%p)->(%u)\n", This, aRedirectionLimit); - - if(This->http_channel) - return nsIHttpChannel_SetRedirectionLimit(This->http_channel, aRedirectionLimit); + FIXME("(%p)->(%u)\n", This, aRedirectionLimit); return NS_ERROR_NOT_IMPLEMENTED; } @@ -1029,9 +994,7 @@ static nsresult NSAPI nsChannel_GetResponseStatus(nsIHttpChannel *iface, PRUint3 return NS_OK; } - if(This->http_channel) - return nsIHttpChannel_GetResponseStatus(This->http_channel, aResponseStatus); - + WARN("No response status\n"); return NS_ERROR_UNEXPECTED; } @@ -1040,10 +1003,7 @@ static nsresult NSAPI nsChannel_GetResponseStatusText(nsIHttpChannel *iface, { nsChannel *This = NSCHANNEL_THIS(iface); - TRACE("(%p)->(%p)\n", This, aResponseStatusText); - - if(This->http_channel) - return nsIHttpChannel_GetResponseStatusText(This->http_channel, aResponseStatusText); + FIXME("(%p)->(%p)\n", This, aResponseStatusText); return NS_ERROR_NOT_IMPLEMENTED; } @@ -1053,10 +1013,7 @@ static nsresult NSAPI nsChannel_GetRequestSucceeded(nsIHttpChannel *iface, { nsChannel *This = NSCHANNEL_THIS(iface); - TRACE("(%p)->(%p)\n", This, aRequestSucceeded); - - if(This->http_channel) - return nsIHttpChannel_GetRequestSucceeded(This->http_channel, aRequestSucceeded); + FIXME("(%p)->(%p)\n", This, aRequestSucceeded); return NS_ERROR_NOT_IMPLEMENTED; } @@ -1066,10 +1023,7 @@ static nsresult NSAPI nsChannel_GetResponseHeader(nsIHttpChannel *iface, { nsChannel *This = NSCHANNEL_THIS(iface); - TRACE("(%p)->(%p %p)\n", This, header, _retval); - - if(This->http_channel) - return nsIHttpChannel_GetResponseHeader(This->http_channel, header, _retval); + FIXME("(%p)->(%p %p)\n", This, header, _retval); return NS_ERROR_NOT_IMPLEMENTED; } @@ -1079,10 +1033,7 @@ static nsresult NSAPI nsChannel_SetResponseHeader(nsIHttpChannel *iface, { nsChannel *This = NSCHANNEL_THIS(iface); - TRACE("(%p)->(%p %p %x)\n", This, header, value, merge); - - if(This->http_channel) - return nsIHttpChannel_SetResponseHeader(This->http_channel, header, value, merge); + FIXME("(%p)->(%p %p %x)\n", This, header, value, merge); return NS_ERROR_NOT_IMPLEMENTED; } @@ -1092,10 +1043,7 @@ static nsresult NSAPI nsChannel_VisitResponseHeaders(nsIHttpChannel *iface, { nsChannel *This = NSCHANNEL_THIS(iface); - TRACE("(%p)->(%p)\n", This, aVisitor); - - if(This->http_channel) - return nsIHttpChannel_VisitResponseHeaders(This->http_channel, aVisitor); + FIXME("(%p)->(%p)\n", This, aVisitor); return NS_ERROR_NOT_IMPLEMENTED; } @@ -1104,10 +1052,7 @@ static nsresult NSAPI nsChannel_IsNoStoreResponse(nsIHttpChannel *iface, PRBool { nsChannel *This = NSCHANNEL_THIS(iface); - TRACE("(%p)->(%p)\n", This, _retval); - - if(This->http_channel) - return nsIHttpChannel_IsNoStoreResponse(This->http_channel, _retval); + FIXME("(%p)->(%p)\n", This, _retval); return NS_ERROR_NOT_IMPLEMENTED; } @@ -1116,10 +1061,7 @@ static nsresult NSAPI nsChannel_IsNoCacheResponse(nsIHttpChannel *iface, PRBool { nsChannel *This = NSCHANNEL_THIS(iface); - TRACE("(%p)->(%p)\n", This, _retval); - - if(This->http_channel) - return nsIHttpChannel_IsNoCacheResponse(This->http_channel, _retval); + FIXME("(%p)->(%p)\n", This, _retval); return NS_ERROR_NOT_IMPLEMENTED; } @@ -2708,9 +2650,6 @@ static nsresult NSAPI nsIOService_NewChannelFromURI(nsIIOService *iface, nsIURI nsIWineURI_GetWineURL(wine_uri, &url); ret->url_scheme = url && SUCCEEDED(ParseURLW(url, &parsed_url)) ? parsed_url.nScheme : URL_SCHEME_UNKNOWN; - if(channel) - nsIChannel_QueryInterface(channel, &IID_nsIHttpChannel, (void**)&ret->http_channel); - *_retval = NSCHANNEL(ret); return NS_OK; }

1 0