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

appdb/ ./account.php ./preferences.php include ...
by WineHQ 27 Jun '06

27 Jun '06

ChangeSet ID: 26056 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/06/26 22:59:16 Modified files: . : account.php preferences.php include : user.php Added files: unit_test : path.php run_tests run_tests.php test_user.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Clean up user class. Implement start of unit testing framework for appdb. Implement start of user class unit test. Patch: http://cvs.winehq.org/patch.py?id=26056 Old revision New revision Changes Path 1.18 1.19 +13 -4 appdb/account.php 1.23 1.24 +15 -1 appdb/preferences.php 1.68 1.69 +48 -27 appdb/include/user.php Added 1.1 +0 -0 appdb/unit_test/path.php Added 1.1 +0 -0 appdb/unit_test/run_tests Added 1.1 +0 -0 appdb/unit_test/run_tests.php Added 1.1 +0 -0 appdb/unit_test/test_user.php

1 0

appdb/. CODING_STANDARD
by WineHQ 26 Jun '06

26 Jun '06

ChangeSet ID: 26055 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/06/26 12:25:19 Modified files: . : CODING_STANDARD Log message: Jonathan Ernst <jonathan(a)ernstfamily.ch> Update coding standard document Patch: http://cvs.winehq.org/patch.py?id=26055 Old revision New revision Changes Path 1.6 1.7 +31 -48 appdb/CODING_STANDARD Index: appdb/CODING_STANDARD diff -u -p appdb/CODING_STANDARD:1.6 appdb/CODING_STANDARD:1.7 --- appdb/CODING_STANDARD:1.6 26 Jun 2006 17:25:19 -0000 +++ appdb/CODING_STANDARD 26 Jun 2006 17:25:19 -0000 @@ -1,8 +1,8 @@ WineHQ Application Database Coding Practice -######## -# HTML # -######## +/** + * HTML + */ - Respect html coding standards. The current doctype is HTML 4.01 transitional (http://www.w3.org/TR/REC-html40/) Try to make your content validate nicely (http://validator.w3.org/) @@ -10,13 +10,9 @@ Try to make your content validate nicely (i.e. <br /> instead of <br>, avoid using style tags and properties (bgcolor, borders & co) and use stylesheets instead) - -####### -# PHP # -####### -/********************/ -/* variables naming */ -/********************/ +/** + * Variables naming + */ variables that don't come from outside your script (i.e. that aren't fetched from superglobals) should be named this way (a.k.a hungarian notation): prefix + var_name @@ -42,22 +38,22 @@ $sQuery $hResult -/********************/ -/* functions naming */ -/********************/ +/** + * Functions naming + */ 1)functions name should be declarative (i.e. put a declarative verb as the first word like in do_someting()) 2)methods (functions inside a class) are named like this: setMyName() (i.e. words separated with an upper case character) 3)normal functions (outside a class) are named like this: query_appdb() (i.e. words separated with an underscore) -/*****************************/ -/* general coding guidelines */ -/*****************************/ +/** + * general coding guidelines + */ 1) functions, loops and if's are written this way (look at the way {}'s are lined up): <?php -function foo() +function do_foo($sVar) { - if(isset($var)) + if(isset($sVar)) { echo "bar"; } else @@ -71,9 +67,21 @@ function foo() 3) line length should be no more than 130 characters, preferably < 80 -4) comments: Muli line code should look like this. +4) use long php tags (<?php ?>) instead of short ones (<? ?>) as : + a) it could be removed from future versions of php + b) if conflicts with tags like <?xml version=1.0 ?> that are used in xhtml + +5) do not use vars that require register_globals to be on as: + a) it is off by default in php 4.1+ + b) it is more secure + c) it makes it easier to understand where your vars are comming from (forms, session, etc.) + /** + * comments + */ +1) function, method, header and multiline comments: +/** * This functions does nothing interesing. * More comments to come here... */ @@ -82,34 +90,9 @@ function bar() foo(); } -/** - * If you want to highlight some thing this is permissable. for a single line - */ - -if(!isset($appId)) -{ - /* a single comment should be like this */ -} else -{ - - /* Shows a particular version. */ - if($versionId) - { - /* Code comes here */ - } - - /* Shows an apps summary */ - else - { - /* Another code comes here */ - } -} +2) one-line comments +// This is a one line comment -5) use long php tags (<?php ?>) instead of short ones (<? ?>) as : - a) it could be removed from future versions of php - b) if conflicts with tags like <?xml version=1.0 ?> that are used in xhtml +3) always put a single space after the comment mark -6) do not use vars that require register_globals to be on as: - a) it is off by default in php 4.1+ - b) it is more secure - c) it makes it easier to understand where your vars are comming from (forms, session, etc.) +4) never use # for commenting as it will become obsolete in the future

