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

Dmitry Timoshkov : ws2_32: Rearrange the code to avoid a needless release_sock_fd().
by Alexandre Julliard 04 Aug '10

04 Aug '10

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

Alexandre Julliard : configure: Check that the cross-compiler that we found actually works.
by Alexandre Julliard 04 Aug '10

04 Aug '10

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

Misha Koshelev : d3dx9: Add _D3DXMESH enumeration.
by Alexandre Julliard 04 Aug '10

04 Aug '10

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

Misha Koshelev : d3dx9: Add stub and tests for D3DXCreateMesh.
by Alexandre Julliard 04 Aug '10

04 Aug '10

Module: wine Branch: master Commit: bf46b4fdfc7deb51be27bae14cce794ffb4d068e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf46b4fdfc7deb51be27bae14… Author: Misha Koshelev <misha680(a)gmail.com> Date: Mon Aug 2 13:26:35 2010 -0500 d3dx9: Add stub and tests for D3DXCreateMesh. --- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/mesh.c | 8 +++ dlls/d3dx9_36/tests/mesh.c | 139 +++++++++++++++++++++++++++++++++++++++++++ include/d3dx9mesh.h | 1 + 4 files changed, 149 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index 622a03c..616b8a4 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -71,7 +71,7 @@ @ stub D3DXCreateKeyframedAnimationSet @ stdcall D3DXCreateLine(ptr ptr) @ stdcall D3DXCreateMatrixStack(long ptr) -@ stub D3DXCreateMesh +@ stdcall D3DXCreateMesh(long long long ptr ptr ptr) @ stub D3DXCreateMeshFVF @ stub D3DXCreateNPatchMesh @ stub D3DXCreatePMeshFromStream diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index bfa1c23..df453f7 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -328,6 +328,14 @@ BOOL WINAPI D3DXSphereBoundProbe(CONST D3DXVECTOR3 *pcenter, FLOAT radius, CONST return TRUE; } +HRESULT WINAPI D3DXCreateMesh(DWORD numfaces, DWORD numvertices, DWORD options, CONST LPD3DVERTEXELEMENT9 *declaration, + LPDIRECT3DDEVICE9 device, LPD3DXMESH *mesh) +{ + FIXME("(%d, %d, %d, %p, %p, %p): stub\n", numfaces, numvertices, options, declaration, device, mesh); + + return E_NOTIMPL; +} + HRESULT WINAPI D3DXCreateBox(LPDIRECT3DDEVICE9 device, FLOAT width, FLOAT height, FLOAT depth, LPD3DXMESH* mesh, LPD3DXBUFFER* adjacency) { diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 87003d1..3920041 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -667,6 +667,144 @@ static void D3DXIntersectTriTest(void) ok( got_res == exp_res, "Expected result = %d, got %d\n",exp_res,got_res); } +static void D3DXCreateMeshTest(void) +{ + HRESULT hr; + HWND wnd; + IDirect3D9 *d3d; + IDirect3DDevice9 *device, *test_device; + D3DPRESENT_PARAMETERS d3dpp; + ID3DXMesh *d3dxmesh; + int i, size; + D3DVERTEXELEMENT9 test_decl[MAX_FVF_DECL_SIZE]; + DWORD fvf, options; + struct mesh mesh; + + static const D3DVERTEXELEMENT9 decl[3] = { + {0, 0, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, + {0, 0xC, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_NORMAL, 0}, + D3DDECL_END(), }; + + hr = D3DXCreateMesh(0, 0, 0, NULL, NULL, NULL); + todo_wine ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); + + hr = D3DXCreateMesh(1, 3, D3DXMESH_MANAGED, (LPD3DVERTEXELEMENT9 *)&decl, NULL, &d3dxmesh); + todo_wine ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); + + wnd = CreateWindow("static", "d3dx9_test", 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL); + if (!wnd) + { + skip("Couldn't create application window\n"); + return; + } + d3d = Direct3DCreate9(D3D_SDK_VERSION); + if (!d3d) + { + skip("Couldn't create IDirect3D9 object\n"); + DestroyWindow(wnd); + return; + } + + ZeroMemory(&d3dpp, sizeof(d3dpp)); + d3dpp.Windowed = TRUE; + d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device); + if (FAILED(hr)) + { + skip("Failed to create IDirect3DDevice9 object %#x\n", hr); + IDirect3D9_Release(d3d); + DestroyWindow(wnd); + return; + } + + hr = D3DXCreateMesh(0, 3, D3DXMESH_MANAGED, (LPD3DVERTEXELEMENT9 *)&decl, device, &d3dxmesh); + todo_wine ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); + + hr = D3DXCreateMesh(1, 0, D3DXMESH_MANAGED, (LPD3DVERTEXELEMENT9 *)&decl, device, &d3dxmesh); + todo_wine ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); + + hr = D3DXCreateMesh(1, 3, 0, (LPD3DVERTEXELEMENT9 *)&decl, device, &d3dxmesh); + todo_wine ok(hr == D3D_OK, "Got result %x, expected %x (D3D_OK)\n", hr, D3D_OK); + + if (hr == D3D_OK) + { + d3dxmesh->lpVtbl->Release(d3dxmesh); + } + + hr = D3DXCreateMesh(1, 3, D3DXMESH_MANAGED, 0, device, &d3dxmesh); + todo_wine ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); + + hr = D3DXCreateMesh(1, 3, D3DXMESH_MANAGED, (LPD3DVERTEXELEMENT9 *)&decl, device, NULL); + todo_wine ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); + + hr = D3DXCreateMesh(1, 3, D3DXMESH_MANAGED, (LPD3DVERTEXELEMENT9 *)&decl, device, &d3dxmesh); + todo_wine ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); + + if (hr == D3D_OK) + { + /* device */ + hr = d3dxmesh->lpVtbl->GetDevice(d3dxmesh, NULL); + ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); + + hr = d3dxmesh->lpVtbl->GetDevice(d3dxmesh, &test_device); + ok(hr == D3D_OK, "Got result %x, expected %x (D3D_OK)\n", hr, D3D_OK); + ok(test_device == device, "Got result %p, expected %p\n", test_device, device); + + if (hr == D3D_OK) + { + IDirect3DDevice9_Release(device); + } + + /* declaration */ + hr = d3dxmesh->lpVtbl->GetDeclaration(d3dxmesh, test_decl); + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); + + if (hr == D3D_OK) + { + size = sizeof(decl) / sizeof(decl[0]); + for (i = 0; i < size - 1; i++) + { + ok(test_decl[i].Stream == decl[i].Stream, "Returned stream %d, expected %d\n", test_decl[i].Stream, decl[i].Stream); + ok(test_decl[i].Type == decl[i].Type, "Returned type %d, expected %d\n", test_decl[i].Type, decl[i].Type); + ok(test_decl[i].Method == decl[i].Method, "Returned method %d, expected %d\n", test_decl[i].Method, decl[i].Method); + ok(test_decl[i].Usage == decl[i].Usage, "Returned usage %d, expected %d\n", test_decl[i].Usage, decl[i].Usage); + ok(test_decl[i].UsageIndex == decl[i].UsageIndex, "Returned usage index %d, expected %d\n", test_decl[i].UsageIndex, decl[i].UsageIndex); + ok(test_decl[i].Offset == decl[i].Offset, "Returned offset %d, expected %d\n", decl[1].Offset, decl[i].Offset); + } + ok(decl[size-1].Stream == 0xFF, "Returned too long vertex declaration\n"); /* end element */ + } + + /* FVF */ + fvf = d3dxmesh->lpVtbl->GetFVF(d3dxmesh); + ok(fvf == (D3DFVF_XYZ | D3DFVF_NORMAL), "Got result %x, expected %x (D3DFVF_XYZ | D3DFVF_NORMAL)\n", fvf, D3DFVF_XYZ | D3DFVF_NORMAL); + + /* options */ + options = d3dxmesh->lpVtbl->GetOptions(d3dxmesh); + ok(options == D3DXMESH_MANAGED, "Got result %x, expected %x (D3DXMESH_MANAGED)\n", options, D3DXMESH_MANAGED); + + /* rest */ + if (!new_mesh(&mesh, 3, 1)) + { + skip("Couldn't create mesh\n"); + } + else + { + memset(mesh.vertices, 0, mesh.number_of_vertices * sizeof(*mesh.vertices)); + memset(mesh.faces, 0, mesh.number_of_faces * sizeof(*mesh.faces)); + + compare_mesh("createmeshfvf", d3dxmesh, &mesh); + + free_mesh(&mesh); + } + + d3dxmesh->lpVtbl->Release(d3dxmesh); + } + + IDirect3DDevice9_Release(device); + IDirect3D9_Release(d3d); + DestroyWindow(wnd); +} + struct sincos_table { float *sin; @@ -1031,6 +1169,7 @@ START_TEST(mesh) D3DXDeclaratorFromFVFTest(); D3DXGetFVFVertexSizeTest(); D3DXIntersectTriTest(); + D3DXCreateMeshTest(); D3DXCreateSphereTest(); test_get_decl_vertex_size(); } diff --git a/include/d3dx9mesh.h b/include/d3dx9mesh.h index 20d285c..063a587 100644 --- a/include/d3dx9mesh.h +++ b/include/d3dx9mesh.h @@ -150,6 +150,7 @@ DECLARE_INTERFACE_(ID3DXMesh, ID3DXBaseMesh) extern "C" { #endif +HRESULT WINAPI D3DXCreateMesh(DWORD, DWORD, DWORD, CONST LPD3DVERTEXELEMENT9 *, LPDIRECT3DDEVICE9, LPD3DXMESH *); HRESULT WINAPI D3DXCreateBuffer(DWORD, LPD3DXBUFFER*); UINT WINAPI D3DXGetDeclVertexSize(const D3DVERTEXELEMENT9 *decl, DWORD stream_idx); UINT WINAPI D3DXGetFVFVertexSize(DWORD);

1 0

Alexander Nicolaysen Sørnes : mshtml: Send more informative messages to OleInPlaceFrame.
by Alexandre Julliard 04 Aug '10

04 Aug '10

Module: wine Branch: master Commit: aa733bedd54be8c7ea7ea076ca208a5afbf831e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa733bedd54be8c7ea7ea076c… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Fri Jul 30 21:56:05 2010 +0200 mshtml: Send more informative messages to OleInPlaceFrame. --- dlls/mshtml/En.rc | 6 +++++ dlls/mshtml/main.c | 49 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/nsevents.c | 6 +--- dlls/mshtml/persist.c | 40 ++++++++++++++++++++------------- dlls/mshtml/resource.h | 4 +++ 6 files changed, 86 insertions(+), 20 deletions(-) diff --git a/dlls/mshtml/En.rc b/dlls/mshtml/En.rc index e44b373..ba55bf7 100644 --- a/dlls/mshtml/En.rc +++ b/dlls/mshtml/En.rc @@ -20,6 +20,12 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT + STRINGTABLE + { + IDS_STATUS_DONE "Done" + IDS_STATUS_DOWNLOADINGFROM "Downloading from %s..." +} + STRINGTABLE { IDS_HTMLDISABLED "HTML rendering is currently disabled." diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index f54c6e3..d61c1f4 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -40,6 +40,7 @@ #define INIT_GUID #include "mshtml_private.h" +#include "resource.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml); @@ -48,6 +49,7 @@ DWORD mshtml_tls = TLS_OUT_OF_INDEXES; static HINSTANCE shdoclc = NULL; static HDC display_dc; +static LPWSTR status_strings[NUM_STATUS_STRINGS]; static void thread_detach(void) { @@ -63,6 +65,13 @@ static void thread_detach(void) heap_free(thread_data); } +void free_strings(void) +{ + int i; + for(i = 0; i < NUM_STATUS_STRINGS; i++) + heap_free(status_strings[i]); +} + static void process_detach(void) { close_gecko(); @@ -74,6 +83,46 @@ static void process_detach(void) TlsFree(mshtml_tls); if(display_dc) DeleteObject(display_dc); + + free_strings(); +} + +void set_statustext(HTMLDocumentObj* doc, INT id, LPCWSTR arg) +{ + int index = id - IDS_STATUS_DONE; + LPWSTR p = status_strings[index]; + + if(!doc->frame) + return; + + if(!p) + { + DWORD len = 255; + p = heap_alloc(len * sizeof(WCHAR)); + len = LoadStringW(hInst, id, p, len); + len++; + p = heap_realloc(p, len * sizeof(WCHAR)); + if(InterlockedCompareExchangePointer((void**)&status_strings[index], p, NULL)) + { + heap_free(p); + p = status_strings[index]; + } + } + + if(arg) + { + DWORD len = lstrlenW(p) + lstrlenW(arg) - 1; + LPWSTR buf = heap_alloc(len * sizeof(WCHAR)); + + snprintfW(buf, len - 1, p, arg); + + p = buf; + } + + IOleInPlaceFrame_SetStatusText(doc->frame, p); + + if(arg) + heap_free(p); } HINSTANCE get_shdoclc(void) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 2db2410..ee92806 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1024,5 +1024,6 @@ static inline void windowref_release(windowref_t *ref) HDC get_display_dc(void); HINSTANCE get_shdoclc(void); +void set_statustext(HTMLDocumentObj*,INT,LPCWSTR); extern HINSTANCE hInst; diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index 6da5ded..8dda1e5 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -34,6 +34,7 @@ #include "mshtml_private.h" #include "htmlevent.h" +#include "resource.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml); @@ -239,10 +240,7 @@ static nsresult NSAPI handle_load(nsIDOMEventListener *iface, nsIDOMEvent *event if(doc_obj->view_sink) IAdviseSink_OnViewChange(doc_obj->view_sink, DVASPECT_CONTENT, -1); - if(doc_obj->frame) { - static const WCHAR wszDone[] = {'D','o','n','e',0}; - IOleInPlaceFrame_SetStatusText(doc_obj->frame, wszDone); - } + set_statustext(doc_obj, IDS_STATUS_DONE, NULL); update_title(doc_obj); } diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 44ccd0f..76e3773 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -37,6 +37,7 @@ #include "mshtml_private.h" #include "htmlevent.h" +#include "resource.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml); @@ -44,6 +45,7 @@ typedef struct { task_t header; HTMLDocumentObj *doc; BOOL set_download; + LPOLESTR url; } download_proc_task_t; static BOOL use_gecko_script(LPCWSTR url) @@ -134,8 +136,8 @@ static void set_downloading_proc(task_t *_task) TRACE("(%p)\n", doc); - if(doc->frame) - IOleInPlaceFrame_SetStatusText(doc->frame, NULL /* FIXME */); + set_statustext(doc, IDS_STATUS_DOWNLOADINGFROM, task->url); + CoTaskMemFree(task->url); if(!doc->client) return; @@ -243,26 +245,31 @@ HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, nsChannel } hres = create_doc_uri(This->window, url, &nsuri); - CoTaskMemFree(url); - if(FAILED(hres)) - return hres; - if(async_bsc) { - bscallback = async_bsc; - }else { - hres = create_channelbsc(mon, NULL, NULL, 0, &bscallback); - if(FAILED(hres)) - return hres; + if(SUCCEEDED(hres)) + { + if(async_bsc) { + bscallback = async_bsc; + }else { + hres = create_channelbsc(mon, NULL, NULL, 0, &bscallback); + } } - hres = load_nsuri(This->window, nsuri, bscallback, LOAD_INITIAL_DOCUMENT_URI); - nsISupports_Release((nsISupports*)nsuri); /* FIXME */ if(SUCCEEDED(hres)) - set_window_bscallback(This->window, bscallback); - if(bscallback != async_bsc) - IUnknown_Release((IUnknown*)bscallback); + { + hres = load_nsuri(This->window, nsuri, bscallback, LOAD_INITIAL_DOCUMENT_URI); + nsISupports_Release((nsISupports*)nsuri); /* FIXME */ + if(SUCCEEDED(hres)) + set_window_bscallback(This->window, bscallback); + if(bscallback != async_bsc) + IUnknown_Release((IUnknown*)bscallback); + } + if(FAILED(hres)) + { + CoTaskMemFree(url); return hres; + } HTMLDocument_LockContainer(This->doc_obj, TRUE); @@ -275,6 +282,7 @@ HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, nsChannel download_task = heap_alloc(sizeof(download_proc_task_t)); download_task->doc = This->doc_obj; download_task->set_download = set_download; + download_task->url = url; push_task(&download_task->header, set_downloading_proc, This->doc_obj->basedoc.task_magic); return S_OK; diff --git a/dlls/mshtml/resource.h b/dlls/mshtml/resource.h index 1e92637..fd69bfd 100644 --- a/dlls/mshtml/resource.h +++ b/dlls/mshtml/resource.h @@ -25,6 +25,10 @@ #define IDS_DOWNLOADING 7502 #define IDS_INSTALLING 7503 +#define NUM_STATUS_STRINGS 2 +#define IDS_STATUS_DOWNLOADINGFROM 7550 +#define IDS_STATUS_DONE 7551 + #define ID_DWL_DIALOG 7600 #define ID_DWL_PROGRESS 7601 #define ID_DWL_INSTALL 7602

1 0

Henri Verbeet : wined3d: Replace color_fill_fbo() with device_clear_render_targets().
by Alexandre Julliard 04 Aug '10

04 Aug '10

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

Henri Verbeet : wined3d: Cleanup Get/SetRenderTarget().
by Alexandre Julliard 04 Aug '10

04 Aug '10

Module: wine Branch: master Commit: 009cd78fa448ede597ecae18df8878079ae1695e URL: http://source.winehq.org/git/wine.git/?a=commit;h=009cd78fa448ede597ecae18d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 4 11:10:24 2010 +0200 wined3d: Cleanup Get/SetRenderTarget(). --- dlls/wined3d/device.c | 107 ++++++++++++++++++++++++++----------------------- 1 files changed, 57 insertions(+), 50 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index dabc451..f9e65d7 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5571,21 +5571,25 @@ static void WINAPI IWineD3DDeviceImpl_ClearRendertargetView(IWineD3DDevice *ifac } /* rendertarget and depth stencil functions */ -static HRESULT WINAPI IWineD3DDeviceImpl_GetRenderTarget(IWineD3DDevice* iface,DWORD RenderTargetIndex, IWineD3DSurface **ppRenderTarget) { - IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; +static HRESULT WINAPI IWineD3DDeviceImpl_GetRenderTarget(IWineD3DDevice *iface, + DWORD render_target_idx, IWineD3DSurface **render_target) +{ + IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *)iface; - if (RenderTargetIndex >= This->adapter->gl_info.limits.buffers) + TRACE("iface %p, render_target_idx %u, render_target %p.\n", + iface, render_target_idx, render_target); + + if (render_target_idx >= device->adapter->gl_info.limits.buffers) { - ERR("(%p) : Only %d render targets are supported.\n", - This, This->adapter->gl_info.limits.buffers); + WARN("Only %u render targets are supported.\n", device->adapter->gl_info.limits.buffers); return WINED3DERR_INVALIDCALL; } - *ppRenderTarget = (IWineD3DSurface *)This->render_targets[RenderTargetIndex]; - TRACE("(%p) : RenderTarget %d Index returning %p\n", This, RenderTargetIndex, *ppRenderTarget); - /* Note inc ref on returned surface */ - if(*ppRenderTarget != NULL) - IWineD3DSurface_AddRef(*ppRenderTarget); + *render_target = (IWineD3DSurface *)device->render_targets[render_target_idx]; + if (*render_target) IWineD3DSurface_AddRef(*render_target); + + TRACE("Returning render target %p.\n", *render_target); + return WINED3D_OK; } @@ -5698,63 +5702,66 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetDepthStencilSurface(IWineD3DDevice } } -static HRESULT WINAPI IWineD3DDeviceImpl_SetRenderTarget(IWineD3DDevice *iface, DWORD RenderTargetIndex, IWineD3DSurface *pRenderTarget, - BOOL set_viewport) { - IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; +static HRESULT WINAPI IWineD3DDeviceImpl_SetRenderTarget(IWineD3DDevice *iface, + DWORD render_target_idx, IWineD3DSurface *render_target, BOOL set_viewport) +{ + IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *)iface; - TRACE("(%p) : Setting rendertarget %d to %p\n", This, RenderTargetIndex, pRenderTarget); + TRACE("iface %p, render_target_idx %u, render_target %p, set_viewport %#x.\n", + iface, render_target_idx, render_target, set_viewport); - if (RenderTargetIndex >= This->adapter->gl_info.limits.buffers) + if (render_target_idx >= device->adapter->gl_info.limits.buffers) { - WARN("(%p) : Unsupported target %u set, returning WINED3DERR_INVALIDCALL(only %u supported)\n", - This, RenderTargetIndex, This->adapter->gl_info.limits.buffers); + WARN("Only %u render targets are supported.\n", device->adapter->gl_info.limits.buffers); return WINED3DERR_INVALIDCALL; } + if (render_target == (IWineD3DSurface *)device->render_targets[render_target_idx]) + { + TRACE("Trying to do a NOP SetRenderTarget operation.\n"); + return WINED3D_OK; + } + /* Render target 0 can't be set to NULL. */ - if (!pRenderTarget && !RenderTargetIndex) + if (!render_target && !render_target_idx) { WARN("Trying to set render target 0 to NULL.\n"); return WINED3DERR_INVALIDCALL; } - if (pRenderTarget && !(((IWineD3DSurfaceImpl *)pRenderTarget)->resource.usage & WINED3DUSAGE_RENDERTARGET)) { - FIXME("(%p)Trying to set the render target to a surface(%p) that wasn't created with a usage of WINED3DUSAGE_RENDERTARGET\n",This ,pRenderTarget); + if (render_target && !(((IWineD3DSurfaceImpl *)render_target)->resource.usage & WINED3DUSAGE_RENDERTARGET)) + { + FIXME("Surface %p doesn't have render target usage.\n", render_target); return WINED3DERR_INVALIDCALL; } - /* If we are trying to set what we already have, don't bother */ - if (pRenderTarget == (IWineD3DSurface *)This->render_targets[RenderTargetIndex]) + if (render_target) + IWineD3DSurface_AddRef(render_target); + if (device->render_targets[render_target_idx]) + IWineD3DSurface_Release((IWineD3DSurface *)device->render_targets[render_target_idx]); + device->render_targets[render_target_idx] = (IWineD3DSurfaceImpl *)render_target; + + /* Render target 0 is special. */ + if (!render_target_idx && set_viewport) { - TRACE("Trying to do a NOP SetRenderTarget operation\n"); - return WINED3D_OK; - } - if (pRenderTarget) - IWineD3DSurface_AddRef(pRenderTarget); - if (This->render_targets[RenderTargetIndex]) - IWineD3DSurface_Release((IWineD3DSurface *)This->render_targets[RenderTargetIndex]); - This->render_targets[RenderTargetIndex] = (IWineD3DSurfaceImpl *)pRenderTarget; - - /* Render target 0 is special */ - if(RenderTargetIndex == 0 && set_viewport) { - /* Finally, reset the viewport and scissor rect as the MSDN states. - * Tests show that stateblock recording is ignored, the change goes - * directly into the primary stateblock. - */ - This->stateBlock->viewport.Height = This->render_targets[0]->currentDesc.Height; - This->stateBlock->viewport.Width = This->render_targets[0]->currentDesc.Width; - This->stateBlock->viewport.X = 0; - This->stateBlock->viewport.Y = 0; - This->stateBlock->viewport.MaxZ = 1.0f; - This->stateBlock->viewport.MinZ = 0.0f; - IWineD3DDeviceImpl_MarkStateDirty(This, STATE_VIEWPORT); - - This->stateBlock->scissorRect.top = 0; - This->stateBlock->scissorRect.left = 0; - This->stateBlock->scissorRect.right = This->stateBlock->viewport.Width; - This->stateBlock->scissorRect.bottom = This->stateBlock->viewport.Height; - IWineD3DDeviceImpl_MarkStateDirty(This, STATE_SCISSORRECT); + /* Set the viewport and scissor rectangles, if requested. Tests show + * that stateblock recording is ignored, the change goes directly + * into the primary stateblock. */ + device->stateBlock->viewport.Height = device->render_targets[0]->currentDesc.Height; + device->stateBlock->viewport.Width = device->render_targets[0]->currentDesc.Width; + device->stateBlock->viewport.X = 0; + device->stateBlock->viewport.Y = 0; + device->stateBlock->viewport.MaxZ = 1.0f; + device->stateBlock->viewport.MinZ = 0.0f; + IWineD3DDeviceImpl_MarkStateDirty(device, STATE_VIEWPORT); + + device->stateBlock->scissorRect.top = 0; + device->stateBlock->scissorRect.left = 0; + device->stateBlock->scissorRect.right = device->stateBlock->viewport.Width; + device->stateBlock->scissorRect.bottom = device->stateBlock->viewport.Height; + IWineD3DDeviceImpl_MarkStateDirty(device, STATE_SCISSORRECT); } + return WINED3D_OK; }

1 0

Jacek Caban : mshtml: Store request headers in nsChannel if possible.
by Alexandre Julliard 04 Aug '10

04 Aug '10

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

Jacek Caban : mshtml: Added nsIChannel::GetRequestHeader implementation.
by Alexandre Julliard 04 Aug '10

04 Aug '10

Module: wine Branch: master Commit: 753ecebe9b74b30338add85b8c6f210d0889cb95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=753ecebe9b74b30338add85b8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 3 21:39:49 2010 +0200 mshtml: Added nsIChannel::GetRequestHeader implementation. --- dlls/mshtml/nsio.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 09e125f..019bc61 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1051,9 +1051,9 @@ static nsresult NSAPI nsChannel_GetRequestHeader(nsIHttpChannel *iface, { nsChannel *This = NSCHANNEL_THIS(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_nsacstr(aHeader), _retval); + TRACE("(%p)->(%s %p)\n", This, debugstr_nsacstr(aHeader), _retval); - return NS_ERROR_NOT_IMPLEMENTED; + return get_channel_http_header(&This->request_headers, aHeader, _retval); } static nsresult NSAPI nsChannel_SetRequestHeader(nsIHttpChannel *iface,

1 0

Jacek Caban : mshtml: Added nsIChannel::SetRequestHeader implementation.
by Alexandre Julliard 04 Aug '10

04 Aug '10

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