June 2010 - Wine-Commits - list.winehq.org

Alexandre Julliard : configure: Disable clean and depend rules for disabled top-level directories.
by Alexandre Julliard June 30, 2010

June 30, 2010

Module: wine Branch: master Commit: 9bdd0272ce45b7d720b1b7d0cf90c744a967cc4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bdd0272ce45b7d720b1b7d0c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 30 17:34:20 2010 +0200 configure: Disable clean and depend rules for disabled top-level directories. --- aclocal.m4 | 7 ++++--- configure | 9 ++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 69d0e1a..a77f15e 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -183,9 +183,10 @@ wine_fn_config_makefile () { ac_dir=$[1] ac_enable=$[2] - wine_fn_all_dir_rules $ac_dir "Make.rules \$(MAKEDEP)" + AS_VAR_IF([$ac_enable],[no],[return 0]) - AS_VAR_IF([$ac_enable],[no],,[wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ + wine_fn_all_dir_rules $ac_dir "Make.rules \$(MAKEDEP)" + wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ "all: $ac_dir .PHONY: $ac_dir $ac_dir: $ac_dir/Makefile dummy @@ -197,7 +198,7 @@ install-lib:: $ac_dir install-dev:: $ac_dir @cd $ac_dir && \$(MAKE) install-dev uninstall:: $ac_dir/Makefile - @cd $ac_dir && \$(MAKE) uninstall"]) + @cd $ac_dir && \$(MAKE) uninstall" } wine_fn_config_lib () diff --git a/configure b/configure index 530c551..4847297 100755 --- a/configure +++ b/configure @@ -13989,13 +13989,13 @@ wine_fn_config_makefile () { ac_dir=$1 ac_enable=$2 - wine_fn_all_dir_rules $ac_dir "Make.rules \$(MAKEDEP)" - eval as_val=\$$ac_enable if test "x$as_val" = x""no; then : + return 0 +fi -else - wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ + wine_fn_all_dir_rules $ac_dir "Make.rules \$(MAKEDEP)" + wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ "all: $ac_dir .PHONY: $ac_dir $ac_dir: $ac_dir/Makefile dummy @@ -14008,7 +14008,6 @@ install-dev:: $ac_dir @cd $ac_dir && \$(MAKE) install-dev uninstall:: $ac_dir/Makefile @cd $ac_dir && \$(MAKE) uninstall" -fi } wine_fn_config_lib ()

1 0

Vitaly Lipatov : kernel32: Add Russian translation.
by Alexandre Julliard June 30, 2010

June 30, 2010

Module: wine Branch: master Commit: 43ed0c177cc93985f701ec694e789d5343f13c06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43ed0c177cc93985f701ec694… Author: Vitaly Lipatov <lav(a)etersoft.ru> Date: Sat Jun 26 18:08:56 2010 +0400 kernel32: Add Russian translation. --- .gitignore | 1 + dlls/kernel32/Makefile.in | 3 +- dlls/kernel32/nls/winerr_rus.mc | 3736 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 3739 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=43ed0c177cc93985f701e…

1 0

Alexandre Julliard : ntdll: Append a terminating null and return the correct length in NtQuerySymbolicLinkObject .
by Alexandre Julliard June 30, 2010

June 30, 2010

Module: wine Branch: master Commit: 6df7e7b94362f874a5b5a46cda0eead8f517c651 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6df7e7b94362f874a5b5a46cd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 30 16:11:42 2010 +0200 ntdll: Append a terminating null and return the correct length in NtQuerySymbolicLinkObject. --- dlls/ntdll/om.c | 27 +++++++++++++++------------ 1 files changed, 15 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/om.c b/dlls/ntdll/om.c index c5d9b84..0e64ddd 100644 --- a/dlls/ntdll/om.c +++ b/dlls/ntdll/om.c @@ -634,33 +634,36 @@ NTSTATUS WINAPI NtCreateSymbolicLinkObject(OUT PHANDLE SymbolicLinkHandle,IN ACC * ZwQuerySymbolicLinkObject [NTDLL.@] * * Query a namespace symbolic link object target name. - * + * * PARAMS - * LinkHandle [I] Handle to a symbolic link object - * LinkTarget [O] Destination for the symbolic link target - * ReturnedLength [O] Size of returned data + * handle [I] Handle to a symbolic link object + * target [O] Destination for the symbolic link target + * length [O] Size of returned data * * RETURNS * Success: ERROR_SUCCESS. * Failure: An NTSTATUS error code. */ -NTSTATUS WINAPI NtQuerySymbolicLinkObject(IN HANDLE LinkHandle, IN OUT PUNICODE_STRING LinkTarget, - OUT PULONG ReturnedLength OPTIONAL) +NTSTATUS WINAPI NtQuerySymbolicLinkObject( HANDLE handle, PUNICODE_STRING target, PULONG length ) { NTSTATUS ret; - TRACE("(%p,%p,%p)\n", LinkHandle, LinkTarget, ReturnedLength); - if (!LinkTarget) return STATUS_ACCESS_VIOLATION; + TRACE("(%p,%p,%p)\n", handle, target, length ); + + if (!target) return STATUS_ACCESS_VIOLATION; SERVER_START_REQ(query_symlink) { - req->handle = wine_server_obj_handle( LinkHandle ); - wine_server_set_reply( req, LinkTarget->Buffer, LinkTarget->MaximumLength ); + req->handle = wine_server_obj_handle( handle ); + if (target->MaximumLength >= sizeof(WCHAR)) + wine_server_set_reply( req, target->Buffer, target->MaximumLength - sizeof(WCHAR) ); if (!(ret = wine_server_call( req ))) { - LinkTarget->Length = wine_server_reply_size(reply); - if (ReturnedLength) *ReturnedLength = LinkTarget->Length; + target->Length = wine_server_reply_size(reply); + target->Buffer[target->Length / sizeof(WCHAR)] = 0; + if (length) *length = reply->total + sizeof(WCHAR); } + else if (length && ret == STATUS_BUFFER_TOO_SMALL) *length = reply->total + sizeof(WCHAR); } SERVER_END_REQ; return ret;

1 0

Marko Nikolic : advapi32/tests: Removed sign comparison warning in test_LookupAccountName.
by Alexandre Julliard June 30, 2010

June 30, 2010

Module: wine Branch: master Commit: 29dd5235057bde5beba2807bb6876a7aa56d62b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29dd5235057bde5beba2807bb… Author: Marko Nikolic <grkoma(a)gmail.com> Date: Tue Jun 29 23:23:37 2010 +0200 advapi32/tests: Removed sign comparison warning in test_LookupAccountName. --- dlls/advapi32/tests/security.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 1f1b697..cd4624a 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1931,7 +1931,7 @@ static void test_LookupAccountName(void) ok(!lstrcmp(domain, sid_dom), "Expected %s, got %s\n", sid_dom, domain); } ok(domain_size == domain_save - 1, "Expected %d, got %d\n", domain_save - 1, domain_size); - ok(lstrlen(domain) == domain_size, "Expected %d, got %d\n", lstrlen(domain), domain_size); + ok(strlen(domain) == domain_size, "Expected %d, got %d\n", lstrlen(domain), domain_size); ok(sid_use == SidTypeUser, "Expected SidTypeUser (%d), got %d\n", SidTypeUser, sid_use); domain_size = domain_save; sid_size = sid_save; @@ -1949,7 +1949,7 @@ static void test_LookupAccountName(void) ok(!lstrcmp(account, "Everyone"), "Expected Everyone, got %s\n", account); ok(!lstrcmp(domain, sid_dom), "Expected %s, got %s\n", sid_dom, domain); ok(domain_size == 0, "Expected 0, got %d\n", domain_size); - ok(lstrlen(domain) == domain_size, "Expected %d, got %d\n", lstrlen(domain), domain_size); + ok(strlen(domain) == domain_size, "Expected %d, got %d\n", lstrlen(domain), domain_size); ok(sid_use == SidTypeWellKnownGroup, "Expected SidTypeWellKnownGroup (%d), got %d\n", SidTypeWellKnownGroup, sid_use); domain_size = domain_save; }

1 0

Alexander Nicolaysen Sørnes : mapi32: Add Norwegian Bokmål translation.
by Alexandre Julliard June 30, 2010

June 30, 2010

Module: wine Branch: master Commit: 7f0273a98f1aeb29d621d99df073c242213aff2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f0273a98f1aeb29d621d99df… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Jun 30 16:11:21 2010 +0200 mapi32: Add Norwegian Bokmål translation. --- dlls/mapi32/Makefile.in | 1 + dlls/mapi32/No.rc | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 0 deletions(-) diff --git a/dlls/mapi32/Makefile.in b/dlls/mapi32/Makefile.in index 41140e5..6197cd5 100644 --- a/dlls/mapi32/Makefile.in +++ b/dlls/mapi32/Makefile.in @@ -25,6 +25,7 @@ RC_SRCS = \ Ko.rc \ Lt.rc \ Nl.rc \ + No.rc \ Pl.rc \ Pt.rc \ Ro.rc \ diff --git a/dlls/mapi32/No.rc b/dlls/mapi32/No.rc new file mode 100644 index 0000000..5e4d8c5 --- /dev/null +++ b/dlls/mapi32/No.rc @@ -0,0 +1,32 @@ +/* +* MAPI32 Norwegian Bokmål resources +* +* Copyright 2010 Alexander N. Sørnes <alex(a)thehandofagony.com> +* +* 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 +* +*/ + +#include "res.h" + +#pragma code_page(65001) + +LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL + +STRINGTABLE +{ + IDS_NO_MAPI_CLIENT, "Klarte ikke sende e-post fordi en MAPI-klient ikke er installert." + IDS_SEND_MAIL, "Send e-post" +}

1 0

Mikko Rasa : ddraw: Grow index buffer as needed.
by Alexandre Julliard June 30, 2010

June 30, 2010

Module: wine Branch: master Commit: f18cb4c2f45878c40bbc27f826c4d97ddba304a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f18cb4c2f45878c40bbc27f82… Author: Mikko Rasa <tdb(a)tdb.fi> Date: Wed Jun 30 11:40:29 2010 +0300 ddraw: Grow index buffer as needed. --- dlls/ddraw/device.c | 33 ++++++++++++++++++++++++++++++++- 1 files changed, 32 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index aba7bdc..6b00d4f 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4299,6 +4299,7 @@ IDirect3DDeviceImpl_7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, DWORD stride = get_flexible_vertex_size(vb->fvf); WORD *LockedIndices; HRESULT hr; + WINED3DBUFFER_DESC desc; TRACE("(%p)->(%08x,%p,%d,%d,%p,%d,%08x)\n", This, PrimitiveType, vb, StartVertex, NumVertices, Indices, IndexCount, Flags); @@ -4320,6 +4321,37 @@ IDirect3DDeviceImpl_7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, return hr; } + /* check that the buffer is large enough to hold the indices, + * reallocate if necessary. + */ + hr = IWineD3DBuffer_GetDesc(This->indexbuffer, &desc); + if(desc.Size < IndexCount * sizeof(WORD)) + { + UINT size = max(desc.Size * 2, IndexCount * sizeof(WORD)); + IWineD3DBuffer *buffer; + IUnknown *parent; + + TRACE("Growing index buffer to %u bytes\n", size); + + IWineD3DBuffer_GetParent(This->indexbuffer, &parent); + hr = IWineD3DDevice_CreateIndexBuffer(This->wineD3DDevice, size, + WINED3DUSAGE_DYNAMIC /* Usage */, WINED3DPOOL_DEFAULT, &buffer, parent, + &ddraw_null_wined3d_parent_ops); + if(hr != D3D_OK) + { + ERR("(%p) IWineD3DDevice::CreateIndexBuffer failed with hr = %08x\n", This, hr); + IParent_Release(parent); + LeaveCriticalSection(&ddraw_cs); + return hr; + } + + IWineD3DBuffer_Release(This->indexbuffer); + This->indexbuffer = buffer; + + ((IParentImpl *)parent)->child = (IUnknown *)buffer; + IParent_Release(parent); + } + /* copy the index stream into the index buffer. * A new IWineD3DDevice method could be created * which takes an user pointer containing the indices @@ -4331,7 +4363,6 @@ IDirect3DDeviceImpl_7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, IndexCount * sizeof(WORD), (BYTE **) &LockedIndices, 0 /* Flags */); - assert(IndexCount < 0x100000); if(hr != D3D_OK) { ERR("(%p) IWineD3DBuffer::Map failed with hr = %08x\n", This, hr);

1 0

Jacek Caban : shdocvw: Added IBindStatusCallback::OnProgress( BINDSTATUS_REDIRECTING) implementation.
by Alexandre Julliard June 30, 2010

June 30, 2010

Module: wine Branch: master Commit: df8f393b59823f646f4e53322ca82009d5146090 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df8f393b59823f646f4e53322… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 29 21:03:47 2010 +0200 shdocvw: Added IBindStatusCallback::OnProgress(BINDSTATUS_REDIRECTING) implementation. --- dlls/shdocvw/navigate.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c index 5166e97..6f05cf2 100644 --- a/dlls/shdocvw/navigate.c +++ b/dlls/shdocvw/navigate.c @@ -222,6 +222,8 @@ static HRESULT WINAPI BindStatusCallback_OnProgress(IBindStatusCallback *iface, debugstr_w(szStatusText)); switch(ulStatusCode) { + case BINDSTATUS_REDIRECTING: + return set_dochost_url(This->doc_host, szStatusText); case BINDSTATUS_BEGINDOWNLOADDATA: set_status_text(This, szStatusText); /* FIXME: "Start downloading from site: %s" */ return S_OK;

1 0

Jacek Caban : shdocvw: Store DocHost url on a regular heap.
by Alexandre Julliard June 30, 2010

June 30, 2010

Module: wine Branch: master Commit: aed47627f6e1db38b52874acb12b76ad701fe0ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=aed47627f6e1db38b52874acb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 29 21:03:22 2010 +0200 shdocvw: Store DocHost url on a regular heap. --- dlls/shdocvw/dochost.c | 2 +- dlls/shdocvw/navigate.c | 40 +++++++++++++++++++++++++++++----------- 2 files changed, 30 insertions(+), 12 deletions(-) diff --git a/dlls/shdocvw/dochost.c b/dlls/shdocvw/dochost.c index 2196eb9..b3db012 100644 --- a/dlls/shdocvw/dochost.c +++ b/dlls/shdocvw/dochost.c @@ -820,5 +820,5 @@ void DocHost_Release(DocHost *This) ConnectionPointContainer_Destroy(&This->cps); - CoTaskMemFree(This->url); + heap_free(This->url); } diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c index 3310cba..5166e97 100644 --- a/dlls/shdocvw/navigate.c +++ b/dlls/shdocvw/navigate.c @@ -111,6 +111,23 @@ static void set_status_text(BindStatusCallback *This, LPCWSTR str) IOleInPlaceFrame_SetStatusText(This->doc_host->frame, str); } +static HRESULT set_dochost_url(DocHost *This, const WCHAR *url) +{ + WCHAR *new_url; + + if(url) { + new_url = heap_strdupW(url); + if(!new_url) + return E_OUTOFMEMORY; + }else { + new_url = NULL; + } + + heap_free(This->url); + This->url = new_url; + return S_OK; +} + #define BINDSC_THIS(iface) DEFINE_THIS(BindStatusCallback, BindStatusCallback, iface) static HRESULT WINAPI BindStatusCallback_QueryInterface(IBindStatusCallback *iface, @@ -502,6 +519,7 @@ static HRESULT bind_to_object(DocHost *This, IMoniker *mon, LPCWSTR url, IBindCt IBindStatusCallback *callback) { IUnknown *unk = NULL; + WCHAR *display_name; HRESULT hres; if(mon) { @@ -512,10 +530,16 @@ static HRESULT bind_to_object(DocHost *This, IMoniker *mon, LPCWSTR url, IBindCt return hres; } - CoTaskMemFree(This->url); - hres = IMoniker_GetDisplayName(mon, 0, NULL, &This->url); - if(FAILED(hres)) + hres = IMoniker_GetDisplayName(mon, 0, NULL, &display_name); + if(FAILED(hres)) { FIXME("GetDisplayName failed: %08x\n", hres); + return hres; + } + + hres = set_dochost_url(This, display_name); + CoTaskMemFree(display_name); + if(FAILED(hres)) + return hres; IBindCtx_RegisterObjectParam(bindctx, (LPOLESTR)SZ_HTML_CLIENTSITE_OBJECTPARAM, (IUnknown*)CLIENTSITE(This)); @@ -538,18 +562,12 @@ static HRESULT bind_to_object(DocHost *This, IMoniker *mon, LPCWSTR url, IBindCt static void html_window_navigate(DocHost *This, IHTMLPrivateWindow *window, BSTR url, BSTR headers, SAFEARRAY *post_data) { VARIANT headers_var, post_data_var; - WCHAR *new_url; BSTR empty_str; - DWORD size; HRESULT hres; - size = (strlenW(url)+1)*sizeof(WCHAR); - new_url = CoTaskMemAlloc(size); - if(!new_url) + hres = set_dochost_url(This, url); + if(FAILED(hres)) return; - memcpy(new_url, url, size); - CoTaskMemFree(This->url); - This->url = new_url; empty_str = SysAllocStringLen(NULL, 0);