1 0

Jacek Caban : mshtml: Added Unadvise implementation.
by Alexandre Julliard 26 Jun '06

26 Jun '06

Module: wine Branch: refs/heads/master Commit: 7dcfbdecd65c5474f59c11f9f6943fa92fdb5b18 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7dcfbdecd65c5474f59c11f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jun 25 15:50:18 2006 +0200 mshtml: Added Unadvise implementation. --- dlls/mshtml/conpoint.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/conpoint.c b/dlls/mshtml/conpoint.c index 860a9a5..35b73a8 100644 --- a/dlls/mshtml/conpoint.c +++ b/dlls/mshtml/conpoint.c @@ -158,8 +158,15 @@ static HRESULT WINAPI ConnectionPoint_Ad static HRESULT WINAPI ConnectionPoint_Unadvise(IConnectionPoint *iface, DWORD dwCookie) { ConnectionPoint *This = CONPOINT_THIS(iface); - FIXME("(%p)->(%ld)\n", This, dwCookie); - return E_NOTIMPL; + TRACE("(%p)->(%ld)\n", This, dwCookie); + + if(!dwCookie || dwCookie > This->sinks_size || !This->sinks[dwCookie-1].unk) + return CONNECT_E_NOCONNECTION; + + IUnknown_Release(This->sinks[dwCookie-1].unk); + This->sinks[dwCookie-1].unk = NULL; + + return S_OK; } static HRESULT WINAPI ConnectionPoint_EnumConnections(IConnectionPoint *iface,

1 0

Jacek Caban : mshtml: Destroy connection points.
by Alexandre Julliard 26 Jun '06

26 Jun '06

Module: wine Branch: refs/heads/master Commit: 7f617230a5bebea3ffec03743be00f3e1a5de75c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7f617230a5bebea3ffec037… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jun 25 15:49:39 2006 +0200 mshtml: Destroy connection points. --- dlls/mshtml/conpoint.c | 20 ++++++++++++++++++++ dlls/mshtml/htmldoc.c | 2 ++ dlls/mshtml/mshtml_private.h | 2 ++ 3 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/conpoint.c b/dlls/mshtml/conpoint.c index 6ef49ea..860a9a5 100644 --- a/dlls/mshtml/conpoint.c +++ b/dlls/mshtml/conpoint.c @@ -197,6 +197,19 @@ static void ConnectionPoint_Create(HTMLD *cp = ret; } +static void ConnectionPoint_Destroy(ConnectionPoint *This) +{ + int i; + + for(i=0; i<This->sinks_size; i++) { + if(This->sinks[i].unk) + IUnknown_Release(This->sinks[i].unk); + } + + HeapFree(GetProcessHeap(), 0, This->sinks); + HeapFree(GetProcessHeap(), 0, This); +} + #define CONPTCONT_THIS(iface) DEFINE_THIS(HTMLDocument, ConnectionPointContainer, iface) static HRESULT WINAPI ConnectionPointContainer_QueryInterface(IConnectionPointContainer *iface, @@ -271,3 +284,10 @@ void HTMLDocument_ConnectionPoints_Init( ConnectionPoint_Create(This, &DIID_HTMLDocumentEvents, &This->cp_htmldocevents); ConnectionPoint_Create(This, &DIID_HTMLDocumentEvents2, &This->cp_htmldocevents2); } + +void HTMLDocument_ConnectionPoints_Destroy(HTMLDocument *This) +{ + ConnectionPoint_Destroy(This->cp_propnotif); + ConnectionPoint_Destroy(This->cp_htmldocevents); + ConnectionPoint_Destroy(This->cp_htmldocevents2); +} diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index a8fe470..10081ad 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -157,6 +157,8 @@ static ULONG WINAPI HTMLDocument_Release release_nodes(This); + HTMLDocument_ConnectionPoints_Destroy(This); + if(This->nscontainer) NSContainer_Release(This->nscontainer); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 4c7abe4..ee608de 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -260,6 +260,8 @@ void HTMLDocument_Service_Init(HTMLDocum void HTMLDocument_Hlink_Init(HTMLDocument*); void HTMLDocument_ConnectionPoints_Init(HTMLDocument*); +void HTMLDocument_ConnectionPoints_Destroy(HTMLDocument*); + NSContainer *NSContainer_Create(HTMLDocument*,NSContainer*); void NSContainer_Release(NSContainer*);

1 0

Jacek Caban : mshtml: Added Advise implementation.
by Alexandre Julliard 26 Jun '06

26 Jun '06

Module: wine Branch: refs/heads/master Commit: bf1724ef33b107f97bd6e2dfbdbfdcba616a3647 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bf1724ef33b107f97bd6e2d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jun 25 15:48:47 2006 +0200 mshtml: Added Advise implementation. --- dlls/mshtml/conpoint.c | 44 ++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/conpoint.c b/dlls/mshtml/conpoint.c index 480814a..6ef49ea 100644 --- a/dlls/mshtml/conpoint.c +++ b/dlls/mshtml/conpoint.c @@ -40,6 +40,14 @@ struct ConnectionPoint { const IConnectionPointVtbl *lpConnectionPointVtbl; HTMLDocument *doc; + + union { + IUnknown *unk; + IDispatch *disp; + IPropertyNotifySink *propnotif; + } *sinks; + DWORD sinks_size; + IID iid; }; @@ -113,8 +121,38 @@ static HRESULT WINAPI ConnectionPoint_Ad DWORD *pdwCookie) { ConnectionPoint *This = CONPOINT_THIS(iface); - FIXME("(%p)->(%p %p)\n", This, pUnkSink, pdwCookie); - return E_NOTIMPL; + IUnknown *sink; + DWORD i; + HRESULT hres; + + TRACE("(%p)->(%p %p)\n", This, pUnkSink, pdwCookie); + + hres = IUnknown_QueryInterface(pUnkSink, &This->iid, (void**)&sink); + if(FAILED(hres) && !IsEqualGUID(&IID_IPropertyNotifySink, &This->iid)) { + hres = IUnknown_QueryInterface(pUnkSink, &IID_IDispatch, (void**)&sink); + if(FAILED(hres)) + return CONNECT_E_CANNOTCONNECT; + } + + if(This->sinks) { + for(i=0; i<This->sinks_size; i++) { + if(!This->sinks[i].unk) + break; + } + + if(i == This->sinks_size) + This->sinks = HeapReAlloc(GetProcessHeap(), 0, This->sinks, + (++This->sinks_size)*sizeof(*This->sinks)); + }else { + This->sinks = HeapAlloc(GetProcessHeap(), 0, sizeof(*This->sinks)); + This->sinks_size = 1; + i = 0; + } + + This->sinks[i].unk = sink; + *pdwCookie = i+1; + + return S_OK; } static HRESULT WINAPI ConnectionPoint_Unadvise(IConnectionPoint *iface, DWORD dwCookie) @@ -152,6 +190,8 @@ static void ConnectionPoint_Create(HTMLD ret->lpConnectionPointVtbl = &ConnectionPointVtbl; ret->doc = doc; + ret->sinks = NULL; + ret->sinks_size = 0; memcpy(&ret->iid, riid, sizeof(IID)); *cp = ret;

1 0

Jacek Caban : mshtml: Return text/html by default in GetContentType.
by Alexandre Julliard 26 Jun '06

26 Jun '06

Module: wine Branch: refs/heads/master Commit: f46c3997edb765e6d533c1f9a0e746fe014dc0e4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f46c3997edb765e6d533c1f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jun 25 14:14:16 2006 +0200 mshtml: Return text/html by default in GetContentType. --- dlls/mshtml/nsio.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 3c12f4c..31a713c 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -480,8 +480,9 @@ static nsresult NSAPI nsChannel_GetConte if(This->channel) return nsIChannel_GetContentType(This->channel, aContentType); - FIXME("default action not implemented\n"); - return NS_ERROR_NOT_IMPLEMENTED; + TRACE("returning default text/html\n"); + nsACString_Init(aContentType, "text/html"); + return NS_OK; } static nsresult NSAPI nsChannel_SetContentType(nsIHttpChannel *iface,

1 0

Jacek Caban : mshtml: Return NS_OK in GetStatus if channel is NULL.
by Alexandre Julliard 26 Jun '06

26 Jun '06

Module: wine Branch: refs/heads/master Commit: 2218bfcc8e4966f22ad5c1313a48e958421f6028 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2218bfcc8e4966f22ad5c13… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jun 25 14:13:48 2006 +0200 mshtml: Return NS_OK in GetStatus if channel is NULL. --- dlls/mshtml/nsio.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index c465154..3c12f4c 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -255,8 +255,8 @@ static nsresult NSAPI nsChannel_GetStatu if(This->channel) return nsIChannel_GetStatus(This->channel, aStatus); - FIXME("default action not implemented\n"); - return NS_ERROR_NOT_IMPLEMENTED; + TRACE("returning NS_OK\n"); + return *aStatus = NS_OK; } static nsresult NSAPI nsChannel_Cancel(nsIHttpChannel *iface, nsresult aStatus)

