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

Oldřich Jedlička : ddraw/tests: New CreateSurface for DDSCAPS_BACKBUFFER tests.
by Alexandre Julliard Aug. 4, 2010

Aug. 4, 2010

Module: wine Branch: master Commit: 109cb9fee483dc47604565647858d24dd395f1b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=109cb9fee483dc47604565647… Author: Oldřich Jedlička <oldium.pro(a)seznam.cz> Date: Tue Aug 3 21:26:14 2010 +0200 ddraw/tests: New CreateSurface for DDSCAPS_BACKBUFFER tests. --- dlls/ddraw/tests/dsurface.c | 91 +++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 87 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 20e8634..b5f6f2c 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -30,6 +30,7 @@ #include "unknwn.h" static LPDIRECTDRAW lpDD = NULL; +static DDCAPS ddcaps; static BOOL CreateDirectDraw(void) { @@ -2851,16 +2852,12 @@ static void SurfaceCapsTest(void) DDSCAPS_PRIMARYSURFACE | DDSCAPS_SYSTEMMEMORY | DDSCAPS_VISIBLE }; UINT i; - DDCAPS ddcaps; /* Tests various surface flags, what changes do they undergo during surface creation. Forsaken * engine expects texture surfaces without memory flag to get a video memory flag right after * creation. Currently, Wine adds DDSCAPS_FRONTBUFFER to primary surface, but native doesn't do this * for single buffered primaries. Because of this primary surface creation tests are todo_wine. No real * app is known so far to care about this. */ - ddcaps.dwSize = sizeof(DDCAPS); - hr = IDirectDraw_GetCaps(lpDD, &ddcaps, NULL); - ok(hr == DD_OK, "IDirectDraw_GetCaps failed with %08x\n", hr); if (!(ddcaps.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY)) { @@ -3378,6 +3375,83 @@ static void GetDCFormatTest(void) IDirectDraw7_Release(dd7); } +static void BackBufferCreateSurfaceTest(void) +{ + DDSURFACEDESC ddsd; + DDSURFACEDESC created_ddsd; + DDSURFACEDESC2 ddsd2; + IDirectDrawSurface *surf; + IDirectDrawSurface4 *surf4; + IDirectDrawSurface7 *surf7; + HRESULT hr; + IDirectDraw2 *dd2; + IDirectDraw4 *dd4; + IDirectDraw7 *dd7; + + const DWORD caps = DDSCAPS_BACKBUFFER; + const DWORD expected_caps = DDSCAPS_BACKBUFFER | DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM; + + if (!(ddcaps.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY)) + { + skip("DDraw reported no VIDEOMEMORY cap. Broken video driver? Skipping surface caps tests.\n"); + return ; + } + + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; + ddsd.dwWidth = 64; + ddsd.dwHeight = 64; + ddsd.ddsCaps.dwCaps = caps; + memset(&ddsd2, 0, sizeof(ddsd2)); + ddsd2.dwSize = sizeof(ddsd2); + ddsd2.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; + ddsd2.dwWidth = 64; + ddsd2.dwHeight = 64; + ddsd2.ddsCaps.dwCaps = caps; + memset(&created_ddsd, 0, sizeof(created_ddsd)); + created_ddsd.dwSize = sizeof(DDSURFACEDESC); + + hr = IDirectDraw_CreateSurface(lpDD, &ddsd, &surf, NULL); + todo_wine ok(SUCCEEDED(hr), "IDirectDraw_CreateSurface failed: 0x%08x\n", hr); + if (surf != NULL) + { + hr = IDirectDrawSurface_GetSurfaceDesc(surf, &created_ddsd); + ok(SUCCEEDED(hr), "IDirectDraw_GetSurfaceDesc failed: 0x%08x\n", hr); + ok(created_ddsd.ddsCaps.dwCaps == expected_caps, + "GetSurfaceDesc returned caps %x, expected %x\n", created_ddsd.ddsCaps.dwCaps, + expected_caps); + IDirectDrawSurface_Release(surf); + } + + hr = IDirectDraw_QueryInterface(lpDD, &IID_IDirectDraw2, (void **) &dd2); + ok(SUCCEEDED(hr), "IDirectDraw_QueryInterface failed: 0x%08x\n", hr); + + hr = IDirectDraw2_CreateSurface(dd2, &ddsd, &surf, NULL); + ok(hr == DDERR_INVALIDCAPS, "IDirectDraw2_CreateSurface didn't return %x08x, but %x08x\n", + DDERR_INVALIDCAPS, hr); + + IDirectDraw2_Release(dd2); + + hr = IDirectDraw_QueryInterface(lpDD, &IID_IDirectDraw4, (void **) &dd4); + ok(SUCCEEDED(hr), "IDirectDraw_QueryInterface failed: 0x%08x\n", hr); + + hr = IDirectDraw4_CreateSurface(dd4, &ddsd2, &surf4, NULL); + ok(hr == DDERR_INVALIDCAPS, "IDirectDraw4_CreateSurface didn't return %x08x, but %x08x\n", + DDERR_INVALIDCAPS, hr); + + IDirectDraw4_Release(dd4); + + hr = IDirectDraw_QueryInterface(lpDD, &IID_IDirectDraw7, (void **) &dd7); + ok(SUCCEEDED(hr), "IDirectDraw_QueryInterface failed: 0x%08x\n", hr); + + hr = IDirectDraw7_CreateSurface(dd7, &ddsd2, &surf7, NULL); + ok(hr == DDERR_INVALIDCAPS, "IDirectDraw7_CreateSurface didn't return %x08x, but %x08x\n", + DDERR_INVALIDCAPS, hr); + + IDirectDraw7_Release(dd7); +} + START_TEST(dsurface) { HRESULT ret; @@ -3401,6 +3475,14 @@ START_TEST(dsurface) return; } + ddcaps.dwSize = sizeof(DDCAPS); + ret = IDirectDraw_GetCaps(lpDD, &ddcaps, NULL); + if (ret != DD_OK) + { + skip("IDirectDraw_GetCaps failed with %08x\n", ret); + return; + } + MipMapCreationTest(); SrcColorKey32BlitTest(); QueryInterface(); @@ -3423,5 +3505,6 @@ START_TEST(dsurface) SurfaceCapsTest(); GetDCTest(); GetDCFormatTest(); + BackBufferCreateSurfaceTest(); ReleaseDirectDraw(); }