1 0

Alexandre Julliard : gdiplus/tests: Comment out a test that corrupts the stack on Vista.
by Alexandre Julliard June 30, 2010

June 30, 2010

Module: wine Branch: master Commit: 4b9258d165d0a7c745814d24bf404b477cee829e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b9258d165d0a7c745814d24b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 30 14:17:13 2010 +0200 gdiplus/tests: Comment out a test that corrupts the stack on Vista. --- dlls/gdiplus/tests/pen.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/pen.c b/dlls/gdiplus/tests/pen.c index 0bdf280..b742118 100644 --- a/dlls/gdiplus/tests/pen.c +++ b/dlls/gdiplus/tests/pen.c @@ -225,9 +225,15 @@ static void test_dasharray(void) /* Try to set with count = 0. */ GdipSetPenDashStyle(pen, DashStyleDot); + if (0) /* corrupts stack on 64-bit Vista */ + { status = GdipSetPenDashArray(pen, dashes, 0); ok(status == OutOfMemory || status == InvalidParameter, "Expected OutOfMemory or InvalidParameter, got %.8x\n", status); + } + status = GdipSetPenDashArray(pen, dashes, -1); + ok(status == OutOfMemory || status == InvalidParameter, + "Expected OutOfMemory or InvalidParameter, got %.8x\n", status); GdipGetPenDashStyle(pen, &style); expect(DashStyleDot, style);

