May 2007 - Wine-Commits - list.winehq.org

Jacek Caban : mshtml: Move AddRequest call to the separated function.
by Alexandre Julliard May 11, 2007

May 11, 2007

Module: wine Branch: master Commit: 2dd9fad610ea4197c3b71352c9cdaa5db4d8daac URL: http://source.winehq.org/git/wine.git/?a=commit;h=2dd9fad610ea4197c3b71352c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 11 13:15:18 2007 +0200 mshtml: Move AddRequest call to the separated function. --- dlls/mshtml/navigate.c | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 4ee33aa..69e7b8d 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -237,6 +237,17 @@ static HRESULT read_stream_data(BSCallback *This, IStream *stream) return S_OK; } +static void add_nsrequest(BSCallback *This) +{ + if(This->nschannel && This->nschannel->load_group) { + nsresult nsres = nsILoadGroup_AddRequest(This->nschannel->load_group, + (nsIRequest*)NSCHANNEL(This->nschannel), This->nscontext); + + if(NS_FAILED(nsres)) + ERR("AddRequest failed:%08x\n", nsres); + } +} + #define STATUSCLB_THIS(iface) DEFINE_THIS(BSCallback, BindStatusCallback, iface) static HRESULT WINAPI BindStatusCallback_QueryInterface(IBindStatusCallback *iface, @@ -323,13 +334,7 @@ static HRESULT WINAPI BindStatusCallback_OnStartBinding(IBindStatusCallback *ifa IBinding_AddRef(pbind); This->binding = pbind; - if(This->nschannel && This->nschannel->load_group) { - nsresult nsres = nsILoadGroup_AddRequest(This->nschannel->load_group, - (nsIRequest*)NSCHANNEL(This->nschannel), This->nscontext); - - if(NS_FAILED(nsres)) - ERR("AddRequest failed:%08x\n", nsres); - } + add_nsrequest(This); return S_OK; }

1 0

Jacek Caban : mshtml: Added IPersistStreamInit::Load implementation.
by Alexandre Julliard May 11, 2007

May 11, 2007

Module: wine Branch: master Commit: 920f628c6e6934131608db98388ad4f06ac8b862 URL: http://source.winehq.org/git/wine.git/?a=commit;h=920f628c6e6934131608db983… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 11 13:17:41 2007 +0200 mshtml: Added IPersistStreamInit::Load implementation. --- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/navigate.c | 19 ++++++++++++++++++- dlls/mshtml/persist.c | 21 +++++++++++++++++++-- 3 files changed, 38 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 432df7e..b2a7c69 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -347,6 +347,7 @@ void nsnode_to_nsstring(nsIDOMNode*,nsAString*); BSCallback *create_bscallback(IMoniker*); HRESULT start_binding(BSCallback*); +HRESULT load_stream(BSCallback*,IStream*); void set_document_bscallback(HTMLDocument*,BSCallback*); IHlink *Hlink_Create(void); diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 69e7b8d..bcafb6c 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1,5 +1,5 @@ /* - * Copyright 2006 Jacek Caban for CodeWeavers + * Copyright 2006-2007 Jacek Caban for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -817,3 +817,20 @@ void set_document_bscallback(HTMLDocument *doc, BSCallback *callback) callback->doc = doc; } } + +HRESULT load_stream(BSCallback *bscallback, IStream *stream) +{ + HRESULT hres; + + const char text_html[] = "text/html"; + + add_nsrequest(bscallback); + + bscallback->nschannel->content = mshtml_alloc(sizeof(text_html)); + memcpy(bscallback->nschannel->content, text_html, sizeof(text_html)); + + hres = read_stream_data(bscallback, stream); + IBindStatusCallback_OnStopBinding(STATUSCLB(bscallback), hres, ERROR_SUCCESS); + + return hres; +} diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index a2b6f73..397a307 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -558,8 +558,25 @@ static HRESULT WINAPI PersistStreamInit_IsDirty(IPersistStreamInit *iface) static HRESULT WINAPI PersistStreamInit_Load(IPersistStreamInit *iface, LPSTREAM pStm) { HTMLDocument *This = PERSTRINIT_THIS(iface); - FIXME("(%p)->(%p)\n", This, pStm); - return E_NOTIMPL; + IMoniker *mon; + HRESULT hres; + + static const WCHAR about_blankW[] = {'a','b','o','u','t',':','b','l','a','n','k',0}; + + TRACE("(%p)->(%p)\n", This, pStm); + + hres = CreateURLMoniker(NULL, about_blankW, &mon); + if(FAILED(hres)) { + WARN("CreateURLMoniker failed: %08x\n", hres); + return hres; + } + + hres = set_moniker(This, mon, NULL); + IMoniker_Release(mon); + if(FAILED(hres)) + return hres; + + return load_stream(This->bscallback, pStm); } static HRESULT WINAPI PersistStreamInit_Save(IPersistStreamInit *iface, LPSTREAM pStm,

1 0

Jacek Caban : mshtml: Don't crash in OnStopBinding if This->binding is null .
by Alexandre Julliard May 11, 2007

May 11, 2007

