May 2006 - Wine-commits - list.winehq.org

Jacek Caban : shdocvw: Added WebBrowser::[get|put]_ToolBar implementation.
by Alexandre Julliard 05 May '06

05 May '06

Module: wine Branch: refs/heads/master Commit: e4ad9dfdb2f3419b7809a1190f6b623386a53612 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e4ad9dfdb2f3419b7809a11… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Apr 29 13:35:29 2006 +0200 shdocvw: Added WebBrowser::[get|put]_ToolBar implementation. --- dlls/shdocvw/shdocvw.h | 1 + dlls/shdocvw/webbrowser.c | 22 ++++++++++++++++++---- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index ccdbcef..49fb9cb 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -119,6 +119,7 @@ typedef struct { VARIANT_BOOL menu_bar; VARIANT_BOOL address_bar; VARIANT_BOOL status_bar; + VARIANT_BOOL tool_bar; DocHost doc_host; } WebBrowser; diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c index fcbe728..ff45c40 100644 --- a/dlls/shdocvw/webbrowser.c +++ b/dlls/shdocvw/webbrowser.c @@ -558,15 +558,28 @@ static HRESULT WINAPI WebBrowser_put_Sta static HRESULT WINAPI WebBrowser_get_ToolBar(IWebBrowser2 *iface, int *Value) { WebBrowser *This = WEBBROWSER_THIS(iface); - FIXME("(%p)->(%p)\n", This, Value); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, Value); + + *Value = This->tool_bar; + return S_OK; } static HRESULT WINAPI WebBrowser_put_ToolBar(IWebBrowser2 *iface, int Value) { WebBrowser *This = WEBBROWSER_THIS(iface); - FIXME("(%p)->(%d)\n", This, Value); - return E_NOTIMPL; + VARIANTARG arg; + DISPPARAMS dispparams = {&arg, NULL, 1, 0}; + + TRACE("(%p)->(%x)\n", This, Value); + + This->tool_bar = Value ? VARIANT_TRUE : VARIANT_FALSE; + + V_VT(&arg) = VT_BOOL; + V_BOOL(&arg) = Value; + call_sink(This->doc_host.cp_wbe2, DISPID_ONTOOLBAR, &dispparams); + + return S_OK; } static HRESULT WINAPI WebBrowser_get_MenuBar(IWebBrowser2 *iface, VARIANT_BOOL *Value) @@ -902,6 +915,7 @@ HRESULT WebBrowser_Create(IUnknown *pOut ret->menu_bar = VARIANT_TRUE; ret->address_bar = VARIANT_TRUE; ret->status_bar = VARIANT_TRUE; + ret->tool_bar = VARIANT_TRUE; WebBrowser_OleObject_Init(ret); WebBrowser_ViewObject_Init(ret);

1 0

Jacek Caban : shdocvw: Added some comments.
by Alexandre Julliard 05 May '06

05 May '06

Module: wine Branch: refs/heads/master Commit: faabaae5574243508435fe3c23192de8c46fec89 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=faabaae5574243508435fe3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Apr 30 23:48:05 2006 +0200 shdocvw: Added some comments. --- dlls/shdocvw/webbrowser.c | 25 +++++++++++++++++++++++-- 1 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c index ff45c40..d50bbf3 100644 --- a/dlls/shdocvw/webbrowser.c +++ b/dlls/shdocvw/webbrowser.c @@ -317,6 +317,8 @@ static HRESULT WINAPI WebBrowser_put_Lef memcpy(&rect, &This->pos_rect, sizeof(RECT)); rect.left = Left; + /* We don't really change the window position here. + * We just notify the embedder that he should do so. */ return IOleInPlaceSite_OnPosRectChange(This->inplace, &rect); } @@ -343,6 +345,8 @@ static HRESULT WINAPI WebBrowser_put_Top memcpy(&rect, &This->pos_rect, sizeof(RECT)); rect.top = Top; + /* We don't really change the window position here. + * We just notify the embedder that he should do so. */ return IOleInPlaceSite_OnPosRectChange(This->inplace, &rect); } @@ -368,8 +372,10 @@ static HRESULT WINAPI WebBrowser_put_Wid memcpy(&rect, &This->pos_rect, sizeof(RECT)); rect.right = rect.left+Width; - - return IOleInPlaceSite_OnPosRectChange(This->inplace, &rect); + + /* We don't really change the window size here. + * We just notify the embedder that he should do so. */ + return IOleInPlaceSite_OnPosRectChange(This->inplace, &rect); } static HRESULT WINAPI WebBrowser_get_Height(IWebBrowser2 *iface, long *pl) @@ -395,6 +401,8 @@ static HRESULT WINAPI WebBrowser_put_Hei memcpy(&rect, &This->pos_rect, sizeof(RECT)); rect.bottom = rect.top+Height; + /* We don't really change the window size here. + * We just notify the embedder that he should do so. */ return IOleInPlaceSite_OnPosRectChange(This->inplace, &rect); } @@ -469,6 +477,7 @@ static HRESULT WINAPI WebBrowser_get_HWN TRACE("(%p)->(%p)\n", This, pHWND); + /* WebBrowser control never has a frame window (in opposition to InternetExplorer) */ *pHWND = 0; return E_FAIL; } @@ -534,6 +543,9 @@ static HRESULT WINAPI WebBrowser_put_Sta This->status_bar = Value; + /* In opposition to InternetExplorer, all we should do here is + * inform the embedder about the status bar change. */ + V_VT(&arg) = VT_BOOL; V_BOOL(&arg) = Value; call_sink(This->doc_host.cp_wbe2, DISPID_ONSTATUSBAR, &dispparams); @@ -575,6 +587,9 @@ static HRESULT WINAPI WebBrowser_put_Too This->tool_bar = Value ? VARIANT_TRUE : VARIANT_FALSE; + /* In opposition to InternetExplorer, all we should do here is + * inform the embedder about the tool bar change. */ + V_VT(&arg) = VT_BOOL; V_BOOL(&arg) = Value; call_sink(This->doc_host.cp_wbe2, DISPID_ONTOOLBAR, &dispparams); @@ -602,6 +617,9 @@ static HRESULT WINAPI WebBrowser_put_Men This->menu_bar = Value; + /* In opposition to InternetExplorer, all we should do here is + * inform the embedder about the menu bar change. */ + V_VT(&arg) = VT_BOOL; V_BOOL(&arg) = Value; call_sink(This->doc_host.cp_wbe2, DISPID_ONMENUBAR, &dispparams); @@ -799,6 +817,9 @@ static HRESULT WINAPI WebBrowser_put_Add This->address_bar = Value; + /* In opposition to InternetExplorer, all we should do here is + * inform the embedder about the address bar change. */ + V_VT(&arg) = VT_BOOL; V_BOOL(&arg) = Value; call_sink(This->doc_host.cp_wbe2, DISPID_ONADDRESSBAR, &dispparams);