1 0

Jacek Caban : mshtml: Call OnStopRequest in OnStopBinding.
by Alexandre Julliard 26 Jun '06

26 Jun '06

Module: wine Branch: refs/heads/master Commit: 78c287f12a3ba313be98efd6d6a1790f151f729e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=78c287f12a3ba313be98efd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jun 25 14:13:11 2006 +0200 mshtml: Call OnStopRequest in OnStopBinding. --- dlls/mshtml/navigate.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index f12183f..685710a 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -293,7 +293,13 @@ static HRESULT WINAPI BindStatusCallback HRESULT hresult, LPCWSTR szError) { BSCallback *This = STATUSCLB_THIS(iface); - FIXME("(%p)->(%08lx %s)\n", This, hresult, debugstr_w(szError)); + + TRACE("(%p)->(%08lx %s)\n", This, hresult, debugstr_w(szError)); + + if(This->nslistener) + nsIStreamListener_OnStopRequest(This->nslistener, (nsIRequest*)NSCHANNEL(This->nschannel), + This->nscontext, NS_OK); + return S_OK; }

1 0

Jacek Caban : mshtml: Break reading if IStream::Read returns 0 bytes.
by Alexandre Julliard 26 Jun '06

26 Jun '06

Module: wine Branch: refs/heads/master Commit: 6c1e595c211cd037653feed731cbf2608d26b58e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6c1e595c211cd037653feed… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jun 25 14:11:35 2006 +0200 mshtml: Break reading if IStream::Read returns 0 bytes. --- dlls/mshtml/navigate.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 09e0814..f12183f 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -358,6 +358,8 @@ static HRESULT WINAPI BindStatusCallback if(This->nsstream->buf_size) FIXME("buffer is not empty!\n"); + }else { + break; } }while(hres == S_OK); }