Module: wine Branch: master Commit: 94a264d0beef21f51655e3cacebc699e74ee4d7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=94a264d0beef21f51655e3cac… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 11 13:14:14 2007 +0200 mshtml: Don't crash in OnStopBinding if This->binding is null. --- dlls/mshtml/navigate.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 6ab6bc4..4ee33aa 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -380,8 +380,10 @@ static HRESULT WINAPI BindStatusCallback_OnStopBinding(IBindStatusCallback *ifac TRACE("(%p)->(%08x %s)\n", This, hresult, debugstr_w(szError)); - IBinding_Release(This->binding); - This->binding = NULL; + if(This->binding) { + IBinding_Release(This->binding); + This->binding = NULL; + } if(This->nslistener) { nsIStreamListener_OnStopRequest(This->nslistener, (nsIRequest*)NSCHANNEL(This->nschannel),

1 0

Jacek Caban : mshtml: Split IPersistMoniker::Load.
by Alexandre Julliard May 11, 2007

May 11, 2007

Module: wine Branch: master Commit: 09adb8cf051ac76df81260afd68a99974c2bbd6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=09adb8cf051ac76df81260afd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 11 13:16:15 2007 +0200 mshtml: Split IPersistMoniker::Load. --- dlls/mshtml/persist.c | 192 ++++++++++++++++++++++++++----------------------- 1 files changed, 101 insertions(+), 91 deletions(-) diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 6b9ef8d..a2b6f73 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -39,86 +39,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); -static HRESULT get_doc_string(HTMLDocument *This, char **str, DWORD *len) -{ - nsIDOMDocument *nsdoc; - nsIDOMNode *nsnode; - LPCWSTR strw; - nsAString nsstr; - nsresult nsres; - - if(!This->nscontainer) { - WARN("no nscontainer, returning NULL\n"); - return S_OK; - } - - nsres = nsIWebNavigation_GetDocument(This->nscontainer->navigation, &nsdoc); - if(NS_FAILED(nsres)) { - ERR("GetDocument failed: %08x\n", nsres); - return E_FAIL; - } - - nsres = nsIDOMDocument_QueryInterface(nsdoc, &IID_nsIDOMNode, (void**)&nsnode); - nsIDOMDocument_Release(nsdoc); - if(NS_FAILED(nsres)) { - ERR("Could not get nsIDOMNode failed: %08x\n", nsres); - return E_FAIL; - } - - nsAString_Init(&nsstr, NULL); - nsnode_to_nsstring(nsnode, &nsstr); - nsIDOMNode_Release(nsnode); - - nsAString_GetData(&nsstr, &strw, NULL); - TRACE("%s\n", debugstr_w(strw)); - - *len = WideCharToMultiByte(CP_ACP, 0, strw, -1, NULL, 0, NULL, NULL); - *str = mshtml_alloc(*len); - WideCharToMultiByte(CP_ACP, 0, strw, -1, *str, *len, NULL, NULL); - - nsAString_Finish(&nsstr); - - return S_OK; -} - -/********************************************************** - * IPersistMoniker implementation - */ - -#define PERSISTMON_THIS(iface) DEFINE_THIS(HTMLDocument, PersistMoniker, iface) - -static HRESULT WINAPI PersistMoniker_QueryInterface(IPersistMoniker *iface, REFIID riid, - void **ppvObject) -{ - HTMLDocument *This = PERSISTMON_THIS(iface); - return IHTMLDocument2_QueryInterface(HTMLDOC(This), riid, ppvObject); -} - -static ULONG WINAPI PersistMoniker_AddRef(IPersistMoniker *iface) -{ - HTMLDocument *This = PERSISTMON_THIS(iface); - return IHTMLDocument2_AddRef(HTMLDOC(This)); -} - -static ULONG WINAPI PersistMoniker_Release(IPersistMoniker *iface) -{ - HTMLDocument *This = PERSISTMON_THIS(iface); - return IHTMLDocument2_Release(HTMLDOC(This)); -} - -static HRESULT WINAPI PersistMoniker_GetClassID(IPersistMoniker *iface, CLSID *pClassID) -{ - HTMLDocument *This = PERSISTMON_THIS(iface); - return IPersist_GetClassID(PERSIST(This), pClassID); -} - -static HRESULT WINAPI PersistMoniker_IsDirty(IPersistMoniker *iface) -{ - HTMLDocument *This = PERSISTMON_THIS(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; -} - static nsIInputStream *get_post_data_stream(IBindCtx *bctx) { nsIInputStream *ret = NULL; @@ -193,18 +113,14 @@ static nsIInputStream *get_post_data_stream(IBindCtx *bctx) return ret; } -static HRESULT WINAPI PersistMoniker_Load(IPersistMoniker *iface, BOOL fFullyAvailable, - IMoniker *pimkName, LPBC pibc, DWORD grfMode) +static HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc) { - HTMLDocument *This = PERSISTMON_THIS(iface); BSCallback *bscallback; LPOLESTR url = NULL; task_t *task; HRESULT hres; nsresult nsres; - TRACE("(%p)->(%x %p %p %08x)\n", This, fFullyAvailable, pimkName, pibc, grfMode); - if(pibc) { IUnknown *unk = NULL; @@ -240,7 +156,7 @@ static HRESULT WINAPI PersistMoniker_Load(IPersistMoniker *iface, BOOL fFullyAva HTMLDocument_LockContainer(This, TRUE); - hres = IMoniker_GetDisplayName(pimkName, pibc, NULL, &url); + hres = IMoniker_GetDisplayName(mon, pibc, NULL, &url); if(FAILED(hres)) { WARN("GetDiaplayName failed: %08x\n", hres); return hres; @@ -285,7 +201,7 @@ static HRESULT WINAPI PersistMoniker_Load(IPersistMoniker *iface, BOOL fFullyAva } } - bscallback = create_bscallback(pimkName); + bscallback = create_bscallback(mon); if(This->frame) { task = mshtml_alloc(sizeof(task_t)); @@ -328,12 +244,106 @@ static HRESULT WINAPI PersistMoniker_Load(IPersistMoniker *iface, BOOL fFullyAva } set_document_bscallback(This, bscallback); - hres = start_binding(bscallback); - IBindStatusCallback_Release(STATUSCLB(bscallback)); CoTaskMemFree(url); - return hres; + return S_OK; +} + +static HRESULT get_doc_string(HTMLDocument *This, char **str, DWORD *len) +{ + nsIDOMDocument *nsdoc; + nsIDOMNode *nsnode; + LPCWSTR strw; + nsAString nsstr; + nsresult nsres; + + if(!This->nscontainer) { + WARN("no nscontainer, returning NULL\n"); + return S_OK; + } + + nsres = nsIWebNavigation_GetDocument(This->nscontainer->navigation, &nsdoc); + if(NS_FAILED(nsres)) { + ERR("GetDocument failed: %08x\n", nsres); + return E_FAIL; + } + + nsres = nsIDOMDocument_QueryInterface(nsdoc, &IID_nsIDOMNode, (void**)&nsnode); + nsIDOMDocument_Release(nsdoc); + if(NS_FAILED(nsres)) { + ERR("Could not get nsIDOMNode failed: %08x\n", nsres); + return E_FAIL; + } + + nsAString_Init(&nsstr, NULL); + nsnode_to_nsstring(nsnode, &nsstr); + nsIDOMNode_Release(nsnode); + + nsAString_GetData(&nsstr, &strw, NULL); + TRACE("%s\n", debugstr_w(strw)); + + *len = WideCharToMultiByte(CP_ACP, 0, strw, -1, NULL, 0, NULL, NULL); + *str = mshtml_alloc(*len); + WideCharToMultiByte(CP_ACP, 0, strw, -1, *str, *len, NULL, NULL); + + nsAString_Finish(&nsstr); + + return S_OK; +} + + +/********************************************************** + * IPersistMoniker implementation + */ + +#define PERSISTMON_THIS(iface) DEFINE_THIS(HTMLDocument, PersistMoniker, iface) + +static HRESULT WINAPI PersistMoniker_QueryInterface(IPersistMoniker *iface, REFIID riid, + void **ppvObject) +{ + HTMLDocument *This = PERSISTMON_THIS(iface); + return IHTMLDocument2_QueryInterface(HTMLDOC(This), riid, ppvObject); +} + +static ULONG WINAPI PersistMoniker_AddRef(IPersistMoniker *iface) +{ + HTMLDocument *This = PERSISTMON_THIS(iface); + return IHTMLDocument2_AddRef(HTMLDOC(This)); +} + +static ULONG WINAPI PersistMoniker_Release(IPersistMoniker *iface) +{ + HTMLDocument *This = PERSISTMON_THIS(iface); + return IHTMLDocument2_Release(HTMLDOC(This)); +} + +static HRESULT WINAPI PersistMoniker_GetClassID(IPersistMoniker *iface, CLSID *pClassID) +{ + HTMLDocument *This = PERSISTMON_THIS(iface); + return IPersist_GetClassID(PERSIST(This), pClassID); +} + +static HRESULT WINAPI PersistMoniker_IsDirty(IPersistMoniker *iface) +{ + HTMLDocument *This = PERSISTMON_THIS(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI PersistMoniker_Load(IPersistMoniker *iface, BOOL fFullyAvailable, + IMoniker *pimkName, LPBC pibc, DWORD grfMode) +{ + HTMLDocument *This = PERSISTMON_THIS(iface); + HRESULT hres; + + TRACE("(%p)->(%x %p %p %08x)\n", This, fFullyAvailable, pimkName, pibc, grfMode); + + hres = set_moniker(This, pimkName, pibc); + if(FAILED(hres)) + return hres; + + return start_binding(This->bscallback); } static HRESULT WINAPI PersistMoniker_Save(IPersistMoniker *iface, IMoniker *pimkName, @@ -529,7 +539,7 @@ static ULONG WINAPI PersistStreamInit_AddRef(IPersistStreamInit *iface) static ULONG WINAPI PersistStreamInit_Release(IPersistStreamInit *iface) { HTMLDocument *This = PERSTRINIT_THIS(iface); - return IHTMLDocument2_AddRef(HTMLDOC(This)); + return IHTMLDocument2_Release(HTMLDOC(This)); } static HRESULT WINAPI PersistStreamInit_GetClassID(IPersistStreamInit *iface, CLSID *pClassID)