1 0

Alexandre Julliard : configure: Check that the cross-compiler that we found actually works.
by Alexandre Julliard Aug. 4, 2010

Aug. 4, 2010

Module: wine Branch: master Commit: c2a29dbb9c61af31f5031cd9c6e4d0c532fabce9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2a29dbb9c61af31f5031cd9c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 4 13:16:19 2010 +0200 configure: Check that the cross-compiler that we found actually works. --- configure | 54 +++++++++++++++++++++++++++++++++++++++--------------- configure.ac | 37 ++++++++++++++++++++++--------------- 2 files changed, 61 insertions(+), 30 deletions(-) diff --git a/configure b/configure index 9b94f09..05a9317 100755 --- a/configure +++ b/configure @@ -7054,22 +7054,46 @@ test -n "$CROSSCC" || CROSSCC="false" if test "$CROSSCC" != "false" then - CROSSTEST_DISABLE="" - set x $CROSSCC - shift - target="" - while test $# -ge 1 - do - case "$1" in - *-gcc) target=`expr "$1" : '$.*$-gcc'` ;; - esac - shift - done - if test -n "$target" - then - CROSSTARGET="$target" + ac_save_CC="$CC" + CC="$CROSSCC" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CROSSCC works" >&5 +$as_echo_n "checking whether $CROSSCC works... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ - fi +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + set x $CROSSCC + shift + target="" + while test $# -ge 1 + do + case "$1" in + *-gcc) target=`expr "$1" : '$.*$-gcc'` ;; + esac + shift + done + if test -n "$target" + then + CROSSTEST_DISABLE="" + CROSSTARGET="$target" + + fi +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CC="$ac_save_CC" fi fi diff --git a/configure.ac b/configure.ac index 30f04ac..eedfec5 100644 --- a/configure.ac +++ b/configure.ac @@ -838,21 +838,28 @@ then WINE_CHECK_MINGW_PROG(CROSSCC,gcc,false) if test "$CROSSCC" != "false" then - CROSSTEST_DISABLE="" - set x $CROSSCC - shift - target="" - while test $# -ge 1 - do - case "$1" in - *-gcc) target=`expr "$1" : '$.*$-gcc'` ;; - esac - shift - done - if test -n "$target" - then - AC_SUBST(CROSSTARGET,"$target") - fi + ac_save_CC="$CC" + CC="$CROSSCC" + AC_MSG_CHECKING([whether $CROSSCC works]) + AC_COMPILE_IFELSE(AC_LANG_PROGRAM([]), + [AC_MSG_RESULT([yes]) + set x $CROSSCC + shift + target="" + while test $# -ge 1 + do + case "$1" in + *-gcc) target=`expr "$1" : '$.*$-gcc'` ;; + esac + shift + done + if test -n "$target" + then + CROSSTEST_DISABLE="" + AC_SUBST(CROSSTARGET,"$target") + fi], + [AC_MSG_RESULT([no])]) + CC="$ac_save_CC" fi fi

