Module: wine Branch: master Commit: 3db4aaa2b7be246a063745ec66282b3761fd57f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3db4aaa2b7be246a063745ec66...
Author: David Hedberg david.hedberg@gmail.com Date: Tue Aug 3 03:43:06 2010 +0200
explorerframe: Implement Initialize.
---
dlls/explorerframe/Makefile.in | 2 +- dlls/explorerframe/nstc.c | 93 ++++++++++++++++++++++++++++++++++++++- dlls/explorerframe/tests/nstc.c | 46 +++++++++++++++++++- 3 files changed, 137 insertions(+), 4 deletions(-)
diff --git a/dlls/explorerframe/Makefile.in b/dlls/explorerframe/Makefile.in index 3d17fcd..68cca8d 100644 --- a/dlls/explorerframe/Makefile.in +++ b/dlls/explorerframe/Makefile.in @@ -4,7 +4,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = explorerframe.dll -IMPORTS = uuid +IMPORTS = uuid user32
C_SRCS = \ explorerframe_main.c \ diff --git a/dlls/explorerframe/nstc.c b/dlls/explorerframe/nstc.c index 5c25d8c..c3a1563 100644 --- a/dlls/explorerframe/nstc.c +++ b/dlls/explorerframe/nstc.c @@ -37,8 +37,51 @@ WINE_DEFAULT_DEBUG_CHANNEL(nstc); typedef struct { const INameSpaceTreeControl2Vtbl *lpVtbl; LONG ref; + + HWND hwnd_main; + + NSTCSTYLE style; } NSTC2Impl;
+/************************************************************************* + * NamespaceTree window functions + */ +static LRESULT create_namespacetree(HWND hWnd, CREATESTRUCTW *crs) +{ + NSTC2Impl *This = crs->lpCreateParams; + + TRACE("%p (%p)\n", This, crs); + SetWindowLongPtrW(hWnd, GWLP_USERDATA, (LPARAM)This); + This->hwnd_main = hWnd; + + INameSpaceTreeControl_AddRef((INameSpaceTreeControl*)This); + + return TRUE; +} + +static LRESULT destroy_namespacetree(NSTC2Impl *This) +{ + TRACE("%p\n", This); + + /* This reference was added in create_namespacetree */ + INameSpaceTreeControl_Release((INameSpaceTreeControl*)This); + return TRUE; +} + +static LRESULT CALLBACK NSTC2_WndProc(HWND hWnd, UINT uMessage, + WPARAM wParam, LPARAM lParam) +{ + NSTC2Impl *This = (NSTC2Impl*)GetWindowLongPtrW(hWnd, GWLP_USERDATA); + + switch(uMessage) + { + case WM_NCCREATE: return create_namespacetree(hWnd, (CREATESTRUCTW*)lParam); + case WM_DESTROY: return destroy_namespacetree(This); + default: return DefWindowProcW(hWnd, uMessage, wParam, lParam); + } + return 0; +} + /************************************************************************** * INameSpaceTreeControl2 Implementation */ @@ -100,8 +143,54 @@ static HRESULT WINAPI NSTC2_fnInitialize(INameSpaceTreeControl2* iface, NSTCSTYLE nstcsFlags) { NSTC2Impl *This = (NSTC2Impl*)iface; - FIXME("stub, %p (%p, %p, %x)\n", This, hwndParent, prc, nstcsFlags); - return E_NOTIMPL; + WNDCLASSW wc; + DWORD window_style, window_ex_style; + RECT rc; + static const WCHAR NSTC2_CLASS_NAME[] = + {'N','a','m','e','s','p','a','c','e','T','r','e','e', + 'C','o','n','t','r','o','l',0}; + + TRACE("%p (%p, %p, %x)\n", This, hwndParent, prc, nstcsFlags); + + This->style = nstcsFlags; + + if(!GetClassInfoW(explorerframe_hinstance, NSTC2_CLASS_NAME, &wc)) + { + wc.style = CS_HREDRAW | CS_VREDRAW; + wc.lpfnWndProc = NSTC2_WndProc; + wc.cbClsExtra = 0; + wc.cbWndExtra = 0; + wc.hInstance = explorerframe_hinstance; + wc.hIcon = 0; + wc.hCursor = LoadCursorW(0, (LPWSTR)IDC_ARROW); + wc.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); + wc.lpszMenuName = NULL; + wc.lpszClassName = NSTC2_CLASS_NAME; + + if (!RegisterClassW(&wc)) return E_FAIL; + } + + /* NSTCS_TABSTOP and NSTCS_BORDER affects the host window */ + window_style = WS_VISIBLE | WS_CHILD | WS_CLIPCHILDREN | WS_CLIPSIBLINGS | + (nstcsFlags & NSTCS_BORDER ? WS_BORDER : 0); + window_ex_style = nstcsFlags & NSTCS_TABSTOP ? WS_EX_CONTROLPARENT : 0; + + if(prc) + CopyRect(&rc, prc); + else + rc.left = rc.right = rc.top = rc.bottom = 0; + + This->hwnd_main = CreateWindowExW(window_ex_style, NSTC2_CLASS_NAME, NULL, window_style, + rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, + hwndParent, 0, explorerframe_hinstance, This); + + if(!This->hwnd_main) + { + ERR("Failed to create the window.\n"); + return HRESULT_FROM_WIN32(GetLastError()); + } + + return S_OK; }
static HRESULT WINAPI NSTC2_fnTreeAdvise(INameSpaceTreeControl2* iface, diff --git a/dlls/explorerframe/tests/nstc.c b/dlls/explorerframe/tests/nstc.c index bd0caf1..122cb8d 100644 --- a/dlls/explorerframe/tests/nstc.c +++ b/dlls/explorerframe/tests/nstc.c @@ -34,7 +34,10 @@ static HWND hwnd; static BOOL test_initialization(void) { INameSpaceTreeControl *pnstc; + IUnknown *punk; + LONG lres; HRESULT hr; + RECT rc;
hr = CoCreateInstance(&CLSID_NamespaceTreeControl, NULL, CLSCTX_INPROC_SERVER, &IID_INameSpaceTreeControl, (void**)&pnstc); @@ -44,7 +47,48 @@ static BOOL test_initialization(void) return FALSE; }
- INameSpaceTreeControl_Release(pnstc); + hr = INameSpaceTreeControl_Initialize(pnstc, NULL, NULL, 0); + ok(hr == HRESULT_FROM_WIN32(ERROR_TLW_WITH_WSCHILD), "Got (0x%08x)\n", hr); + + hr = INameSpaceTreeControl_Initialize(pnstc, (HWND)0xDEADBEEF, NULL, 0); + ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_WINDOW_HANDLE), "Got (0x%08x)\n", hr); + + ZeroMemory(&rc, sizeof(RECT)); + hr = INameSpaceTreeControl_Initialize(pnstc, NULL, &rc, 0); + ok(hr == HRESULT_FROM_WIN32(ERROR_TLW_WITH_WSCHILD), "Got (0x%08x)\n", hr); + + hr = INameSpaceTreeControl_Initialize(pnstc, (HWND)0xDEADBEEF, &rc, 0); + ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_WINDOW_HANDLE), "Got (0x%08x)\n", hr); + + hr = INameSpaceTreeControl_Initialize(pnstc, hwnd, NULL, 0); + ok(hr == S_OK, "Got (0x%08x)\n", hr); + + /* Some "random" interfaces */ + hr = INameSpaceTreeControl_QueryInterface(pnstc, &IID_IOleInPlaceObject, (void**)&punk); + ok(hr == E_NOINTERFACE || hr == S_OK /* vista, w2k8 */, "Got (0x%08x)\n", hr); + if(SUCCEEDED(hr)) IUnknown_Release(punk); + hr = INameSpaceTreeControl_QueryInterface(pnstc, &IID_IOleInPlaceActiveObject, (void**)&punk); + ok(hr == E_NOINTERFACE || hr == S_OK /* vista, w2k8 */, "Got (0x%08x)\n", hr); + if(SUCCEEDED(hr)) IUnknown_Release(punk); + hr = INameSpaceTreeControl_QueryInterface(pnstc, &IID_IOleInPlaceObjectWindowless, (void**)&punk); + ok(hr == E_NOINTERFACE || hr == S_OK /* vista, w2k8 */, "Got (0x%08x)\n", hr); + if(SUCCEEDED(hr)) IUnknown_Release(punk); + + hr = INameSpaceTreeControl_QueryInterface(pnstc, &IID_IOleInPlaceUIWindow, (void**)&punk); + ok(hr == E_NOINTERFACE, "Got (0x%08x)\n", hr); + hr = INameSpaceTreeControl_QueryInterface(pnstc, &IID_IOleInPlaceFrame, (void**)&punk); + ok(hr == E_NOINTERFACE, "Got (0x%08x)\n", hr); + hr = INameSpaceTreeControl_QueryInterface(pnstc, &IID_IOleInPlaceSite, (void**)&punk); + ok(hr == E_NOINTERFACE, "Got (0x%08x)\n", hr); + hr = INameSpaceTreeControl_QueryInterface(pnstc, &IID_IOleInPlaceSiteEx, (void**)&punk); + ok(hr == E_NOINTERFACE, "Got (0x%08x)\n", hr); + hr = INameSpaceTreeControl_QueryInterface(pnstc, &IID_IOleInPlaceSiteWindowless, (void**)&punk); + ok(hr == E_NOINTERFACE, "Got (0x%08x)\n", hr); + + /* On windows, the reference count won't go to zero until the + * window is destroyed. */ + lres = INameSpaceTreeControl_Release(pnstc); + ok(lres, "lres was %d\n", lres);
return TRUE; }
-
Alexandre Julliard