1 0

Jacek Caban : mshtml: Added HTMLLoadOptions implementation (with tests).
by Alexandre Julliard 26 Jun '06

26 Jun '06

Module: wine Branch: refs/heads/master Commit: 181332b7ec793930660663a984166d176d6bab6a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=181332b7ec793930660663a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 23 22:12:48 2006 +0200 mshtml: Added HTMLLoadOptions implementation (with tests). --- dlls/mshtml/loadopts.c | 82 +++++++++++++++++++++++++++-- dlls/mshtml/tests/.gitignore | 1 dlls/mshtml/tests/Makefile.in | 1 dlls/mshtml/tests/misc.c | 117 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 196 insertions(+), 5 deletions(-) create mode 100644 dlls/mshtml/tests/misc.c diff --git a/dlls/mshtml/loadopts.c b/dlls/mshtml/loadopts.c index fec2ffb..971ed6a 100644 --- a/dlls/mshtml/loadopts.c +++ b/dlls/mshtml/loadopts.c @@ -35,10 +35,20 @@ #include "mshtml_private.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml); +typedef struct load_opt { + DWORD option; + PVOID buffer; + DWORD size; + + struct load_opt *next; +} load_opt; + typedef struct { const IHtmlLoadOptionsVtbl *lpHtmlLoadOptionsVtbl; LONG ref; + + load_opt *opts; } HTMLLoadOptions; #define LOADOPTS(x) ((IHtmlLoadOptions*) &(x)->lpHtmlLoadOptionsVtbl) @@ -89,8 +99,19 @@ static ULONG WINAPI HtmlLoadOptions_Rele TRACE("(%p) ref=%ld\n", This, ref); - if(!ref) + if(!ref) { + load_opt *iter = This->opts, *last; + + while(iter) { + last = iter; + iter = iter->next; + + HeapFree(GetProcessHeap(), 0, last->buffer); + HeapFree(GetProcessHeap(), 0, last); + } + HeapFree(GetProcessHeap(), 0, This); + } return ref; } @@ -99,16 +120,66 @@ static HRESULT WINAPI HtmlLoadOptions_Qu LPVOID pBuffer, ULONG *pcbBuf) { HTMLLoadOptions *This = LOADOPTS_THIS(iface); - FIXME("(%p)->(%ld %p %p)\n", This, dwOption, pBuffer, pcbBuf); - return E_NOTIMPL; + load_opt *iter; + + TRACE("(%p)->(%ld %p %p)\n", This, dwOption, pBuffer, pcbBuf); + + for(iter = This->opts; iter; iter = iter->next) { + if(iter->option == dwOption) + break; + } + + if(!iter) { + *pcbBuf = 0; + return S_OK; + } + + if(*pcbBuf < iter->size) { + *pcbBuf = iter->size; + return E_FAIL; + } + + memcpy(pBuffer, iter->buffer, iter->size); + *pcbBuf = iter->size; + + return S_OK; } static HRESULT WINAPI HtmlLoadOptions_SetOption(IHtmlLoadOptions *iface, DWORD dwOption, LPVOID pBuffer, ULONG cbBuf) { HTMLLoadOptions *This = LOADOPTS_THIS(iface); - FIXME("(%p)->(%ld %p %ld)\n", This, dwOption, pBuffer, cbBuf); - return E_NOTIMPL; + load_opt *iter = NULL; + + TRACE("(%p)->(%ld %p %ld)\n", This, dwOption, pBuffer, cbBuf); + + for(iter = This->opts; iter; iter = iter->next) { + if(iter->option == dwOption) + break; + } + + if(!iter) { + iter = HeapAlloc(GetProcessHeap(), 0, sizeof(load_opt)); + iter->next = This->opts; + This->opts = iter; + + iter->option = dwOption; + }else { + HeapFree(GetProcessHeap(), 0, iter->buffer); + } + + if(!cbBuf) { + iter->buffer = NULL; + iter->size = 0; + + return S_OK; + } + + iter->size = cbBuf; + iter->buffer = HeapAlloc(GetProcessHeap(), 0, cbBuf); + memcpy(iter->buffer, pBuffer, iter->size); + + return S_OK; } #undef LOADOPTS_THIS @@ -132,6 +203,7 @@ HRESULT HTMLLoadOptions_Create(IUnknown ret->lpHtmlLoadOptionsVtbl = &HtmlLoadOptionsVtbl; ret->ref = 1; + ret->opts = NULL; hres = IHtmlLoadOptions_QueryInterface(LOADOPTS(ret), riid, ppv); IHtmlLoadOptions_Release(LOADOPTS(ret)); diff --git a/dlls/mshtml/tests/.gitignore b/dlls/mshtml/tests/.gitignore index ece3988..3fe22e7 100644 --- a/dlls/mshtml/tests/.gitignore +++ b/dlls/mshtml/tests/.gitignore @@ -1,4 +1,5 @@ Makefile htmldoc.ok +misc.ok protocol.ok testlist.c diff --git a/dlls/mshtml/tests/Makefile.in b/dlls/mshtml/tests/Makefile.in index c2d9ecb..8b6eda5 100644 --- a/dlls/mshtml/tests/Makefile.in +++ b/dlls/mshtml/tests/Makefile.in @@ -8,6 +8,7 @@ EXTRALIBS = -luuid CTESTS = \ htmldoc.c \ + misc.c \ protocol.c @MAKE_TEST_RULES@ diff --git a/dlls/mshtml/tests/misc.c b/dlls/mshtml/tests/misc.c new file mode 100644 index 0000000..8c0d184 --- /dev/null +++ b/dlls/mshtml/tests/misc.c @@ -0,0 +1,117 @@ +/* + * Copyright 2006 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 + * 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 + */ + +#define COBJMACROS + +#include <wine/test.h> +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "ole2.h" +#include "optary.h" + +#include "initguid.h" + +static void test_HTMLLoadOptions(void) +{ + IHtmlLoadOptions *loadopts; + BYTE buf[100]; + DWORD size, i, data = 0xdeadbeef; + HRESULT hres; + + hres = CoCreateInstance(&CLSID_HTMLLoadOptions, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IHtmlLoadOptions, (void**)&loadopts); + ok(hres == S_OK, "creating HTMLLoadOptions failed: %08lx\n", hres); + if(FAILED(hres)) + return; + + for(i=0; i <= HTMLLOADOPTION_FRAMELOAD+3; i++) { + size = 0xdeadbeef; + memset(buf, 0xdd, sizeof(buf)); + hres = IHtmlLoadOptions_QueryOption(loadopts, i, NULL, &size); + ok(hres == S_OK, "QueryOption failed: %08lx\n", hres); + ok(size == 0, "size = %ld\n", size); + ok(buf[0] == 0xdd, "buf changed\n"); + } + + size = 0xdeadbeef; + hres = IHtmlLoadOptions_QueryOption(loadopts, HTMLLOADOPTION_CODEPAGE, NULL, &size); + ok(hres == S_OK, "QueryOption failed: %08lx\n", hres); + ok(size == 0, "size = %ld\n", size); + + hres = IHtmlLoadOptions_SetOption(loadopts, HTMLLOADOPTION_CODEPAGE, &data, sizeof(data)); + ok(hres == S_OK, "SetOption failed: %08lx\n", hres); + + size = sizeof(data); + memset(buf, 0xdd, sizeof(buf)); + hres = IHtmlLoadOptions_QueryOption(loadopts, HTMLLOADOPTION_CODEPAGE, buf, &size); + ok(hres == S_OK, "QueryOption failed: %08lx\n", hres); + ok(size == sizeof(data), "size = %ld\n", size); + ok(*(DWORD*)buf == data, "unexpected buf\n"); + + size = sizeof(data)-1; + memset(buf, 0xdd, sizeof(buf)); + hres = IHtmlLoadOptions_QueryOption(loadopts, HTMLLOADOPTION_CODEPAGE, buf, &size); + ok(hres == E_FAIL, "QueryOption failed: %08lx\n", hres); + ok(size == sizeof(data), "size = %ld\n", size); + ok(buf[0] == 0xdd, "buf changed\n"); + + data = 100; + hres = IHtmlLoadOptions_SetOption(loadopts, HTMLLOADOPTION_CODEPAGE, &data, 0); + ok(hres == S_OK, "SetOption failed: %08lx\n", hres); + + size = 0xdeadbeef; + memset(buf, 0xdd, sizeof(buf)); + hres = IHtmlLoadOptions_QueryOption(loadopts, HTMLLOADOPTION_CODEPAGE, buf, &size); + ok(hres == S_OK, "QueryOption failed: %08lx\n", hres); + ok(size == 0, "size = %ld\n", size); + ok(buf[0] == 0xdd, "buf changed\n"); + + hres = IHtmlLoadOptions_SetOption(loadopts, HTMLLOADOPTION_CODEPAGE, NULL, 0); + ok(hres == S_OK, "SetOption failed: %08lx\n", hres); + + hres = IHtmlLoadOptions_SetOption(loadopts, 1000, &data, sizeof(data)); + ok(hres == S_OK, "SetOption failed: %08lx\n", hres); + + size = sizeof(data); + memset(buf, 0xdd, sizeof(buf)); + hres = IHtmlLoadOptions_QueryOption(loadopts, 1000, buf, &size); + ok(hres == S_OK, "QueryOption failed: %08lx\n", hres); + ok(size == sizeof(data), "size = %ld\n", size); + ok(*(DWORD*)buf == data, "unexpected buf\n"); + + hres = IHtmlLoadOptions_SetOption(loadopts, 1000, buf, sizeof(buf)); + ok(hres == S_OK, "SetOption failed: %08lx\n", hres); + + size = 0xdeadbeef; + hres = IHtmlLoadOptions_QueryOption(loadopts, 1000, buf, &size); + ok(hres == S_OK, "QueryOption failed: %08lx\n", hres); + ok(size == sizeof(buf), "size = %ld\n", size); + + IHtmlLoadOptions_Release(loadopts); +} + +START_TEST(misc) +{ + CoInitialize(NULL); + + test_HTMLLoadOptions(); + + CoUninitialize(); +}

1 0