1 0

Andrew Nguyen : atl: Accept a NULL output container pointer in AtlAxAttachControl.
by Alexandre Julliard June 30, 2010

June 30, 2010

Module: wine Branch: master Commit: e01794d4f7b3097b51d558452618f04175f672fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=e01794d4f7b3097b51d558452… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Jun 29 09:06:35 2010 -0500 atl: Accept a NULL output container pointer in AtlAxAttachControl. --- dlls/atl/atl_ax.c | 5 +- dlls/atl/tests/Makefile.in | 3 +- dlls/atl/tests/atl_ax.c | 122 ++++++++++++++++++++++++++++++++++++++++++++ dlls/atl/tests/module.c | 1 - 4 files changed, 127 insertions(+), 4 deletions(-) diff --git a/dlls/atl/atl_ax.c b/dlls/atl/atl_ax.c index cf654e1..d9d60a5 100644 --- a/dlls/atl/atl_ax.c +++ b/dlls/atl/atl_ax.c @@ -1044,10 +1044,11 @@ HRESULT WINAPI AtlAxAttachControl(IUnknown* pControl, HWND hWnd, IUnknown** ppUn TRACE( "%p %p %p\n", pControl, hWnd, ppUnkContainer ); - *ppUnkContainer = NULL; + if (!pControl) + return E_INVALIDARG; hr = IOCS_Create( hWnd, pControl, &pUnkContainer ); - if ( SUCCEEDED( hr ) ) + if ( SUCCEEDED( hr ) && ppUnkContainer) { *ppUnkContainer = (IUnknown*) pUnkContainer; } diff --git a/dlls/atl/tests/Makefile.in b/dlls/atl/tests/Makefile.in index b9752d4..98d9b03 100644 --- a/dlls/atl/tests/Makefile.in +++ b/dlls/atl/tests/Makefile.in @@ -3,9 +3,10 @@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = atl.dll -IMPORTS = atl oleaut32 ole32 rpcrt4 user32 gdi32 advapi32 kernel32 +IMPORTS = uuid atl oleaut32 ole32 rpcrt4 user32 gdi32 advapi32 kernel32 C_SRCS = \ + atl_ax.c \ module.c @MAKE_TEST_RULES@ diff --git a/dlls/atl/tests/atl_ax.c b/dlls/atl/tests/atl_ax.c new file mode 100644 index 0000000..8b9966c --- /dev/null +++ b/dlls/atl/tests/atl_ax.c @@ -0,0 +1,122 @@ +/* + * Unit tests for Active Template Library ActiveX functions + * + * Copyright 2010 Andrew Nguyen + * + * 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 + */ + +#include <stdarg.h> +#include <stdio.h> + +#define COBJMACROS + +#include <wine/test.h> +#include <windef.h> +#include <winbase.h> +#include <winuser.h> +#include <wingdi.h> +#include <winnls.h> +#include <winerror.h> +#include <winnt.h> +#include <wtypes.h> +#include <olectl.h> +#include <ocidl.h> +#include <exdisp.h> + +HRESULT WINAPI AtlAxAttachControl(IUnknown *, HWND, IUnknown **); + +static ATOM register_class(void) +{ + WNDCLASSA wndclassA; + + wndclassA.style = 0; + wndclassA.lpfnWndProc = DefWindowProc; + wndclassA.cbClsExtra = 0; + wndclassA.cbWndExtra = 0; + wndclassA.hInstance = GetModuleHandleA(NULL); + wndclassA.hIcon = NULL; + wndclassA.hCursor = LoadCursorA(NULL, IDC_ARROW); + wndclassA.hbrBackground = (HBRUSH)(COLOR_BTNFACE+1); + wndclassA.lpszMenuName = NULL; + wndclassA.lpszClassName = "WineAtlTestClass"; + + return RegisterClassA(&wndclassA); +} + +static void test_AtlAxAttachControl(void) +{ + HWND hwnd = CreateWindowA("WineAtlTestClass", "Wine ATL Test Window", 0, + CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, + CW_USEDEFAULT, NULL, NULL, NULL, NULL); + HRESULT hr; + IUnknown *pObj, *pContainer; + + hr = AtlAxAttachControl(NULL, NULL, NULL); + ok(hr == E_INVALIDARG, "Expected AtlAxAttachControl to return E_INVALIDARG, got 0x%08x\n", hr); + + pContainer = (IUnknown *)0xdeadbeef; + hr = AtlAxAttachControl(NULL, NULL, &pContainer); + ok(hr == E_INVALIDARG, "Expected AtlAxAttachControl to return E_INVALIDARG, got 0x%08x\n", hr); + ok(pContainer == (IUnknown *)0xdeadbeef, + "Expected the output container pointer to be untouched, got %p\n", pContainer); + + hr = AtlAxAttachControl(NULL, hwnd, NULL); + ok(hr == E_INVALIDARG, "Expected AtlAxAttachControl to return E_INVALIDARG, got 0x%08x\n", hr); + + hr = CoCreateInstance(&CLSID_WebBrowser, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, + &IID_IOleObject, (void **)&pObj); + ok(hr == S_OK, "Expected CoCreateInstance to return S_OK, got 0x%08x\n", hr); + + if (FAILED(hr)) + { + skip("Couldn't obtain a test IOleObject instance\n"); + return; + } + + hr = AtlAxAttachControl(pObj, NULL, NULL); + todo_wine + ok(hr == S_FALSE, "Expected AtlAxAttachControl to return S_FALSE, got 0x%08x\n", hr); + + pContainer = (IUnknown *)0xdeadbeef; + hr = AtlAxAttachControl(pObj, NULL, &pContainer); + todo_wine + ok(hr == S_FALSE, "Expected AtlAxAttachControl to return S_FALSE, got 0x%08x\n", hr); + ok(pContainer != (IUnknown *)0xdeadbeef && + pContainer != NULL, + "Expected the output container pointer to be initialized to non-NULL, got %p\n", pContainer); + + if (pContainer != (IUnknown *)0xdeadbeef && pContainer != NULL) + IUnknown_Release(pContainer); + + hr = AtlAxAttachControl(pObj, hwnd, NULL); + ok(hr == S_OK, "Expected AtlAxAttachControl to return S_OK, got 0x%08x\n", hr); + + IUnknown_Release(pObj); + + DestroyWindow(hwnd); +} + +START_TEST(atl_ax) +{ + if (!register_class()) + return; + + CoInitialize(NULL); + + test_AtlAxAttachControl(); + + CoUninitialize(); +} diff --git a/dlls/atl/tests/module.c b/dlls/atl/tests/module.c index 294d87b..1b21f6e 100644 --- a/dlls/atl/tests/module.c +++ b/dlls/atl/tests/module.c @@ -32,7 +32,6 @@ #include <winnls.h> #include <winerror.h> #include <winnt.h> -#include <initguid.h> #include <wtypes.h> #include <olectl.h> #include <ocidl.h>

1 0