1 0

Jacek Caban : shdocvw: Added WebBrowser::[get|put] _AddressBar implementation.
by Alexandre Julliard 05 May '06

05 May '06

Module: wine Branch: refs/heads/master Commit: eb49ade33a241a877ba8be00a28f06c9c02612ea URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=eb49ade33a241a877ba8be0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Apr 29 13:33:05 2006 +0200 shdocvw: Added WebBrowser::[get|put]_AddressBar implementation. --- dlls/shdocvw/shdocvw.h | 1 + dlls/shdocvw/webbrowser.c | 22 ++++++++++++++++++---- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index 45088b3..8f81447 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -117,6 +117,7 @@ typedef struct { VARIANT_BOOL visible; VARIANT_BOOL menu_bar; + VARIANT_BOOL address_bar; DocHost doc_host; } WebBrowser; diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c index 6dc8302..67e4264 100644 --- a/dlls/shdocvw/webbrowser.c +++ b/dlls/shdocvw/webbrowser.c @@ -756,15 +756,28 @@ static HRESULT WINAPI WebBrowser_put_The static HRESULT WINAPI WebBrowser_get_AddressBar(IWebBrowser2 *iface, VARIANT_BOOL *Value) { WebBrowser *This = WEBBROWSER_THIS(iface); - FIXME("(%p)->(%p)\n", This, Value); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, Value); + + *Value = This->address_bar; + return S_OK; } static HRESULT WINAPI WebBrowser_put_AddressBar(IWebBrowser2 *iface, VARIANT_BOOL Value) { WebBrowser *This = WEBBROWSER_THIS(iface); - FIXME("(%p)->(%x)\n", This, Value); - return E_NOTIMPL; + VARIANTARG arg; + DISPPARAMS dispparams = {&arg, NULL, 1, 0}; + + TRACE("(%p)->(%x)\n", This, Value); + + This->address_bar = Value; + + V_VT(&arg) = VT_BOOL; + V_BOOL(&arg) = Value; + call_sink(This->doc_host.cp_wbe2, DISPID_ONADDRESSBAR, &dispparams); + + return S_OK; } static HRESULT WINAPI WebBrowser_get_Resizable(IWebBrowser2 *iface, VARIANT_BOOL *Value) @@ -874,6 +887,7 @@ HRESULT WebBrowser_Create(IUnknown *pOut ret->visible = VARIANT_TRUE; ret->menu_bar = VARIANT_TRUE; + ret->address_bar = VARIANT_TRUE; WebBrowser_OleObject_Init(ret); WebBrowser_ViewObject_Init(ret);

1 0

Jacek Caban : shdocvw: Added WebBrowser::[get|put]_StatusBar implementation .
by Alexandre Julliard 05 May '06

05 May '06

Module: wine Branch: refs/heads/master Commit: 39f14989a964d4372dd00523cfe5f36f61c8374b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=39f14989a964d4372dd0052… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Apr 29 13:34:38 2006 +0200 shdocvw: Added WebBrowser::[get|put]_StatusBar implementation. --- dlls/shdocvw/shdocvw.h | 1 + dlls/shdocvw/webbrowser.c | 22 ++++++++++++++++++---- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index 8f81447..ccdbcef 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -118,6 +118,7 @@ typedef struct { VARIANT_BOOL visible; VARIANT_BOOL menu_bar; VARIANT_BOOL address_bar; + VARIANT_BOOL status_bar; DocHost doc_host; } WebBrowser; diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c index 67e4264..fcbe728 100644 --- a/dlls/shdocvw/webbrowser.c +++ b/dlls/shdocvw/webbrowser.c @@ -517,15 +517,28 @@ static HRESULT WINAPI WebBrowser_put_Vis static HRESULT WINAPI WebBrowser_get_StatusBar(IWebBrowser2 *iface, VARIANT_BOOL *pBool) { WebBrowser *This = WEBBROWSER_THIS(iface); - FIXME("(%p)->(%p)\n", This, pBool); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, pBool); + + *pBool = This->status_bar; + return S_OK; } static HRESULT WINAPI WebBrowser_put_StatusBar(IWebBrowser2 *iface, VARIANT_BOOL Value) { WebBrowser *This = WEBBROWSER_THIS(iface); - FIXME("(%p)->(%x)\n", This, Value); - return E_NOTIMPL; + VARIANTARG arg; + DISPPARAMS dispparams = {&arg, NULL, 1, 0}; + + TRACE("(%p)->(%x)\n", This, Value); + + This->status_bar = Value; + + V_VT(&arg) = VT_BOOL; + V_BOOL(&arg) = Value; + call_sink(This->doc_host.cp_wbe2, DISPID_ONSTATUSBAR, &dispparams); + + return S_OK; } static HRESULT WINAPI WebBrowser_get_StatusText(IWebBrowser2 *iface, BSTR *StatusText) @@ -888,6 +901,7 @@ HRESULT WebBrowser_Create(IUnknown *pOut ret->visible = VARIANT_TRUE; ret->menu_bar = VARIANT_TRUE; ret->address_bar = VARIANT_TRUE; + ret->status_bar = VARIANT_TRUE; WebBrowser_OleObject_Init(ret); WebBrowser_ViewObject_Init(ret);

1 0

Jacek Caban : shdocvw: Added get_HWND implementation.
by Alexandre Julliard 05 May '06

05 May '06

Module: wine Branch: refs/heads/master Commit: 8cde167fd984280be570369b84fc0c82f7c366ed URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8cde167fd984280be570369… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 28 20:53:52 2006 +0200 shdocvw: Added get_HWND implementation. --- dlls/shdocvw/webbrowser.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c index 8036511..f6d82b2 100644 --- a/dlls/shdocvw/webbrowser.c +++ b/dlls/shdocvw/webbrowser.c @@ -466,8 +466,11 @@ static HRESULT WINAPI WebBrowser_get_Nam static HRESULT WINAPI WebBrowser_get_HWND(IWebBrowser2 *iface, long *pHWND) { WebBrowser *This = WEBBROWSER_THIS(iface); - FIXME("(%p)->(%p)\n", This, pHWND); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, pHWND); + + *pHWND = 0; + return E_FAIL; } static HRESULT WINAPI WebBrowser_get_FullName(IWebBrowser2 *iface, BSTR *FullName)