1 0

H. Verbeet : wined3d: WINED3DSIO_POW should use the absolute value of the first source register.
by Alexandre Julliard May 11, 2007

May 11, 2007

Module: wine Branch: master Commit: c3c57247899fbc31b19293f63625b89f46e2be7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3c57247899fbc31b19293f63… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Fri May 11 12:12:40 2007 +0200 wined3d: WINED3DSIO_POW should use the absolute value of the first source register. --- dlls/wined3d/glsl_shader.c | 24 +++++++++++++++++++++++- dlls/wined3d/pixelshader.c | 2 +- dlls/wined3d/vertexshader.c | 2 +- dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 26 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 9ff5378..6636892 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -987,6 +987,29 @@ void shader_glsl_cross(SHADER_OPCODE_ARG *arg) { shader_addline(arg->buffer, "cross(%s, %s).%s);\n", src0_param.param_str, src1_param.param_str, dst_mask); } +/* Process the WINED3DSIO_POW instruction in GLSL (dst = |src0|^src1) + * Src0 and src1 are scalars. Note that D3D uses the absolute of src0, while + * GLSL uses the value as-is. */ +void shader_glsl_pow(SHADER_OPCODE_ARG *arg) { + SHADER_BUFFER *buffer = arg->buffer; + glsl_src_param_t src0_param; + glsl_src_param_t src1_param; + DWORD dst_write_mask; + size_t dst_size; + + dst_write_mask = shader_glsl_append_dst(buffer, arg); + dst_size = shader_glsl_get_write_mask_size(dst_write_mask); + + shader_glsl_add_src_param(arg, arg->src[0], arg->src_addr[0], WINED3DSP_WRITEMASK_0, &src0_param); + shader_glsl_add_src_param(arg, arg->src[1], arg->src_addr[1], WINED3DSP_WRITEMASK_0, &src1_param); + + if (dst_size > 1) { + shader_addline(buffer, "vec%d(pow(abs(%s), %s)));\n", dst_size, src0_param.param_str, src1_param.param_str); + } else { + shader_addline(buffer, "pow(abs(%s), %s));\n", src0_param.param_str, src1_param.param_str); + } +} + /* Map the opcode 1-to-1 to the GL code (arg->dst = instruction(src0, src1, ...) */ void shader_glsl_map2gl(SHADER_OPCODE_ARG* arg) { CONST SHADER_OPCODE* curOpcode = arg->opcode; @@ -1005,7 +1028,6 @@ void shader_glsl_map2gl(SHADER_OPCODE_ARG* arg) { case WINED3DSIO_RSQ: instruction = "inversesqrt"; break; case WINED3DSIO_ABS: instruction = "abs"; break; case WINED3DSIO_FRC: instruction = "fract"; break; - case WINED3DSIO_POW: instruction = "pow"; break; case WINED3DSIO_NRM: instruction = "normalize"; break; case WINED3DSIO_LOGP: case WINED3DSIO_LOG: instruction = "log2"; break; diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 6627c06..1cab706 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -183,7 +183,7 @@ CONST SHADER_OPCODE IWineD3DPixelShaderImpl_shader_ins[] = { {WINED3DSIO_FRC, "frc", "FRC", 1, 2, pshader_hw_map2gl, shader_glsl_map2gl, 0, 0}, {WINED3DSIO_CND, "cnd", NULL, 1, 4, pshader_hw_cnd, shader_glsl_cnd, WINED3DPS_VERSION(1,1), WINED3DPS_VERSION(1,4)}, {WINED3DSIO_CMP, "cmp", NULL, 1, 4, pshader_hw_cmp, shader_glsl_cmp, WINED3DPS_VERSION(1,2), WINED3DPS_VERSION(3,0)}, - {WINED3DSIO_POW, "pow", "POW", 1, 3, NULL, shader_glsl_map2gl, 0, 0}, + {WINED3DSIO_POW, "pow", "POW", 1, 3, NULL, shader_glsl_pow, 0, 0}, {WINED3DSIO_CRS, "crs", "XPS", 1, 3, NULL, shader_glsl_cross, 0, 0}, /* TODO: xyz normalise can be performed as VS_ARB using one temporary register, DP3 tmp , vec, vec; diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index 56a4354..0b9d4cf 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -108,7 +108,7 @@ CONST SHADER_OPCODE IWineD3DVertexShaderImpl_shader_ins[] = { {WINED3DSIO_DST, "dst", "DST", 1, 3, vshader_hw_map2gl, shader_glsl_dst, 0, 0}, {WINED3DSIO_LRP, "lrp", "LRP", 1, 4, NULL, shader_glsl_lrp, 0, 0}, {WINED3DSIO_FRC, "frc", "FRC", 1, 2, vshader_hw_map2gl, shader_glsl_map2gl, 0, 0}, - {WINED3DSIO_POW, "pow", "POW", 1, 3, NULL, shader_glsl_map2gl, 0, 0}, + {WINED3DSIO_POW, "pow", "POW", 1, 3, NULL, shader_glsl_pow, 0, 0}, {WINED3DSIO_CRS, "crs", "XPS", 1, 3, NULL, shader_glsl_cross, 0, 0}, /* TODO: sng can possibly be performed a s RCP tmp, vec diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3c03cac..b7e3453 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1725,6 +1725,7 @@ extern void shader_glsl_rep(SHADER_OPCODE_ARG* arg); extern void shader_glsl_call(SHADER_OPCODE_ARG* arg); extern void shader_glsl_callnz(SHADER_OPCODE_ARG* arg); extern void shader_glsl_label(SHADER_OPCODE_ARG* arg); +extern void shader_glsl_pow(SHADER_OPCODE_ARG* arg); /** GLSL Pixel Shader Prototypes */ extern void pshader_glsl_tex(SHADER_OPCODE_ARG* arg);

1 0

Jacek Caban : mshtml: Split code from OnDataAvailable.
by Alexandre Julliard May 11, 2007

May 11, 2007

Module: wine Branch: master Commit: 98da8e2823f4ab5aff8bb25a5fe80995fcd8e935 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98da8e2823f4ab5aff8bb25a5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 11 13:13:16 2007 +0200 mshtml: Split code from OnDataAvailable. --- dlls/mshtml/navigate.c | 103 ++++++++++++++++++++++++++---------------------- 1 files changed, 56 insertions(+), 47 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index c2a6947..6ab6bc4 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -172,7 +172,7 @@ static const nsIInputStreamVtbl nsInputStreamVtbl = { nsInputStream_IsNonBlocking }; -static nsProtocolStream *create_nsprotocol_stream(IStream *stream) +static nsProtocolStream *create_nsprotocol_stream(void) { nsProtocolStream *ret = mshtml_alloc(sizeof(nsProtocolStream)); @@ -183,6 +183,60 @@ static nsProtocolStream *create_nsprotocol_stream(IStream *stream) return ret; } +static HRESULT read_stream_data(BSCallback *This, IStream *stream) +{ + nsresult nsres; + HRESULT hres; + + if(!This->nslistener) { + BYTE buf[1024]; + DWORD read; + + do { + read = 0; + hres = IStream_Read(stream, buf, sizeof(buf), &read); + }while(hres == S_OK && read); + + return S_OK; + } + + if(!This->nsstream) + This->nsstream = create_nsprotocol_stream(); + + do { + hres = IStream_Read(stream, This->nsstream->buf, sizeof(This->nsstream->buf), + &This->nsstream->buf_size); + if(!This->nsstream->buf_size) + break; + + if(!This->readed && This->nsstream->buf_size >= 2 && *(WORD*)This->nsstream->buf == 0xfeff) { + This->nschannel->charset = mshtml_alloc(sizeof(UTF16_STR)); + memcpy(This->nschannel->charset, UTF16_STR, sizeof(UTF16_STR)); + } + + if(!This->readed) { + nsres = nsIStreamListener_OnStartRequest(This->nslistener, + (nsIRequest*)NSCHANNEL(This->nschannel), This->nscontext); + if(NS_FAILED(nsres)) + FIXME("OnStartRequest failed: %08x\n", nsres); + } + + This->readed += This->nsstream->buf_size; + + nsres = nsIStreamListener_OnDataAvailable(This->nslistener, + (nsIRequest*)NSCHANNEL(This->nschannel), This->nscontext, + NSINSTREAM(This->nsstream), This->readed-This->nsstream->buf_size, + This->nsstream->buf_size); + if(NS_FAILED(nsres)) + ERR("OnDataAvailable failed: %08x\n", nsres); + + if(This->nsstream->buf_size) + FIXME("buffer is not empty!\n"); + }while(hres == S_OK); + + return S_OK; +} + #define STATUSCLB_THIS(iface) DEFINE_THIS(BSCallback, BindStatusCallback, iface) static HRESULT WINAPI BindStatusCallback_QueryInterface(IBindStatusCallback *iface, @@ -394,55 +448,10 @@ static HRESULT WINAPI BindStatusCallback_OnDataAvailable(IBindStatusCallback *if DWORD grfBSCF, DWORD dwSize, FORMATETC *pformatetc, STGMEDIUM *pstgmed) { BSCallback *This = STATUSCLB_THIS(iface); - nsresult nsres; - HRESULT hres; TRACE("(%p)->(%08x %d %p %p)\n", This, grfBSCF, dwSize, pformatetc, pstgmed); - if(This->nslistener) { - if(!This->nsstream) - This->nsstream = create_nsprotocol_stream(pstgmed->u.pstm); - - do { - hres = IStream_Read(pstgmed->u.pstm, This->nsstream->buf, sizeof(This->nsstream->buf), - &This->nsstream->buf_size); - if(!This->nsstream->buf_size) - break; - - if(!This->readed && This->nsstream->buf_size >= 2 && *(WORD*)This->nsstream->buf == 0xfeff) { - This->nschannel->charset = mshtml_alloc(sizeof(UTF16_STR)); - memcpy(This->nschannel->charset, UTF16_STR, sizeof(UTF16_STR)); - } - - if(!This->readed) { - nsres = nsIStreamListener_OnStartRequest(This->nslistener, - (nsIRequest*)NSCHANNEL(This->nschannel), This->nscontext); - if(NS_FAILED(nsres)) - FIXME("OnStartRequest failed: %08x\n", nsres); - } - - This->readed += This->nsstream->buf_size; - - nsres = nsIStreamListener_OnDataAvailable(This->nslistener, - (nsIRequest*)NSCHANNEL(This->nschannel), This->nscontext, - NSINSTREAM(This->nsstream), This->readed-This->nsstream->buf_size, - This->nsstream->buf_size); - if(NS_FAILED(nsres)) - ERR("OnDataAvailable failed: %08x\n", nsres); - - if(This->nsstream->buf_size) - FIXME("buffer is not empty!\n"); - }while(hres == S_OK); - }else { - BYTE buf[1024]; - DWORD read; - do { - read = 0; - hres = IStream_Read(pstgmed->u.pstm, buf, sizeof(buf), &read); - }while(hres == S_OK && read); - } - - return S_OK; + return read_stream_data(This, pstgmed->u.pstm); } static HRESULT WINAPI BindStatusCallback_OnObjectAvailable(IBindStatusCallback *iface,

1 0

Alexandre Julliard : server: Stop exporting the console_input structure. Get rid of console.h.
by Alexandre Julliard May 11, 2007

May 11, 2007

Module: wine Branch: master Commit: 627ca4079e1f85602710b56ca86fc3bc537420f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=627ca4079e1f85602710b56ca… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 11 12:46:32 2007 +0200 server: Stop exporting the console_input structure. Get rid of console.h. --- server/console.c | 31 ++++++++++++++++++++++++++++- server/console.h | 55 ----------------------------------------------------- server/debugger.c | 3 +- server/process.c | 3 +- server/process.h | 5 ++++ 5 files changed, 37 insertions(+), 60 deletions(-) diff --git a/server/console.c b/server/console.c index f1f3f3d..88a24e8 100644 --- a/server/console.c +++ b/server/console.c @@ -35,13 +35,37 @@ #include "process.h" #include "request.h" #include "unicode.h" -#include "console.h" +#include "wincon.h" #include "winternl.h" /* specific access rights (FIXME: should use finer-grained access rights) */ #define CONSOLE_READ 0x01 #define CONSOLE_WRITE 0x02 +struct screen_buffer; +struct console_input_events; + +struct console_input +{ + struct object obj; /* object header */ + int num_proc; /* number of processes attached to this console */ + struct thread *renderer; /* console renderer thread */ + int mode; /* input mode */ + struct screen_buffer *active; /* active screen buffer */ + int recnum; /* number of input records */ + INPUT_RECORD *records; /* input records */ + struct console_input_events *evt; /* synchronization event with renderer */ + WCHAR *title; /* console title */ + WCHAR **history; /* lines history */ + int history_size; /* number of entries in history array */ + int history_index; /* number of used entries in history array */ + int history_mode; /* mode of history (non zero means remove doubled strings */ + int edition_mode; /* index to edition mode flavors */ + int input_cp; /* console input codepage */ + int output_cp; /* console output codepage */ + struct event *event; /* event to wait on for input queue */ +}; + static unsigned int console_map_access( struct object *obj, unsigned int access ); static void console_input_dump( struct object *obj, int verbose ); @@ -405,6 +429,11 @@ void inherit_console(struct thread *parent_thread, struct process *process, obj_ } } +struct thread *console_get_renderer( struct console_input *console ) +{ + return console->renderer; +} + static struct console_input* console_input_get( obj_handle_t handle, unsigned access ) { struct console_input* console = NULL; diff --git a/server/console.h b/server/console.h deleted file mode 100644 index 79e266c..0000000 --- a/server/console.h +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Wine server consoles - * - * Copyright (C) 2001 Eric Pouech - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#ifndef __WINE_SERVER_CONSOLE_H -#define __WINE_SERVER_CONSOLE_H - -#include "wincon.h" - -struct screen_buffer; -struct console_input_events; - -struct console_input -{ - struct object obj; /* object header */ - int num_proc; /* number of processes attached to this console */ - struct thread *renderer; /* console renderer thread */ - int mode; /* input mode */ - struct screen_buffer *active; /* active screen buffer */ - int recnum; /* number of input records */ - INPUT_RECORD *records; /* input records */ - struct console_input_events *evt; /* synchronization event with renderer */ - WCHAR *title; /* console title */ - WCHAR **history; /* lines history */ - int history_size; /* number of entries in history array */ - int history_index; /* number of used entries in history array */ - int history_mode; /* mode of history (non zero means remove doubled strings */ - int edition_mode; /* index to edition mode flavors */ - int input_cp; /* console input codepage */ - int output_cp; /* console output codepage */ - struct event *event; /* event to wait on for input queue */ -}; - -/* console functions */ - -extern void inherit_console(struct thread *parent_thread, struct process *process, obj_handle_t hconin); -extern int free_console( struct process *process ); - -#endif /* __WINE_SERVER_CONSOLE_H */ diff --git a/server/debugger.c b/server/debugger.c index 85ab63a..eb89ef9 100644 --- a/server/debugger.c +++ b/server/debugger.c @@ -36,7 +36,6 @@ #include "process.h" #include "thread.h" #include "request.h" -#include "console.h" enum debug_event_state { EVENT_QUEUED, EVENT_SENT, EVENT_CONTINUED }; @@ -426,7 +425,7 @@ static int debugger_attach( struct process *process, struct thread *debugger ) if (thread->process == process) goto error; /* don't let a debugger debug its console... won't work */ - if (debugger->process->console && debugger->process->console->renderer->process == process) + if (debugger->process->console && console_get_renderer(debugger->process->console)->process == process) goto error; suspend_process( process ); diff --git a/server/process.c b/server/process.c index b100b83..092718f 100644 --- a/server/process.c +++ b/server/process.c @@ -46,7 +46,6 @@ #include "process.h" #include "thread.h" #include "request.h" -#include "console.h" #include "user.h" #include "security.h" @@ -567,7 +566,7 @@ void kill_console_processes( struct thread *renderer, int exit_code ) { if (process == renderer->process) continue; if (!process->running_threads) continue; - if (process->console && process->console->renderer == renderer) break; + if (process->console && console_get_renderer( process->console ) == renderer) break; } if (&process->entry == &process_list) break; /* no process found */ terminate_process( process, NULL, exit_code ); diff --git a/server/process.h b/server/process.h index c007bae..b2a6849 100644 --- a/server/process.h +++ b/server/process.h @@ -130,6 +130,11 @@ extern struct process_snapshot *process_snap( int *count ); extern struct module_snapshot *module_snap( struct process *process, int *count ); extern void enum_processes( int (*cb)(struct process*, void*), void *user); +/* console functions */ +extern void inherit_console(struct thread *parent_thread, struct process *process, obj_handle_t hconin); +extern int free_console( struct process *process ); +extern struct thread *console_get_renderer( struct console_input *console ); + /* process tracing mechanism to use */ #ifdef __APPLE__ #define USE_MACH

1 0

Misha Koshelev : msi: automation: Implement Installer::RegistryValue.
by Alexandre Julliard May 11, 2007

May 11, 2007

Module: wine Branch: master Commit: d74e643f8ce2ab2432c2a755c670962e44b64246 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d74e643f8ce2ab2432c2a755c… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Thu May 10 15:40:28 2007 -0500 msi: automation: Implement Installer::RegistryValue. --- dlls/msi/automation.c | 186 +++++++++++++++++++++++++++++++++++++++- dlls/msi/msiserver.idl | 5 + dlls/msi/msiserver_dispids.h | 1 + dlls/msi/tests/automation.c | 199 +++++++++++++++++++++--------------------- 4 files changed, 290 insertions(+), 101 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d74e643f8ce2ab2432c2a…

1 0

Dan Hipschman : widl: Remove var_t' s ptr_level field and start write_pointers.
by Alexandre Julliard May 11, 2007

May 11, 2007

Module: wine Branch: master Commit: ef433e279295beeadcbec3f36016ffc3587834a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef433e279295beeadcbec3f36… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Wed May 9 20:50:49 2007 -0700 widl: Remove var_t's ptr_level field and start write_pointers. --- dlls/rpcrt4/tests/server.c | 40 ++++ dlls/rpcrt4/tests/server.idl | 18 ++ tools/widl/client.c | 12 +- tools/widl/header.c | 81 ++++---- tools/widl/header.h | 22 ++- tools/widl/parser.y | 126 +++++++---- tools/widl/proxy.c | 17 +- tools/widl/server.c | 4 +- tools/widl/typegen.c | 534 ++++++++++++++++++++++-------------------- tools/widl/typegen.h | 2 +- tools/widl/widltypes.h | 12 +- tools/widl/write_msft.c | 30 ++-- 12 files changed, 521 insertions(+), 377 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ef433e279295beeadcbec…

1 0

Kirill K. Smirnov : server: Move console codepages to the server.
by Alexandre Julliard May 11, 2007

May 11, 2007

Module: wine Branch: master Commit: 9d74661856c9221bde8234d35082cd6139592558 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d74661856c9221bde8234d35… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Thu May 10 21:19:47 2007 +0400 server: Move console codepages to the server. --- dlls/kernel32/console.c | 75 +++++++++++++++++++++++++++++++--------- include/wine/server_protocol.h | 8 ++++- server/console.c | 12 ++++++ server/console.h | 2 + server/protocol.def | 6 +++ server/trace.c | 4 ++ 6 files changed, 89 insertions(+), 18 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 66bc796..b4e8437 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -55,9 +55,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(console); -static UINT console_input_codepage; -static UINT console_output_codepage; - static const WCHAR coninW[] = {'C','O','N','I','N','$',0}; static const WCHAR conoutW[] = {'C','O','N','O','U','T','$',0}; @@ -141,12 +138,19 @@ HWND WINAPI GetConsoleWindow(VOID) */ UINT WINAPI GetConsoleCP(VOID) { - if (!console_input_codepage) + BOOL ret; + UINT codepage = GetOEMCP(); /* default value */ + + SERVER_START_REQ(get_console_input_info) { - console_input_codepage = GetOEMCP(); - TRACE("%u\n", console_input_codepage); + req->handle = 0; + ret = !wine_server_call_err(req); + if (ret && reply->input_cp) + codepage = reply->input_cp; } - return console_input_codepage; + SERVER_END_REQ; + + return codepage; } @@ -155,9 +159,24 @@ UINT WINAPI GetConsoleCP(VOID) */ BOOL WINAPI SetConsoleCP(UINT cp) { - if (!IsValidCodePage( cp )) return FALSE; - console_input_codepage = cp; - return TRUE; + BOOL ret; + + if (!IsValidCodePage(cp)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + SERVER_START_REQ(set_console_input_info) + { + req->handle = 0; + req->mask = SET_CONSOLE_INPUT_INFO_INPUT_CODEPAGE; + req->input_cp = cp; + ret = !wine_server_call_err(req); + } + SERVER_END_REQ; + + return ret; } @@ -166,12 +185,19 @@ BOOL WINAPI SetConsoleCP(UINT cp) */ UINT WINAPI GetConsoleOutputCP(VOID) { - if (!console_output_codepage) + BOOL ret; + UINT codepage = GetOEMCP(); /* default value */ + + SERVER_START_REQ(get_console_input_info) { - console_output_codepage = GetOEMCP(); - TRACE("%u\n", console_output_codepage); + req->handle = 0; + ret = !wine_server_call_err(req); + if (ret && reply->output_cp) + codepage = reply->output_cp; } - return console_output_codepage; + SERVER_END_REQ; + + return codepage; } @@ -187,9 +213,24 @@ UINT WINAPI GetConsoleOutputCP(VOID) */ BOOL WINAPI SetConsoleOutputCP(UINT cp) { - if (!IsValidCodePage( cp )) return FALSE; - console_output_codepage = cp; - return TRUE; + BOOL ret; + + if (!IsValidCodePage(cp)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + SERVER_START_REQ(set_console_input_info) + { + req->handle = 0; + req->mask = SET_CONSOLE_INPUT_INFO_OUTPUT_CODEPAGE; + req->output_cp = cp; + ret = !wine_server_call_err(req); + } + SERVER_END_REQ; + + return ret; } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 99f9f82..a5c5b03 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1378,6 +1378,8 @@ struct set_console_input_info_request int history_mode; int history_size; int edition_mode; + int input_cp; + int output_cp; /* VARARG(title,unicode_str); */ }; struct set_console_input_info_reply @@ -1389,6 +1391,8 @@ struct set_console_input_info_reply #define SET_CONSOLE_INPUT_INFO_HISTORY_MODE 0x04 #define SET_CONSOLE_INPUT_INFO_HISTORY_SIZE 0x08 #define SET_CONSOLE_INPUT_INFO_EDITION_MODE 0x10 +#define SET_CONSOLE_INPUT_INFO_INPUT_CODEPAGE 0x20 +#define SET_CONSOLE_INPUT_INFO_OUTPUT_CODEPAGE 0x40 @@ -1404,6 +1408,8 @@ struct get_console_input_info_reply int history_size; int history_index; int edition_mode; + int input_cp; + int output_cp; /* VARARG(title,unicode_str); */ }; @@ -4722,6 +4728,6 @@ union generic_reply struct get_next_device_request_reply get_next_device_request_reply; }; -#define SERVER_PROTOCOL_VERSION 303 +#define SERVER_PROTOCOL_VERSION 304 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/console.c b/server/console.c index 8e667d4..f1f3f3d 100644 --- a/server/console.c +++ b/server/console.c @@ -255,6 +255,8 @@ static struct object *create_console_input( struct thread* renderer ) console_input->history_index = 0; console_input->history_mode = 0; console_input->edition_mode = 0; + console_input->input_cp = 0; + console_input->output_cp = 0; console_input->event = create_event( NULL, NULL, 0, 1, 0 ); if (!console_input->history || !console_input->evt) @@ -680,6 +682,14 @@ static int set_console_input_info( const struct set_console_input_info_request * { console->edition_mode = req->edition_mode; } + if (req->mask & SET_CONSOLE_INPUT_INFO_INPUT_CODEPAGE) + { + console->input_cp = req->input_cp; + } + if (req->mask & SET_CONSOLE_INPUT_INFO_OUTPUT_CODEPAGE) + { + console->output_cp = req->output_cp; + } release_object( console ); return 1; error: @@ -1372,6 +1382,8 @@ DECL_HANDLER(get_console_input_info) reply->history_size = console->history_size; reply->history_index = console->history_index; reply->edition_mode = console->edition_mode; + reply->input_cp = console->input_cp; + reply->output_cp = console->output_cp; release_object( console ); } diff --git a/server/console.h b/server/console.h index 3864ee9..79e266c 100644 --- a/server/console.h +++ b/server/console.h @@ -42,6 +42,8 @@ struct console_input int history_index; /* number of used entries in history array */ int history_mode; /* mode of history (non zero means remove doubled strings */ int edition_mode; /* index to edition mode flavors */ + int input_cp; /* console input codepage */ + int output_cp; /* console output codepage */ struct event *event; /* event to wait on for input queue */ }; diff --git a/server/protocol.def b/server/protocol.def index fb2d8cd..6d88a13 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1104,6 +1104,8 @@ struct console_renderer_event int history_mode; /* whether we duplicate lines in history */ int history_size; /* number of lines in history */ int edition_mode; /* index to the edition mode flavors */ + int input_cp; /* console input codepage */ + int output_cp; /* console output codepage */ VARARG(title,unicode_str); /* console title */ @END #define SET_CONSOLE_INPUT_INFO_ACTIVE_SB 0x01 @@ -1111,6 +1113,8 @@ struct console_renderer_event #define SET_CONSOLE_INPUT_INFO_HISTORY_MODE 0x04 #define SET_CONSOLE_INPUT_INFO_HISTORY_SIZE 0x08 #define SET_CONSOLE_INPUT_INFO_EDITION_MODE 0x10 +#define SET_CONSOLE_INPUT_INFO_INPUT_CODEPAGE 0x20 +#define SET_CONSOLE_INPUT_INFO_OUTPUT_CODEPAGE 0x40 /* Get info about a console (input only) */ @@ -1121,6 +1125,8 @@ struct console_renderer_event int history_size; /* number of lines in history */ int history_index; /* number of used lines in history */ int edition_mode; /* index to the edition mode flavors */ + int input_cp; /* console input codepage */ + int output_cp; /* console output codepage */ VARARG(title,unicode_str); /* console title */ @END diff --git a/server/trace.c b/server/trace.c index 8ae8d73..1dc83cf 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1466,6 +1466,8 @@ static void dump_set_console_input_info_request( const struct set_console_input_ fprintf( stderr, " history_mode=%d,", req->history_mode ); fprintf( stderr, " history_size=%d,", req->history_size ); fprintf( stderr, " edition_mode=%d,", req->edition_mode ); + fprintf( stderr, " input_cp=%d,", req->input_cp ); + fprintf( stderr, " output_cp=%d,", req->output_cp ); fprintf( stderr, " title=" ); dump_varargs_unicode_str( cur_size ); } @@ -1481,6 +1483,8 @@ static void dump_get_console_input_info_reply( const struct get_console_input_in fprintf( stderr, " history_size=%d,", req->history_size ); fprintf( stderr, " history_index=%d,", req->history_index ); fprintf( stderr, " edition_mode=%d,", req->edition_mode ); + fprintf( stderr, " input_cp=%d,", req->input_cp ); + fprintf( stderr, " output_cp=%d,", req->output_cp ); fprintf( stderr, " title=" ); dump_varargs_unicode_str( cur_size ); }

1 0