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

Jacek Caban : shdocvw: Added Top, Left, Height and Width properties implementation.
by Alexandre Julliard 14 Apr '06

14 Apr '06

Module: wine Branch: refs/heads/master Commit: 07053810692212e59d923100177ad6bbaa739356 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=07053810692212e59d92310… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 14 14:43:25 2006 +0200 shdocvw: Added Top, Left, Height and Width properties implementation. --- dlls/shdocvw/webbrowser.c | 80 ++++++++++++++++++++++++++++++++++++--------- 1 files changed, 64 insertions(+), 16 deletions(-) diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c index b5fad1e..ba16c05 100644 --- a/dlls/shdocvw/webbrowser.c +++ b/dlls/shdocvw/webbrowser.c @@ -297,57 +297,105 @@ static HRESULT WINAPI WebBrowser_get_Typ static HRESULT WINAPI WebBrowser_get_Left(IWebBrowser2 *iface, long *pl) { WebBrowser *This = WEBBROWSER_THIS(iface); - FIXME("(%p)->(%p)\n", This, pl); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, pl); + + *pl = This->pos_rect.left; + return S_OK; } static HRESULT WINAPI WebBrowser_put_Left(IWebBrowser2 *iface, long Left) { WebBrowser *This = WEBBROWSER_THIS(iface); - FIXME("(%p)->(%ld)\n", This, Left); - return E_NOTIMPL; + RECT rect; + + TRACE("(%p)->(%ld)\n", This, Left); + + if(!This->inplace) + return E_UNEXPECTED; + + memcpy(&rect, &This->pos_rect, sizeof(RECT)); + rect.left = Left; + + return IOleInPlaceSite_OnPosRectChange(This->inplace, &rect); } static HRESULT WINAPI WebBrowser_get_Top(IWebBrowser2 *iface, long *pl) { WebBrowser *This = WEBBROWSER_THIS(iface); - FIXME("(%p)->(%p)\n", This, pl); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, pl); + + *pl = This->pos_rect.top; + return S_OK; } static HRESULT WINAPI WebBrowser_put_Top(IWebBrowser2 *iface, long Top) { WebBrowser *This = WEBBROWSER_THIS(iface); - FIXME("(%p)->(%ld)\n", This, Top); - return E_NOTIMPL; + RECT rect; + + TRACE("(%p)->(%ld)\n", This, Top); + + if(!This->inplace) + return E_UNEXPECTED; + + memcpy(&rect, &This->pos_rect, sizeof(RECT)); + rect.top = Top; + + return IOleInPlaceSite_OnPosRectChange(This->inplace, &rect); } static HRESULT WINAPI WebBrowser_get_Width(IWebBrowser2 *iface, long *pl) { WebBrowser *This = WEBBROWSER_THIS(iface); - FIXME("(%p)->(%p)\n", This, pl); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, pl); + + *pl = This->pos_rect.right - This->pos_rect.left; + return S_OK; } static HRESULT WINAPI WebBrowser_put_Width(IWebBrowser2 *iface, long Width) { WebBrowser *This = WEBBROWSER_THIS(iface); - FIXME("(%p)->(%ld)\n", This, Width); - return E_NOTIMPL; + RECT rect; + + TRACE("(%p)->(%ld)\n", This, Width); + + if(!This->inplace) + return E_UNEXPECTED; + + memcpy(&rect, &This->pos_rect, sizeof(RECT)); + rect.right = rect.left+Width; + + return IOleInPlaceSite_OnPosRectChange(This->inplace, &rect); } static HRESULT WINAPI WebBrowser_get_Height(IWebBrowser2 *iface, long *pl) { WebBrowser *This = WEBBROWSER_THIS(iface); - FIXME("(%p)->(%p)\n", This, pl); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, pl); + + *pl = This->pos_rect.bottom - This->pos_rect.top; + return S_OK; } static HRESULT WINAPI WebBrowser_put_Height(IWebBrowser2 *iface, long Height) { WebBrowser *This = WEBBROWSER_THIS(iface); - FIXME("(%p)->(%ld)\n", This, Height); - return E_NOTIMPL; + RECT rect; + + TRACE("(%p)->(%ld)\n", This, Height); + + if(!This->inplace) + return E_UNEXPECTED; + + memcpy(&rect, &This->pos_rect, sizeof(RECT)); + rect.bottom = rect.top+Height; + + return IOleInPlaceSite_OnPosRectChange(This->inplace, &rect); } static HRESULT WINAPI WebBrowser_get_LocationName(IWebBrowser2 *iface, BSTR *LocationName)