1 0

Jacek Caban : shdocvw: Added WebBrowser::[get|put]_MenuBar implementation.
by Alexandre Julliard 05 May '06

05 May '06

Module: wine Branch: refs/heads/master Commit: 9c4f120e88668e3ca66b7f36bad80f491df9e870 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9c4f120e88668e3ca66b7f3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 28 23:45:36 2006 +0200 shdocvw: Added WebBrowser::[get|put]_MenuBar implementation. --- dlls/shdocvw/shdocvw.h | 1 + dlls/shdocvw/webbrowser.c | 22 ++++++++++++++++++---- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index 11a9b26..45088b3 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -116,6 +116,7 @@ typedef struct { HWND shell_embedding_hwnd; VARIANT_BOOL visible; + VARIANT_BOOL menu_bar; DocHost doc_host; } WebBrowser; diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c index f6d82b2..6dc8302 100644 --- a/dlls/shdocvw/webbrowser.c +++ b/dlls/shdocvw/webbrowser.c @@ -559,15 +559,28 @@ static HRESULT WINAPI WebBrowser_put_Too static HRESULT WINAPI WebBrowser_get_MenuBar(IWebBrowser2 *iface, VARIANT_BOOL *Value) { WebBrowser *This = WEBBROWSER_THIS(iface); - FIXME("(%p)->(%p)\n", This, Value); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, Value); + + *Value = This->menu_bar; + return S_OK; } static HRESULT WINAPI WebBrowser_put_MenuBar(IWebBrowser2 *iface, VARIANT_BOOL Value) { WebBrowser *This = WEBBROWSER_THIS(iface); - FIXME("(%p)->(%x)\n", This, Value); - return E_NOTIMPL; + VARIANTARG arg; + DISPPARAMS dispparams = {&arg, NULL, 1, 0}; + + TRACE("(%p)->(%x)\n", This, Value); + + This->menu_bar = Value; + + V_VT(&arg) = VT_BOOL; + V_BOOL(&arg) = Value; + call_sink(This->doc_host.cp_wbe2, DISPID_ONMENUBAR, &dispparams); + + return S_OK; } static HRESULT WINAPI WebBrowser_get_FullScreen(IWebBrowser2 *iface, VARIANT_BOOL *pbFullScreen) @@ -860,6 +873,7 @@ HRESULT WebBrowser_Create(IUnknown *pOut DocHost_Init(&ret->doc_host, (IDispatch*)WEBBROWSER2(ret)); ret->visible = VARIANT_TRUE; + ret->menu_bar = VARIANT_TRUE; WebBrowser_OleObject_Init(ret); WebBrowser_ViewObject_Init(ret);

1 0

Jacek Caban : shdocvw: Added [get|put]_Visible implementation.
by Alexandre Julliard 05 May '06

05 May '06

Module: wine Branch: refs/heads/master Commit: 9d9b909466f2742ec83edc691fe70d9a967e1865 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9d9b909466f2742ec83edc6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 28 20:29:07 2006 +0200 shdocvw: Added [get|put]_Visible implementation. --- dlls/shdocvw/shdocvw.h | 2 ++ dlls/shdocvw/webbrowser.c | 24 ++++++++++++++++++++---- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index deabf20..11a9b26 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -115,6 +115,8 @@ typedef struct { HWND shell_embedding_hwnd; + VARIANT_BOOL visible; + DocHost doc_host; } WebBrowser; diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c index 74ad74e..8036511 100644 --- a/dlls/shdocvw/webbrowser.c +++ b/dlls/shdocvw/webbrowser.c @@ -21,6 +21,7 @@ #include "wine/debug.h" #include "shdocvw.h" +#include "exdispid.h" WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); @@ -486,15 +487,28 @@ static HRESULT WINAPI WebBrowser_get_Pat static HRESULT WINAPI WebBrowser_get_Visible(IWebBrowser2 *iface, VARIANT_BOOL *pBool) { WebBrowser *This = WEBBROWSER_THIS(iface); - FIXME("(%p)->(%p)\n", This, pBool); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, pBool); + + *pBool = This->visible; + return S_OK; } static HRESULT WINAPI WebBrowser_put_Visible(IWebBrowser2 *iface, VARIANT_BOOL Value) { WebBrowser *This = WEBBROWSER_THIS(iface); - FIXME("(%p)->(%x)\n", This, Value); - return E_NOTIMPL; + VARIANTARG arg; + DISPPARAMS dispparams = {&arg, NULL, 1, 0}; + + TRACE("(%p)->(%x)\n", This, Value); + + This->visible = Value; + + V_VT(&arg) = VT_BOOL; + V_BOOL(&arg) = Value; + call_sink(This->doc_host.cp_wbe2, DISPID_ONVISIBLE, &dispparams); + + return S_OK; } static HRESULT WINAPI WebBrowser_get_StatusBar(IWebBrowser2 *iface, VARIANT_BOOL *pBool) @@ -842,6 +856,8 @@ HRESULT WebBrowser_Create(IUnknown *pOut DocHost_Init(&ret->doc_host, (IDispatch*)WEBBROWSER2(ret)); + ret->visible = VARIANT_TRUE; + WebBrowser_OleObject_Init(ret); WebBrowser_ViewObject_Init(ret); WebBrowser_Persist_Init(ret);

1 0

Jacek Caban : shdocvw: Fix GetMiscStatus implementation.
by Alexandre Julliard 05 May '06

05 May '06

Module: wine Branch: refs/heads/master Commit: 707a4f18f714bcbef06dfad049a658a0fc960d90 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=707a4f18f714bcbef06dfad… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 28 20:08:02 2006 +0200 shdocvw: Fix GetMiscStatus implementation. --- dlls/shdocvw/oleobject.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/shdocvw/oleobject.c b/dlls/shdocvw/oleobject.c index e3cfa4a..c7a9470 100644 --- a/dlls/shdocvw/oleobject.c +++ b/dlls/shdocvw/oleobject.c @@ -401,14 +401,11 @@ static HRESULT WINAPI OleObject_EnumAdvi static HRESULT WINAPI OleObject_GetMiscStatus(IOleObject *iface, DWORD dwAspect, DWORD *pdwStatus) { WebBrowser *This = OLEOBJ_THIS(iface); - HRESULT hres; TRACE("(%p)->(%lx, %p)\n", This, dwAspect, pdwStatus); - hres = OleRegGetMiscStatus(&CLSID_WebBrowser, dwAspect, pdwStatus); - - if (FAILED(hres)) - *pdwStatus = 0; + *pdwStatus = OLEMISC_SETCLIENTSITEFIRST|OLEMISC_ACTIVATEWHENVISIBLE|OLEMISC_INSIDEOUT + |OLEMISC_CANTLINKINSIDE|OLEMISC_RECOMPOSEONRESIZE; return S_OK; }

1 0

Ivan Gyurdiev : wined3d: QueryInterface corrections.
by Alexandre Julliard 05 May '06

05 May '06

Module: wine Branch: refs/heads/master Commit: 07f4f7048760e0f7814e538d51e837096e1649cc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=07f4f7048760e0f7814e538… Author: Ivan Gyurdiev <ivg2(a)cornell.edu> Date: Tue Apr 25 17:59:12 2006 -0400 wined3d: QueryInterface corrections. --- dlls/wined3d/basetexture.c | 3 ++- dlls/wined3d/cubetexture.c | 3 ++- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/directx.c | 4 ++-- dlls/wined3d/drawprim.c | 40 ++++++++++++++++++++++++++++++++++++++ dlls/wined3d/indexbuffer.c | 3 ++- dlls/wined3d/palette.c | 1 + dlls/wined3d/pixelshader.c | 3 ++- dlls/wined3d/query.c | 3 ++- dlls/wined3d/resource.c | 3 ++- dlls/wined3d/stateblock.c | 3 ++- dlls/wined3d/surface.c | 8 ++++++-- dlls/wined3d/swapchain.c | 1 + dlls/wined3d/texture.c | 1 + dlls/wined3d/vertexbuffer.c | 3 ++- dlls/wined3d/vertexdeclaration.c | 3 ++- dlls/wined3d/vertexshader.c | 3 ++- dlls/wined3d/volume.c | 8 ++++++-- dlls/wined3d/volumetexture.c | 3 ++- 19 files changed, 81 insertions(+), 19 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=07f4f7048760e0f7814…

1 0

Dmitry Timoshkov : secur32: Add partial support for ISC_REQ_ALLOCATE_MEMORY in the NTLM security provider .
by Alexandre Julliard 05 May '06

05 May '06

Module: wine Branch: refs/heads/master Commit: 8414777cba83c9f2f4290a134224199b9b12da67 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8414777cba83c9f2f4290a1… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Apr 27 20:53:19 2006 +0900 secur32: Add partial support for ISC_REQ_ALLOCATE_MEMORY in the NTLM security provider. --- dlls/secur32/ntlm.c | 24 ++++++++++++++++++++---- 1 files changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index 5b5c2ee..6cd34c9 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -436,10 +436,6 @@ static SECURITY_STATUS SEC_ENTRY ntlm_In TRACE("According to a MS whitepaper pszTargetName is ignored.\n"); } /* Handle all the flags */ - if(fContextReq & ISC_REQ_ALLOCATE_MEMORY) - { - FIXME("InitializeSecurityContext(): ISC_REQ_ALLOCATE_MEMORY stub\n"); - } if(fContextReq & ISC_REQ_CONFIDENTIALITY) { FIXME("InitializeSecurityContext(): ISC_REQ_CONFIDENTIALITY stub\n"); @@ -547,6 +543,16 @@ static SECURITY_STATUS SEC_ENTRY ntlm_In /* put the decoded client blob into the out buffer */ + if (fContextReq & ISC_REQ_ALLOCATE_MEMORY) + { + if (pOutput) + { + pOutput->cBuffers = 1; + pOutput->pBuffers[0].pvBuffer = SECUR32_ALLOC(bin_len); + pOutput->pBuffers[0].cbBuffer = bin_len; + } + } + if (!pOutput || !pOutput->cBuffers || pOutput->pBuffers[0].cbBuffer < bin_len) { TRACE("out buffer is NULL or has not enough space\n"); @@ -643,6 +649,16 @@ static SECURITY_STATUS SEC_ENTRY ntlm_In /* put the decoded client blob into the out buffer */ + if (fContextReq & ISC_REQ_ALLOCATE_MEMORY) + { + if (pOutput) + { + pOutput->cBuffers = 1; + pOutput->pBuffers[0].pvBuffer = SECUR32_ALLOC(bin_len); + pOutput->pBuffers[0].cbBuffer = bin_len; + } + } + if (!pOutput || !pOutput->cBuffers || pOutput->pBuffers[0].cbBuffer < bin_len) { TRACE("out buffer is NULL or has not enough space\n");

1 0