1 0

Andrew Talbot : comctl32: Constify some variables.
by Alexandre Julliard Aug. 4, 2010

Aug. 4, 2010

Module: wine Branch: master Commit: ebacf49f0297fefbc112b59835443abfb9f6e19b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebacf49f0297fefbc112b5983… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Aug 3 23:23:26 2010 +0100 comctl32: Constify some variables. --- dlls/comctl32/rebar.c | 2 +- dlls/comctl32/tab.c | 2 +- dlls/comctl32/treeview.c | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 354ab66..8ecfee3 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -2661,7 +2661,7 @@ REBAR_SetBandInfoT(REBAR_INFO *infoPtr, INT iBand, const REBARBANDINFOW *lprbbi, static LRESULT -REBAR_SetBarInfo (REBAR_INFO *infoPtr, LPREBARINFO lpInfo) +REBAR_SetBarInfo (REBAR_INFO *infoPtr, const REBARINFO *lpInfo) { REBAR_BAND *lpBand; UINT i; diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index c99153e..7057531 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -2620,7 +2620,7 @@ static inline LRESULT TAB_Paint (TAB_INFO *infoPtr, HDC hdcPaint) } static LRESULT -TAB_InsertItemT (TAB_INFO *infoPtr, INT iItem, TCITEMW *pti, BOOL bUnicode) +TAB_InsertItemT (TAB_INFO *infoPtr, INT iItem, const TCITEMW *pti, BOOL bUnicode) { TAB_ITEM *item; RECT rect; diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index e4c465b..2745ce9 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -5829,10 +5829,10 @@ TREEVIEW_Unregister(void) /* Tree Verification ****************************************************/ static inline void -TREEVIEW_VerifyChildren(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item); +TREEVIEW_VerifyChildren(TREEVIEW_INFO *infoPtr, const TREEVIEW_ITEM *item); static inline void TREEVIEW_VerifyItemCommon(TREEVIEW_INFO *infoPtr, - TREEVIEW_ITEM *item) + const TREEVIEW_ITEM *item) { assert(infoPtr != NULL); assert(item != NULL); @@ -5871,7 +5871,7 @@ static inline void TREEVIEW_VerifyItemCommon(TREEVIEW_INFO *infoPtr, } static inline void -TREEVIEW_VerifyItem(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item) +TREEVIEW_VerifyItem(TREEVIEW_INFO *infoPtr, const TREEVIEW_ITEM *item) { assert(item != NULL); @@ -5887,9 +5887,9 @@ TREEVIEW_VerifyItem(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item) } static inline void -TREEVIEW_VerifyChildren(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item) +TREEVIEW_VerifyChildren(TREEVIEW_INFO *infoPtr, const TREEVIEW_ITEM *item) { - TREEVIEW_ITEM *child; + const TREEVIEW_ITEM *child; assert(item != NULL); for (child = item->firstChild; child != NULL; child = child->nextSibling)

1 0

Henri Verbeet : wined3d: Replace color_fill_fbo() with device_clear_render_targets().
by Alexandre Julliard Aug. 4, 2010

Aug. 4, 2010

Module: wine Branch: master Commit: 6e30387f81235578e67afc54a8d6695f0413a8f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e30387f81235578e67afc54a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 4 11:10:23 2010 +0200 wined3d: Replace color_fill_fbo() with device_clear_render_targets(). --- dlls/wined3d/device.c | 57 +++++++------------------------------------------ 1 files changed, 8 insertions(+), 49 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3fcdd99..dabc451 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5485,51 +5485,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_DeletePatch(IWineD3DDevice *iface, UINT return WINED3DERR_INVALIDCALL; } -static void color_fill_fbo(IWineD3DDevice *iface, IWineD3DSurfaceImpl *surface, - const WINED3DRECT *rect, const float color[4]) -{ - IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; - struct wined3d_context *context; - - if (rect) surface_load_location(surface, SFLAG_INDRAWABLE, NULL); - surface_modify_location(surface, SFLAG_INDRAWABLE, TRUE); - - context = context_acquire(This, surface); - context_apply_clear_state(context, This, 1, &surface, NULL); - - ENTER_GL(); - - if (rect) - { - if (surface_is_offscreen(surface)) - glScissor(rect->x1, rect->y1, rect->x2 - rect->x1, rect->y2 - rect->y1); - else - glScissor(rect->x1, surface->currentDesc.Height - rect->y2, - rect->x2 - rect->x1, rect->y2 - rect->y1); - checkGLcall("glScissor"); - } - else - { - glDisable(GL_SCISSOR_TEST); - } - - glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); - IWineD3DDeviceImpl_MarkStateDirty(This, STATE_RENDER(WINED3DRS_COLORWRITEENABLE)); - IWineD3DDeviceImpl_MarkStateDirty(This, STATE_RENDER(WINED3DRS_COLORWRITEENABLE1)); - IWineD3DDeviceImpl_MarkStateDirty(This, STATE_RENDER(WINED3DRS_COLORWRITEENABLE2)); - IWineD3DDeviceImpl_MarkStateDirty(This, STATE_RENDER(WINED3DRS_COLORWRITEENABLE3)); - - glClearColor(color[0], color[1], color[2], color[3]); - glClear(GL_COLOR_BUFFER_BIT); - checkGLcall("glClear"); - - LEAVE_GL(); - - if (wined3d_settings.strict_draw_ordering) wglFlush(); /* Flush to ensure ordering across contexts. */ - - context_release(context); -} - static HRESULT WINAPI IWineD3DDeviceImpl_ColorFill(IWineD3DDevice *iface, IWineD3DSurface *pSurface, const WINED3DRECT *pRect, WINED3DCOLOR color) { @@ -5545,9 +5500,12 @@ static HRESULT WINAPI IWineD3DDeviceImpl_ColorFill(IWineD3DDevice *iface, if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { const float c[4] = {D3DCOLOR_R(color), D3DCOLOR_G(color), D3DCOLOR_B(color), D3DCOLOR_A(color)}; - color_fill_fbo(iface, surface, pRect, c); - return WINED3D_OK; - } else { + + return device_clear_render_targets((IWineD3DDeviceImpl *)iface, 1, &surface, + !!pRect, pRect, WINED3DCLEAR_TARGET, c, 0.0f, 0); + } + else + { /* Just forward this to the DirectDraw blitting engine */ memset(&BltFx, 0, sizeof(BltFx)); BltFx.dwSize = sizeof(BltFx); @@ -5582,7 +5540,8 @@ static void WINAPI IWineD3DDeviceImpl_ClearRendertargetView(IWineD3DDevice *ifac if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { - color_fill_fbo(iface, surface, NULL, color); + device_clear_render_targets((IWineD3DDeviceImpl *)iface, 1, &surface, + 0, NULL, WINED3DCLEAR_TARGET, color, 0.0f, 0); } else {

1 0

Misha Koshelev : d3dx9: Add _D3DXMESH enumeration.
by Alexandre Julliard Aug. 4, 2010

Aug. 4, 2010

Module: wine Branch: master Commit: 995c653d1121adf7db916020ea172319782682e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=995c653d1121adf7db916020e… Author: Misha Koshelev <misha680(a)gmail.com> Date: Mon Aug 2 13:26:30 2010 -0500 d3dx9: Add _D3DXMESH enumeration. --- include/d3dx9mesh.h | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/include/d3dx9mesh.h b/include/d3dx9mesh.h index 5773d24..20d285c 100644 --- a/include/d3dx9mesh.h +++ b/include/d3dx9mesh.h @@ -30,6 +30,32 @@ enum _MAX_FVF_DECL_SIZE MAX_FVF_DECL_SIZE = MAXD3DDECLLENGTH + 1 }; +enum _D3DXMESH +{ + D3DXMESH_32BIT = 0x001, + D3DXMESH_DONOTCLIP = 0x002, + D3DXMESH_POINTS = 0x004, + D3DXMESH_RTPATCHES = 0x008, + D3DXMESH_NPATCHES = 0x4000, + D3DXMESH_VB_SYSTEMMEM = 0x010, + D3DXMESH_VB_MANAGED = 0x020, + D3DXMESH_VB_WRITEONLY = 0x040, + D3DXMESH_VB_DYNAMIC = 0x080, + D3DXMESH_VB_SOFTWAREPROCESSING = 0x8000, + D3DXMESH_IB_SYSTEMMEM = 0x100, + D3DXMESH_IB_MANAGED = 0x200, + D3DXMESH_IB_WRITEONLY = 0x400, + D3DXMESH_IB_DYNAMIC = 0x800, + D3DXMESH_IB_SOFTWAREPROCESSING = 0x10000, + D3DXMESH_VB_SHARE = 0x1000, + D3DXMESH_USEHWONLY = 0x2000, + D3DXMESH_SYSTEMMEM = 0x110, + D3DXMESH_MANAGED = 0x220, + D3DXMESH_WRITEONLY = 0x440, + D3DXMESH_DYNAMIC = 0x880, + D3DXMESH_SOFTWAREPROCESSING = 0x18000 +}; + typedef struct ID3DXBaseMesh* LPD3DXBASEMESH; typedef struct ID3DXMesh* LPD3DXMESH;

1 0

Thomas Mullaly : urlmon: Implemented IUri_GetPathAndQuery.
by Alexandre Julliard Aug. 4, 2010

Aug. 4, 2010

Module: wine Branch: master Commit: b5e70534c611cfff36fed8227d8746f80f9ee20b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5e70534c611cfff36fed8227… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Tue Jul 27 20:43:10 2010 -0400 urlmon: Implemented IUri_GetPathAndQuery. --- dlls/urlmon/tests/uri.c | 235 ++++++++++++++++++++++++++--------------------- dlls/urlmon/uri.c | 29 +++++-- 2 files changed, 154 insertions(+), 110 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b5e70534c611cfff36fed…

1 0

Dmitry Timoshkov : ws2_32: Rearrange the code to avoid a needless release_sock_fd().
by Alexandre Julliard Aug. 4, 2010

Aug. 4, 2010

Module: wine Branch: master Commit: e0bbcea6fb99cca17e33b063d876e04f53800b9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0bbcea6fb99cca17e33b063d… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Aug 4 12:14:52 2010 +0900 ws2_32: Rearrange the code to avoid a needless release_sock_fd(). --- dlls/ws2_32/socket.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 22c72f3..f129b08 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1902,20 +1902,21 @@ int WINAPI WSAConnect( SOCKET s, const struct WS_sockaddr* name, int namelen, /*********************************************************************** * ConnectEx */ -BOOL WINAPI WS2_ConnectEx(SOCKET s, const struct WS_sockaddr* name, int namelen, +static BOOL WINAPI WS2_ConnectEx(SOCKET s, const struct WS_sockaddr* name, int namelen, PVOID sendBuf, DWORD sendBufLen, LPDWORD sent, LPOVERLAPPED ov) { - int fd = get_sock_fd( s, FILE_READ_DATA, NULL ); - int ret, status; - if (fd == -1) + int fd, ret, status; + + if (!ov) { - SetLastError( WSAENOTSOCK ); + SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; } - if (!ov) + + fd = get_sock_fd( s, FILE_READ_DATA, NULL ); + if (fd == -1) { - release_sock_fd(s, fd); - SetLastError( ERROR_INVALID_PARAMETER ); + SetLastError( WSAENOTSOCK ); return FALSE; }

1 0

Jacek Caban : mshtml: Added nsIChannel::SetRequestHeader implementation.
by Alexandre Julliard Aug. 4, 2010

Aug. 4, 2010

Module: wine Branch: master Commit: dc825296fd35ef264358d6233123cd4fd9449e74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc825296fd35ef264358d6233… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 3 21:40:05 2010 +0200 mshtml: Added nsIChannel::SetRequestHeader implementation. --- dlls/mshtml/nsio.c | 33 +++++++++++++++++++++++++++++++-- 1 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 019bc61..24b14c3 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -387,6 +387,32 @@ HRESULT set_http_header(struct list *headers, const WCHAR *name, int name_len, return S_OK; } +static nsresult set_channel_http_header(struct list *headers, const nsACString *name_str, + const nsACString *value_str) +{ + const char *namea, *valuea; + WCHAR *name, *value; + HRESULT hres; + + nsACString_GetData(name_str, &namea); + name = heap_strdupAtoW(namea); + if(!name) + return NS_ERROR_UNEXPECTED; + + nsACString_GetData(value_str, &valuea); + value = heap_strdupAtoW(valuea); + if(!value) { + heap_free(name); + return NS_ERROR_UNEXPECTED; + } + + hres = set_http_header(headers, name, strlenW(name), value, strlenW(value)); + + heap_free(name); + heap_free(value); + return SUCCEEDED(hres) ? NS_OK : NS_ERROR_UNEXPECTED; +} + static void free_http_headers(struct list *list) { http_header_t *iter, *iter_next; @@ -1061,9 +1087,12 @@ static nsresult NSAPI nsChannel_SetRequestHeader(nsIHttpChannel *iface, { nsChannel *This = NSCHANNEL_THIS(iface); - FIXME("(%p)->(%s %s %x)\n", This, debugstr_nsacstr(aHeader), debugstr_nsacstr(aValue), aMerge); + TRACE("(%p)->(%s %s %x)\n", This, debugstr_nsacstr(aHeader), debugstr_nsacstr(aValue), aMerge); - return NS_OK; + if(aMerge) + FIXME("aMerge not supported\n"); + + return set_channel_http_header(&This->request_headers, aHeader, aValue); } static nsresult NSAPI nsChannel_VisitRequestHeaders(nsIHttpChannel *iface,

1 0

Jacek Caban : mshtml: Store request headers in nsChannel if possible.
by Alexandre Julliard Aug. 4, 2010

Aug. 4, 2010

Module: wine Branch: master Commit: 76eed7d3138d3b1e80578197a0a09d351a56acbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=76eed7d3138d3b1e80578197a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 3 21:39:34 2010 +0200 mshtml: Store request headers in nsChannel if possible. --- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/navigate.c | 69 ++++++++++++++++++++++++++++++++++++++++-- dlls/mshtml/nsio.c | 2 + 3 files changed, 69 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index d1d0d05..fcdb792 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -464,6 +464,7 @@ typedef struct { char *charset; PRUint32 response_status; struct list response_headers; + struct list request_headers; UINT url_scheme; } nsChannel; diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index fc37f4d..239fbea 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1090,9 +1090,18 @@ static HRESULT nsChannelBSC_init_bindinfo(BSCallback *bsc) nsChannelBSC *This = NSCHANNELBSC_THIS(bsc); if(This->nschannel && This->nschannel->post_data_stream) { - parse_post_data(This->nschannel->post_data_stream, &This->bsc.headers, &This->bsc.post_data, &This->bsc.post_data_len); - TRACE("headers = %s post_data = %s\n", debugstr_w(This->bsc.headers), + WCHAR *headers; + HRESULT hres; + + parse_post_data(This->nschannel->post_data_stream, &headers, &This->bsc.post_data, &This->bsc.post_data_len); + + TRACE("headers = %s post_data = %s\n", debugstr_w(headers), debugstr_an(This->bsc.post_data, This->bsc.post_data_len)); + + hres = parse_headers(headers, &This->nschannel->request_headers); + heap_free(headers); + if(FAILED(hres)) + return hres; } return S_OK; @@ -1174,7 +1183,51 @@ static HRESULT nsChannelBSC_on_response(BSCallback *bsc, DWORD response_code, static HRESULT nsChannelBSC_beginning_transaction(BSCallback *bsc, WCHAR **additional_headers) { - return S_FALSE; + nsChannelBSC *This = NSCHANNELBSC_THIS(bsc); + http_header_t *iter; + DWORD len = 0; + WCHAR *ptr; + + static const WCHAR content_lengthW[] = + {'C','o','n','t','e','n','t','-','L','e','n','g','t','h',0}; + + if(!This->nschannel) + return S_FALSE; + + LIST_FOR_EACH_ENTRY(iter, &This->nschannel->request_headers, http_header_t, entry) { + if(strcmpW(iter->header, content_lengthW)) + len += strlenW(iter->header) + 2 /* ": " */ + strlenW(iter->data) + 2 /* "\r\n" */; + } + + if(!len) + return S_OK; + + *additional_headers = ptr = CoTaskMemAlloc((len+1)*sizeof(WCHAR)); + if(!ptr) + return E_OUTOFMEMORY; + + LIST_FOR_EACH_ENTRY(iter, &This->nschannel->request_headers, http_header_t, entry) { + if(!strcmpW(iter->header, content_lengthW)) + continue; + + len = strlenW(iter->header); + memcpy(ptr, iter->header, len*sizeof(WCHAR)); + ptr += len; + + *ptr++ = ':'; + *ptr++ = ' '; + + len = strlenW(iter->data); + memcpy(ptr, iter->data, len*sizeof(WCHAR)); + ptr += len; + + *ptr++ = '\r'; + *ptr++ = '\n'; + } + + *ptr = 0; + + return S_OK; } #undef NSCHANNELBSC_THIS @@ -1325,6 +1378,16 @@ void channelbsc_set_channel(nsChannelBSC *This, nsChannel *channel, nsIStreamLis nsISupports_AddRef(context); This->nscontext = context; } + + if(This->bsc.headers) { + HRESULT hres; + + hres = parse_headers(This->bsc.headers, &channel->request_headers); + heap_free(This->bsc.headers); + This->bsc.headers = NULL; + if(FAILED(hres)) + WARN("parse_headers failed: %08x\n", hres); + } } HRESULT hlink_frame_navigate(HTMLDocument *doc, LPCWSTR url, diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 9bef7f0..09e125f 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -465,6 +465,7 @@ static nsrefcnt NSAPI nsChannel_Release(nsIHttpChannel *iface) nsIURI_Release(This->original_uri); free_http_headers(&This->response_headers); + free_http_headers(&This->request_headers); heap_free(This->content_type); heap_free(This->charset); @@ -2611,6 +2612,7 @@ static nsresult NSAPI nsIOService_NewChannelFromURI(nsIIOService *iface, nsIURI ret->ref = 1; ret->uri = wine_uri; list_init(&ret->response_headers); + list_init(&ret->request_headers); nsIURI_AddRef(aURI); ret->original_uri = aURI;

1 0

Thomas Mullaly : urlmon: Implemented canonicalization of query strings.
by Alexandre Julliard Aug. 4, 2010

Aug. 4, 2010

Module: wine Branch: master Commit: fdfcfc6aa05ea03138ce298f85906448b2ee9fb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdfcfc6aa05ea03138ce298f8… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Tue Jul 27 20:03:47 2010 -0400 urlmon: Implemented canonicalization of query strings. --- dlls/urlmon/tests/uri.c | 210 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/urlmon/uri.c | 74 +++++++++++++++++ 2 files changed, 284 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fdfcfc6aa05ea03138ce2…

1 0