1 0

Jacek Caban : shdocvw: Store IOleInPlaceSite in WebBrowser object.
by Alexandre Julliard 14 Apr '06

14 Apr '06

Module: wine Branch: refs/heads/master Commit: 80dcc8b813b3fa0eea1fa038245e911aa5bf53b2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=80dcc8b813b3fa0eea1fa03… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 14 14:42:14 2006 +0200 shdocvw: Store IOleInPlaceSite in WebBrowser object. --- dlls/shdocvw/oleobject.c | 34 +++++++++++++++++++++------------- dlls/shdocvw/shdocvw.h | 1 + 2 files changed, 22 insertions(+), 13 deletions(-) diff --git a/dlls/shdocvw/oleobject.c b/dlls/shdocvw/oleobject.c index 2ab2d8d..217c549 100644 --- a/dlls/shdocvw/oleobject.c +++ b/dlls/shdocvw/oleobject.c @@ -142,6 +142,11 @@ static HRESULT WINAPI OleObject_SetClien This->shell_embedding_hwnd = NULL; } + if(This->inplace) { + IOleInPlaceSite_Release(This->inplace); + This->inplace = NULL; + } + if(This->hostui) IDocHostUIHandler_Release(This->hostui); if(This->client) @@ -243,40 +248,43 @@ static HRESULT WINAPI OleObject_DoVerb(I switch (iVerb) { case OLEIVERB_SHOW: - case OLEIVERB_INPLACEACTIVATE: { - IOleInPlaceSite *inplace; - + case OLEIVERB_INPLACEACTIVATE: TRACE("OLEIVERB_INPLACEACTIVATE\n"); if(!pActiveSite) return E_INVALIDARG; - hres = IOleClientSite_QueryInterface(pActiveSite, &IID_IOleInPlaceSite, (void**)&inplace); + if(This->inplace) { + IOleInPlaceSite_Release(This->inplace); + This->inplace = NULL; + } + + hres = IOleClientSite_QueryInterface(pActiveSite, &IID_IOleInPlaceSite, (void**)&This->inplace); if(FAILED(hres)) { WARN("Could not get IOleInPlaceSite\n"); return hres; } - hres = IOleInPlaceSite_CanInPlaceActivate(inplace); + hres = IOleInPlaceSite_CanInPlaceActivate(This->inplace); if(hres != S_OK) { WARN("CanInPlaceActivate returned: %08lx\n", hres); - IOleInPlaceSite_Release(inplace); + IOleInPlaceSite_Release(This->inplace); return E_FAIL; } - hres = IOleInPlaceSite_GetWindow(inplace, &This->iphwnd); + hres = IOleInPlaceSite_GetWindow(This->inplace, &This->iphwnd); if(FAILED(hres)) This->iphwnd = hwndParent; - IOleInPlaceSite_OnInPlaceActivate(inplace); + IOleInPlaceSite_OnInPlaceActivate(This->inplace); - IOleInPlaceSite_GetWindowContext(inplace, &This->frame, &This->uiwindow, + IOleInPlaceSite_GetWindowContext(This->inplace, &This->frame, &This->uiwindow, &This->pos_rect, &This->clip_rect, &This->frameinfo); if(iVerb == OLEIVERB_INPLACEACTIVATE) - IOleInPlaceSite_Release(inplace); + IOleInPlaceSite_Release(This->inplace); SetWindowPos(This->shell_embedding_hwnd, NULL, This->pos_rect.left, This->pos_rect.top, @@ -297,8 +305,8 @@ static HRESULT WINAPI OleObject_DoVerb(I TRACE("OLEIVERB_SHOW\n"); - IOleInPlaceSite_OnUIActivate(inplace); - IOleInPlaceSite_Release(inplace); + IOleInPlaceSite_OnUIActivate(This->inplace); + IOleInPlaceSite_Release(This->inplace); if(This->frame) IOleInPlaceFrame_SetActiveObject(This->frame, ACTIVEOBJ(This), wszitem); @@ -310,7 +318,6 @@ static HRESULT WINAPI OleObject_DoVerb(I */ return S_OK; - } default: FIXME("stub for %ld\n", iVerb); break; @@ -760,6 +767,7 @@ void WebBrowser_OleObject_Init(WebBrowse This->lpWBOleCommandTargetVtbl = &OleCommandTargetVtbl; This->client = NULL; + This->inplace = NULL; This->container = NULL; This->iphwnd = NULL; This->frame_hwnd = NULL; diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index b1b436b..d6fcf35 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -89,6 +89,7 @@ typedef struct { IOleContainer *container; IOleDocumentView *view; IDocHostUIHandler *hostui; + IOleInPlaceSite *inplace; LPOLESTR url;

1 0

Jacek Caban : shdocvw: Update pos_rect and clip_rect in SetObjectRects.
by Alexandre Julliard 14 Apr '06

14 Apr '06

Module: wine Branch: refs/heads/master Commit: 1e0f378c307fea7ba8e96a46cc3e32c106ed1f43 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1e0f378c307fea7ba8e96a4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 14 14:42:47 2006 +0200 shdocvw: Update pos_rect and clip_rect in SetObjectRects. --- dlls/shdocvw/oleobject.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/oleobject.c b/dlls/shdocvw/oleobject.c index 5adb88e..2ab2d8d 100644 --- a/dlls/shdocvw/oleobject.c +++ b/dlls/shdocvw/oleobject.c @@ -507,6 +507,11 @@ static HRESULT WINAPI OleInPlaceObject_S TRACE("(%p)->(%p %p)\n", This, lprcPosRect, lprcClipRect); + memcpy(&This->pos_rect, lprcPosRect, sizeof(RECT)); + + if(lprcClipRect) + memcpy(&This->clip_rect, lprcClipRect, sizeof(RECT)); + if(This->shell_embedding_hwnd) { SetWindowPos(This->shell_embedding_hwnd, NULL, lprcPosRect->left, lprcPosRect->top,

1 0

Jacek Caban : shdocvw: Better window handling.
by Alexandre Julliard 14 Apr '06

14 Apr '06

Module: wine Branch: refs/heads/master Commit: b81b614da824e54c80f7e32dcf2672519bbe20ce URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b81b614da824e54c80f7e32… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 14 14:40:33 2006 +0200 shdocvw: Better window handling. Use unicode version of DefWindowProc in unicode window procs. Fix window styles. --- dlls/shdocvw/dochost.c | 4 ++-- dlls/shdocvw/oleobject.c | 12 +++++++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/shdocvw/dochost.c b/dlls/shdocvw/dochost.c index 2a679e7..ee4a0c4 100644 --- a/dlls/shdocvw/dochost.c +++ b/dlls/shdocvw/dochost.c @@ -120,7 +120,7 @@ static LRESULT WINAPI doc_view_proc(HWND return navigate2(This); } - return DefWindowProcA(hwnd, msg, wParam, lParam); + return DefWindowProcW(hwnd, msg, wParam, lParam); } void create_doc_view_hwnd(WebBrowser *This) @@ -149,7 +149,7 @@ void create_doc_view_hwnd(WebBrowser *Th GetClientRect(This->shell_embedding_hwnd, &rect); This->doc_view_hwnd = CreateWindowExW(0, wszShell_DocObject_View, wszShell_DocObject_View, - WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_TABSTOP | WS_MAXIMIZEBOX, + WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_TABSTOP, rect.left, rect.top, rect.right, rect.bottom, This->shell_embedding_hwnd, NULL, shdocvw_hinstance, This); } diff --git a/dlls/shdocvw/oleobject.c b/dlls/shdocvw/oleobject.c index 32d7452..5adb88e 100644 --- a/dlls/shdocvw/oleobject.c +++ b/dlls/shdocvw/oleobject.c @@ -58,7 +58,7 @@ static LRESULT WINAPI shell_embedding_pr return resize_window(This, LOWORD(lParam), HIWORD(lParam)); } - return DefWindowProcA(hwnd, msg, wParam, lParam); + return DefWindowProcW(hwnd, msg, wParam, lParam); } static void create_shell_embedding_hwnd(WebBrowser *This) @@ -91,10 +91,12 @@ static void create_shell_embedding_hwnd( IOleInPlaceSite_Release(inplace); } - This->shell_embedding_hwnd = CreateWindowExW(0, wszShellEmbedding, wszShellEmbedding, - WS_CHILD | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_TABSTOP | WS_MAXIMIZEBOX, - 0, 0, 0, 0, parent, - NULL, shdocvw_hinstance, This); + This->shell_embedding_hwnd = CreateWindowExW( + WS_EX_WINDOWEDGE, + wszShellEmbedding, wszShellEmbedding, + WS_CHILD | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_TABSTOP, + 0, 0, 0, 0, parent, + NULL, shdocvw_hinstance, This); } /**********************************************************************

1 0

Jacek Caban : shell32: Don't crash in SHELL_ExecuteW if psei-> lpDirectory is NULL.
by Alexandre Julliard 14 Apr '06

14 Apr '06

Module: wine Branch: refs/heads/master Commit: 150bd5442cf6037f2760e42592190e62ea055edb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=150bd5442cf6037f2760e42… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 14 14:41:31 2006 +0200 shell32: Don't crash in SHELL_ExecuteW if psei->lpDirectory is NULL. --- dlls/shell32/shlexec.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index 1a30914..ce869ca 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -290,8 +290,9 @@ static UINT_PTR SHELL_ExecuteW(const WCH startup.cb = sizeof(STARTUPINFOW); startup.dwFlags = STARTF_USESHOWWINDOW; startup.wShowWindow = psei->nShow; - if (CreateProcessW(NULL, (LPWSTR)lpCmd, NULL, NULL, FALSE, CREATE_UNICODE_ENVIRONMENT, - env, *psei->lpDirectory? psei->lpDirectory: NULL, &startup, &info)) + if (CreateProcessW(NULL, (LPWSTR)lpCmd, NULL, NULL, FALSE, CREATE_UNICODE_ENVIRONMENT, env, + psei->lpDirectory && *psei->lpDirectory ? psei->lpDirectory : NULL, + &startup, &info)) { /* Give 30 seconds to the app to come up, if desired. Probably only needed when starting app immediately before making a DDE connection. */

1 0

Hans Leidekker : wldap32: Document the miscellaneous functions.
by Alexandre Julliard 14 Apr '06

14 Apr '06

Module: wine Branch: refs/heads/master Commit: 3492a146411c6ed85c8f6b0125efef04ffd61b36 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3492a146411c6ed85c8f6b0… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Fri Apr 14 18:56:21 2006 +0200 wldap32: Document the miscellaneous functions. --- dlls/wldap32/misc.c | 292 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 291 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=3492a146411c6ed85c8…

1 0

Sagar Mittal : wined3d: Fix null pointer check in IWineD3DImpl_GetPixelShader.
by Alexandre Julliard 14 Apr '06

14 Apr '06

Module: wine Branch: refs/heads/master Commit: 4f986c842fc9d53347fc89b4966310f09229e86a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4f986c842fc9d53347fc89b… Author: Sagar Mittal <sagar.mittal(a)gmail.com> Date: Thu Apr 13 20:48:59 2006 -0400 wined3d: Fix null pointer check in IWineD3DImpl_GetPixelShader. --- dlls/wined3d/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3d4ae9e..ba2cceb 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4250,7 +4250,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_GetPix } *ppShader = This->stateBlock->pixelShader; - if (NULL != ppShader) { + if (NULL != *ppShader) { IWineD3DPixelShader_AddRef(*ppShader); } TRACE("(%p) : returning %p\n", This, *ppShader);

1 0

Dmitry Timoshkov : winspool: Add a test for GetPrinterDriver, make it pass under Wine.
by Alexandre Julliard 14 Apr '06

14 Apr '06

Module: wine Branch: refs/heads/master Commit: b13c498c9d2daa73839f6c861e51b8813ef1504a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b13c498c9d2daa73839f6c8… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri Apr 14 22:34:57 2006 +0900 winspool: Add a test for GetPrinterDriver, make it pass under Wine. --- dlls/winspool/info.c | 48 +++++++++++++++--------- dlls/winspool/tests/info.c | 88 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 118 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=b13c498c9d2daa73839…

1 0

Dmitry Timoshkov : rpcrt4: Constify NDR function tables.
by Alexandre Julliard 14 Apr '06

14 Apr '06

Module: wine Branch: refs/heads/master Commit: 590f6faee1ff025ef456d0f639cfdcc4f8c6654a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=590f6faee1ff025ef456d0f… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri Apr 14 21:38:41 2006 +0900 rpcrt4: Constify NDR function tables. --- dlls/rpcrt4/ndr_marshall.c | 10 +++++----- dlls/rpcrt4/ndr_misc.h | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index b77c281..b890499 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -112,7 +112,7 @@ static void WINAPI NdrBaseTypeBufferSize static void WINAPI NdrBaseTypeFree(PMIDL_STUB_MESSAGE, unsigned char *, PFORMAT_STRING); static unsigned long WINAPI NdrBaseTypeMemorySize(PMIDL_STUB_MESSAGE, PFORMAT_STRING); -NDR_MARSHALL NdrMarshaller[NDR_TABLE_SIZE] = { +const NDR_MARSHALL NdrMarshaller[NDR_TABLE_SIZE] = { 0, NdrBaseTypeMarshall, NdrBaseTypeMarshall, NdrBaseTypeMarshall, NdrBaseTypeMarshall, NdrBaseTypeMarshall, NdrBaseTypeMarshall, NdrBaseTypeMarshall, @@ -149,7 +149,7 @@ NDR_MARSHALL NdrMarshaller[NDR_TABLE_SIZ 0, 0, 0, 0, NdrUserMarshalMarshall }; -NDR_UNMARSHALL NdrUnmarshaller[NDR_TABLE_SIZE] = { +const NDR_UNMARSHALL NdrUnmarshaller[NDR_TABLE_SIZE] = { 0, NdrBaseTypeUnmarshall, NdrBaseTypeUnmarshall, NdrBaseTypeUnmarshall, NdrBaseTypeUnmarshall, NdrBaseTypeUnmarshall, NdrBaseTypeUnmarshall, NdrBaseTypeUnmarshall, @@ -186,7 +186,7 @@ NDR_UNMARSHALL NdrUnmarshaller[NDR_TABLE 0, 0, 0, 0, NdrUserMarshalUnmarshall }; -NDR_BUFFERSIZE NdrBufferSizer[NDR_TABLE_SIZE] = { +const NDR_BUFFERSIZE NdrBufferSizer[NDR_TABLE_SIZE] = { 0, NdrBaseTypeBufferSize, NdrBaseTypeBufferSize, NdrBaseTypeBufferSize, NdrBaseTypeBufferSize, NdrBaseTypeBufferSize, NdrBaseTypeBufferSize, NdrBaseTypeBufferSize, @@ -223,7 +223,7 @@ NDR_BUFFERSIZE NdrBufferSizer[NDR_TABLE_ 0, 0, 0, 0, NdrUserMarshalBufferSize }; -NDR_MEMORYSIZE NdrMemorySizer[NDR_TABLE_SIZE] = { +const NDR_MEMORYSIZE NdrMemorySizer[NDR_TABLE_SIZE] = { 0, NdrBaseTypeMemorySize, NdrBaseTypeMemorySize, NdrBaseTypeMemorySize, NdrBaseTypeMemorySize, NdrBaseTypeMemorySize, NdrBaseTypeMemorySize, NdrBaseTypeMemorySize, @@ -253,7 +253,7 @@ NDR_MEMORYSIZE NdrMemorySizer[NDR_TABLE_ 0, 0, 0, 0, NdrUserMarshalMemorySize }; -NDR_FREE NdrFreer[NDR_TABLE_SIZE] = { +const NDR_FREE NdrFreer[NDR_TABLE_SIZE] = { 0, NdrBaseTypeFree, NdrBaseTypeFree, NdrBaseTypeFree, NdrBaseTypeFree, NdrBaseTypeFree, NdrBaseTypeFree, NdrBaseTypeFree, diff --git a/dlls/rpcrt4/ndr_misc.h b/dlls/rpcrt4/ndr_misc.h index 0abeaed..e81303b 100644 --- a/dlls/rpcrt4/ndr_misc.h +++ b/dlls/rpcrt4/ndr_misc.h @@ -42,10 +42,10 @@ typedef void (WINAPI *NDR_BUFF typedef unsigned long (WINAPI *NDR_MEMORYSIZE)(PMIDL_STUB_MESSAGE, PFORMAT_STRING); typedef void (WINAPI *NDR_FREE) (PMIDL_STUB_MESSAGE, unsigned char*, PFORMAT_STRING); -extern NDR_MARSHALL NdrMarshaller[]; -extern NDR_UNMARSHALL NdrUnmarshaller[]; -extern NDR_BUFFERSIZE NdrBufferSizer[]; -extern NDR_MEMORYSIZE NdrMemorySizer[]; -extern NDR_FREE NdrFreer[]; +extern const NDR_MARSHALL NdrMarshaller[]; +extern const NDR_UNMARSHALL NdrUnmarshaller[]; +extern const NDR_BUFFERSIZE NdrBufferSizer[]; +extern const NDR_MEMORYSIZE NdrMemorySizer[]; +extern const NDR_FREE NdrFreer[]; #endif /* __WINE_NDR_MISC_H */

1 0

James Hawkins : advpack: Document RegisterOCX.
by Alexandre Julliard 14 Apr '06

14 Apr '06

Module: wine Branch: refs/heads/master Commit: 640b7761eb874b2cbda2e67e8c712c89abc9df17 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=640b7761eb874b2cbda2e67… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Apr 13 22:32:23 2006 -0500 advpack: Document RegisterOCX. --- dlls/advpack/advpack.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/advpack/advpack.c b/dlls/advpack/advpack.c index b84717f..eb8ca31 100644 --- a/dlls/advpack/advpack.c +++ b/dlls/advpack/advpack.c @@ -394,6 +394,24 @@ HRESULT WINAPI RebootCheckOnInstallW(HWN /*********************************************************************** * RegisterOCX (ADVPACK.@) + * + * Registers an OCX. + * + * PARAMS + * hWnd [I] Handle to the window used for the display. + * hInst [I] Instance of the process. + * cmdline [I] Contains parameters in the order OCX,reboot,install_cmd + * show [I] How the window should be shown. + * + * RETURNS + * This function does not return anything. + * + * NOTES + * OCX - Filename of the OCX to register. + * reboot - smart reboot behavior + * 'I' Reboot if needed. + * 'N' No reboot. + * install_cmd - Command line to pass to the OCX's DllInstall. */ void WINAPI RegisterOCX(HWND hWnd, HINSTANCE hInst, LPCSTR cmdline, INT show) {

1 0