November 2005 - Wine-Commits

wine/dlls/urlmon tests/protocol.c http.c
by Alexandre Julliard Nov. 9, 2005

Nov. 9, 2005

ChangeSet ID: 21180 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/09 04:28:26 Modified files: dlls/urlmon/tests: protocol.c dlls/urlmon : http.c Log message: Jacek Caban <jack(a)itma.pwr.wroc.pl> Added implementation of IInternetPriority in HttpProtocol. Patch: http://cvs.winehq.org/patch.py?id=21180 Old revision New revision Changes Path 1.5 1.6 +59 -0 wine/dlls/urlmon/tests/protocol.c 1.1 1.2 +65 -3 wine/dlls/urlmon/http.c Index: wine/dlls/urlmon/tests/protocol.c diff -u -p wine/dlls/urlmon/tests/protocol.c:1.5 wine/dlls/urlmon/tests/protocol.c:1.6 --- wine/dlls/urlmon/tests/protocol.c:1.5 9 Nov 2005 10:28:26 -0000 +++ wine/dlls/urlmon/tests/protocol.c 9 Nov 2005 10:28:26 -0000 @@ -206,6 +206,31 @@ static IInternetBindInfoVtbl bind_info_v static IInternetBindInfo bind_info = { &bind_info_vtbl }; +static void test_priority(IInternetProtocol *protocol) +{ + IInternetPriority *priority; + LONG pr; + HRESULT hres; + + hres = IInternetProtocol_QueryInterface(protocol, &IID_IInternetPriority, (void**)&priority); + ok(hres == S_OK, "QueryInterface(IID_IInternetPriority) failed: %08lx\n", hres); + if(FAILED(hres)) + return; + + hres = IInternetPriority_GetPriority(priority, &pr); + ok(hres == S_OK, "GetPriority failed: %08lx\n", hres); + ok(pr == 0, "pr=%ld, expected 0\n", pr); + + hres = IInternetPriority_SetPriority(priority, 1); + ok(hres == S_OK, "SetPriority failed: %08lx\n", hres); + + hres = IInternetPriority_GetPriority(priority, &pr); + ok(hres == S_OK, "GetPriority failed: %08lx\n", hres); + ok(pr == 1, "pr=%ld, expected 1\n", pr); + + IInternetPriority_Release(priority); +} + static void file_protocol_start(IInternetProtocol *protocol, LPCWSTR url, BOOL is_first) { HRESULT hres; @@ -414,11 +439,45 @@ static void test_file_protocol(void) { IInternetProtocol_Release(protocol); } +static void test_http_protocol(void) +{ + IInternetProtocol *protocol; + IInternetProtocolInfo *protocol_info; + IClassFactory *factory; + IUnknown *unk; + HRESULT hres; + + hres = CoGetClassObject(&CLSID_HttpProtocol, CLSCTX_INPROC_SERVER, NULL, + &IID_IUnknown, (void**)&unk); + ok(hres == S_OK, "CoGetClassObject failed: %08lx\n", hres); + if(!SUCCEEDED(hres)) + return; + + hres = IUnknown_QueryInterface(unk, &IID_IInternetProtocolInfo, (void**)&protocol_info); + ok(hres == E_NOINTERFACE, + "Could not get IInternetProtocolInfo interface: %08lx, expected E_NOINTERFACE\n", hres); + + hres = IUnknown_QueryInterface(unk, &IID_IClassFactory, (void**)&factory); + ok(hres == S_OK, "Could not get IClassFactory interface\n"); + IUnknown_Release(unk); + if(FAILED(hres)) + return; + + hres = IClassFactory_CreateInstance(factory, NULL, &IID_IInternetProtocol, + (void**)&protocol); + ok(hres == S_OK, "Could not get IInternetProtocol: %08lx\n", hres); + + test_priority(protocol); + + IInternetProtocol_Release(protocol); +} + START_TEST(protocol) { OleInitialize(NULL); test_file_protocol(); + test_http_protocol(); OleUninitialize(); } Index: wine/dlls/urlmon/http.c diff -u -p wine/dlls/urlmon/http.c:1.1 wine/dlls/urlmon/http.c:1.2 --- wine/dlls/urlmon/http.c:1.1 9 Nov 2005 10:28:26 -0000 +++ wine/dlls/urlmon/http.c 9 Nov 2005 10:28:26 -0000 @@ -32,13 +32,18 @@ WINE_DEFAULT_DEBUG_CHANNEL(urlmon); typedef struct { - const IInternetProtocolVtbl *lpInternetProtocolVtbl; + const IInternetProtocolVtbl *lpInternetProtocolVtbl; + const IInternetPriorityVtbl *lpInternetPriorityVtbl; + + LONG priority; + LONG ref; } HttpProtocol; -#define PROTOCOL_THIS(iface) DEFINE_THIS(HttpProtocol, InternetProtocol, iface) - #define PROTOCOL(x) ((IInternetProtocol*) &(x)->lpInternetProtocolVtbl) +#define PRIORITY(x) ((IInternetPriority*) &(x)->lpInternetPriorityVtbl) + +#define PROTOCOL_THIS(iface) DEFINE_THIS(HttpProtocol, InternetProtocol, iface) static HRESULT WINAPI HttpProtocol_QueryInterface(IInternetProtocol *iface, REFIID riid, void **ppv) { @@ -54,6 +59,9 @@ static HRESULT WINAPI HttpProtocol_Query }else if(IsEqualGUID(&IID_IInternetProtocol, riid)) { TRACE("(%p)->(IID_IInternetProtocol %p)\n", This, ppv); *ppv = PROTOCOL(This); + }else if(IsEqualGUID(&IID_IInternetPriority, riid)) { + TRACE("(%p)->(IID_IInternetPriority %p)\n", This, ppv); + *ppv = PRIORITY(This); } if(*ppv) { @@ -167,6 +175,56 @@ static HRESULT WINAPI HttpProtocol_Unloc #undef PROTOCOL_THIS +#define PRIORITY_THIS(iface) DEFINE_THIS(HttpProtocol, InternetPriority, iface) + +static HRESULT WINAPI HttpPriority_QueryInterface(IInternetPriority *iface, REFIID riid, void **ppv) +{ + HttpProtocol *This = PRIORITY_THIS(iface); + return IInternetProtocol_QueryInterface(PROTOCOL(This), riid, ppv); +} + +static ULONG WINAPI HttpPriority_AddRef(IInternetPriority *iface) +{ + HttpProtocol *This = PRIORITY_THIS(iface); + return IInternetProtocol_AddRef(PROTOCOL(This)); +} + +static ULONG WINAPI HttpPriority_Release(IInternetPriority *iface) +{ + HttpProtocol *This = PRIORITY_THIS(iface); + return IInternetProtocol_Release(PROTOCOL(This)); +} + +static HRESULT WINAPI HttpPriority_SetPriority(IInternetPriority *iface, LONG nPriority) +{ + HttpProtocol *This = PRIORITY_THIS(iface); + + TRACE("(%p)->(%ld)\n", This, nPriority); + + This->priority = nPriority; + return S_OK; +} + +static HRESULT WINAPI HttpPriority_GetPriority(IInternetPriority *iface, LONG *pnPriority) +{ + HttpProtocol *This = PRIORITY_THIS(iface); + + TRACE("(%p)->(%p)\n", This, pnPriority); + + *pnPriority = This->priority; + return S_OK; +} + +#undef PRIORITY_THIS + +static const IInternetPriorityVtbl HttpPriorityVtbl = { + HttpPriority_QueryInterface, + HttpPriority_AddRef, + HttpPriority_Release, + HttpPriority_SetPriority, + HttpPriority_GetPriority +}; + static const IInternetProtocolVtbl HttpProtocolVtbl = { HttpProtocol_QueryInterface, HttpProtocol_AddRef, @@ -194,8 +252,12 @@ HRESULT HttpProtocol_Construct(IUnknown ret = HeapAlloc(GetProcessHeap(), 0, sizeof(HttpProtocol)); ret->lpInternetProtocolVtbl = &HttpProtocolVtbl; + ret->lpInternetPriorityVtbl = &HttpPriorityVtbl; + ret->ref = 1; + ret->priority = 0; + *ppobj = PROTOCOL(ret); return S_OK;

1 0

wine/include xmldom.idl
by Alexandre Julliard Nov. 8, 2005

Nov. 8, 2005

ChangeSet ID: 21179 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/08 14:00:58 Modified files: include : xmldom.idl Log message: Fixed typo: get_doctype returns an IXMLDOMDocumentType. Patch: http://cvs.winehq.org/patch.py?id=21179 Old revision New revision Changes Path 1.5 1.6 +1 -1 wine/include/xmldom.idl Index: wine/include/xmldom.idl diff -u -p wine/include/xmldom.idl:1.5 wine/include/xmldom.idl:1.6 --- wine/include/xmldom.idl:1.5 8 Nov 2005 20: 0:58 -0000 +++ wine/include/xmldom.idl 8 Nov 2005 20: 0:58 -0000 @@ -202,7 +202,7 @@ pointer_default(unique) interface IXMLDOMDocument : IXMLDOMNode { [propget, id(DISPID_DOM_DOCUMENT_DOCTYPE)] - HRESULT doctype( [out,retval] IXMLDOMDocument **documentType ); + HRESULT doctype( [out,retval] IXMLDOMDocumentType **documentType ); [propget, id(DISPID_DOM_DOCUMENT_IMPLEMENTATION)] HRESULT implementation( [out,retval] IXMLDOMImplementation **impl );

1 0

wine/dlls/msxml3 tests/domdoc.c parseerror.c n ...
by Alexandre Julliard Nov. 8, 2005

Nov. 8, 2005

ChangeSet ID: 21178 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/08 13:59:37 Modified files: dlls/msxml3/tests: domdoc.c dlls/msxml3 : parseerror.c nodemap.c nodelist.c node.c msxml_private.h main.c factory.c element.c domdoc.c Log message: Huw Davies <huw(a)codeweavers.com> Include msxml2.h rather than msxml.h and xmldom.h. Patch: http://cvs.winehq.org/patch.py?id=21178 Old revision New revision Changes Path 1.8 1.9 +3 -4 wine/dlls/msxml3/tests/domdoc.c 1.1 1.2 +1 -2 wine/dlls/msxml3/parseerror.c 1.8 1.9 +1 -4 wine/dlls/msxml3/nodemap.c 1.6 1.7 +1 -5 wine/dlls/msxml3/nodelist.c 1.14 1.15 +1 -4 wine/dlls/msxml3/node.c 1.11 1.12 +0 -2 wine/dlls/msxml3/msxml_private.h 1.4 1.5 +1 -0 wine/dlls/msxml3/main.c 1.4 1.5 +1 -3 wine/dlls/msxml3/factory.c 1.10 1.11 +1 -4 wine/dlls/msxml3/element.c 1.17 1.18 +2 -4 wine/dlls/msxml3/domdoc.c Index: wine/dlls/msxml3/tests/domdoc.c diff -u -p wine/dlls/msxml3/tests/domdoc.c:1.8 wine/dlls/msxml3/tests/domdoc.c:1.9 --- wine/dlls/msxml3/tests/domdoc.c:1.8 8 Nov 2005 19:59:37 -0000 +++ wine/dlls/msxml3/tests/domdoc.c 8 Nov 2005 19:59:37 -0000 @@ -23,8 +23,7 @@ #include "windows.h" #include "ole2.h" -#include "msxml.h" -#include "xmldom.h" +#include "msxml2.h" #include <stdio.h> #include "wine/test.h" @@ -235,7 +234,7 @@ void test_domdoc( void ) ok( code == 0, "code %ld\n", code ); IXMLDOMParseError_Release( error ); - r = IXMLDocument_Release( doc ); + r = IXMLDOMDocument_Release( doc ); ok( r == 0, "document ref count incorrect\n"); } @@ -503,7 +502,7 @@ void test_domnode( void ) if (element) IXMLDOMElement_Release( element ); if (doc) - IXMLDocument_Release( doc ); + IXMLDOMDocument_Release( doc ); } START_TEST(domdoc) Index: wine/dlls/msxml3/parseerror.c diff -u -p wine/dlls/msxml3/parseerror.c:1.1 wine/dlls/msxml3/parseerror.c:1.2 --- wine/dlls/msxml3/parseerror.c:1.1 8 Nov 2005 19:59:37 -0000 +++ wine/dlls/msxml3/parseerror.c 8 Nov 2005 19:59:37 -0000 @@ -28,8 +28,7 @@ #include "winerror.h" #include "winuser.h" #include "ole2.h" -#include "msxml.h" -#include "xmldom.h" +#include "msxml2.h" #include "msxml_private.h" Index: wine/dlls/msxml3/nodemap.c diff -u -p wine/dlls/msxml3/nodemap.c:1.8 wine/dlls/msxml3/nodemap.c:1.9 --- wine/dlls/msxml3/nodemap.c:1.8 8 Nov 2005 19:59:37 -0000 +++ wine/dlls/msxml3/nodemap.c 8 Nov 2005 19:59:37 -0000 @@ -28,10 +28,7 @@ #include "winuser.h" #include "winnls.h" #include "ole2.h" -#include "ocidl.h" -#include "msxml.h" -#include "xmldom.h" -#include "msxml.h" +#include "msxml2.h" #include "msxml_private.h" Index: wine/dlls/msxml3/nodelist.c diff -u -p wine/dlls/msxml3/nodelist.c:1.6 wine/dlls/msxml3/nodelist.c:1.7 --- wine/dlls/msxml3/nodelist.c:1.6 8 Nov 2005 19:59:37 -0000 +++ wine/dlls/msxml3/nodelist.c 8 Nov 2005 19:59:37 -0000 @@ -26,12 +26,8 @@ #include "windef.h" #include "winbase.h" #include "winuser.h" -#include "winnls.h" #include "ole2.h" -#include "ocidl.h" -#include "msxml.h" -#include "xmldom.h" -#include "msxml.h" +#include "msxml2.h" #include "msxml_private.h" Index: wine/dlls/msxml3/node.c diff -u -p wine/dlls/msxml3/node.c:1.14 wine/dlls/msxml3/node.c:1.15 --- wine/dlls/msxml3/node.c:1.14 8 Nov 2005 19:59:37 -0000 +++ wine/dlls/msxml3/node.c 8 Nov 2005 19:59:37 -0000 @@ -29,10 +29,7 @@ #include "winuser.h" #include "winnls.h" #include "ole2.h" -#include "ocidl.h" -#include "msxml.h" -#include "xmldom.h" -#include "msxml.h" +#include "msxml2.h" #include "msxml_private.h" Index: wine/dlls/msxml3/msxml_private.h diff -u -p wine/dlls/msxml3/msxml_private.h:1.11 wine/dlls/msxml3/msxml_private.h:1.12 --- wine/dlls/msxml3/msxml_private.h:1.11 8 Nov 2005 19:59:37 -0000 +++ wine/dlls/msxml3/msxml_private.h 8 Nov 2005 19:59:37 -0000 @@ -21,8 +21,6 @@ #ifndef __MSXML_PRIVATE__ #define __MSXML_PRIVATE__ -#include "xmldom.h" - #ifdef HAVE_LIBXML2 #ifdef HAVE_LIBXML_PARSER_H Index: wine/dlls/msxml3/main.c diff -u -p wine/dlls/msxml3/main.c:1.4 wine/dlls/msxml3/main.c:1.5 --- wine/dlls/msxml3/main.c:1.4 8 Nov 2005 19:59:37 -0000 +++ wine/dlls/msxml3/main.c 8 Nov 2005 19:59:37 -0000 @@ -27,6 +27,7 @@ #include "winuser.h" #include "winreg.h" #include "ole2.h" +#include "msxml2.h" #include "wine/debug.h" Index: wine/dlls/msxml3/factory.c diff -u -p wine/dlls/msxml3/factory.c:1.4 wine/dlls/msxml3/factory.c:1.5 --- wine/dlls/msxml3/factory.c:1.4 8 Nov 2005 19:59:37 -0000 +++ wine/dlls/msxml3/factory.c 8 Nov 2005 19:59:37 -0000 @@ -26,9 +26,7 @@ #include "winbase.h" #include "winuser.h" #include "ole2.h" -#include "uuids.h" -#include "msxml.h" -#include "xmldom.h" +#include "msxml2.h" #include "wine/debug.h" Index: wine/dlls/msxml3/element.c diff -u -p wine/dlls/msxml3/element.c:1.10 wine/dlls/msxml3/element.c:1.11 --- wine/dlls/msxml3/element.c:1.10 8 Nov 2005 19:59:37 -0000 +++ wine/dlls/msxml3/element.c 8 Nov 2005 19:59:37 -0000 @@ -27,10 +27,7 @@ #include "winbase.h" #include "winuser.h" #include "ole2.h" -#include "ocidl.h" -#include "msxml.h" -#include "xmldom.h" -#include "msxml.h" +#include "msxml2.h" #include "msxml_private.h" Index: wine/dlls/msxml3/domdoc.c diff -u -p wine/dlls/msxml3/domdoc.c:1.17 wine/dlls/msxml3/domdoc.c:1.18 --- wine/dlls/msxml3/domdoc.c:1.17 8 Nov 2005 19:59:37 -0000 +++ wine/dlls/msxml3/domdoc.c 8 Nov 2005 19:59:37 -0000 @@ -28,9 +28,7 @@ #include "winuser.h" #include "winnls.h" #include "ole2.h" -#include "ocidl.h" -#include "msxml.h" -#include "xmldom.h" +#include "msxml2.h" #include "wine/debug.h" @@ -487,7 +485,7 @@ static HRESULT WINAPI domdoc_transformNo static HRESULT WINAPI domdoc_get_doctype( IXMLDOMDocument *iface, - IXMLDOMDocument** documentType ) + IXMLDOMDocumentType** documentType ) { FIXME("\n"); return E_NOTIMPL;

1 0

wine/dlls/user tests/sysparams.c sysparams.c
by Alexandre Julliard Nov. 8, 2005

Nov. 8, 2005

ChangeSet ID: 21177 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/08 13:58:37 Modified files: dlls/user/tests: sysparams.c dlls/user : sysparams.c Log message: Rein Klazes <wijn(a)wanadoo.nl> Re-enable SPI_{GET,SET}BORDER tests and fix the bugs that caused them to be disabled. Add tests that show that the border value manipulated by SPI_{GET,SET}BORDER is completely the same as with SPI_{GET,SET}NONCLIENTMETRICS. Fix a few signed/unsigned warnings in unrelated tests from the same source file. Made the tests pass on wine. Patch: http://cvs.winehq.org/patch.py?id=21177 Old revision New revision Changes Path 1.41 1.42 +85 -28 wine/dlls/user/tests/sysparams.c 1.39 1.40 +16 -5 wine/dlls/user/sysparams.c

1 0

wine/dlls/advapi32/tests crypt.c
by Alexandre Julliard Nov. 8, 2005

Nov. 8, 2005

ChangeSet ID: 21176 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/08 13:57:41 Modified files: dlls/advapi32/tests: crypt.c Log message: Saulius Krasuckas <saulius.krasuckas(a)ieee.org> Win98 fails another way when user isn't logged in. Patch: http://cvs.winehq.org/patch.py?id=21176 Old revision New revision Changes Path 1.27 1.28 +13 -2 wine/dlls/advapi32/tests/crypt.c Index: wine/dlls/advapi32/tests/crypt.c diff -u -p wine/dlls/advapi32/tests/crypt.c:1.27 wine/dlls/advapi32/tests/crypt.c:1.28 --- wine/dlls/advapi32/tests/crypt.c:1.27 8 Nov 2005 19:57:41 -0000 +++ wine/dlls/advapi32/tests/crypt.c 8 Nov 2005 19:57:41 -0000 @@ -154,6 +154,7 @@ static void test_acquire_context(void) { BOOL result; HCRYPTPROV hProv; + DWORD GLE; /* Provoke all kinds of error conditions (which are easy to provoke). * The order of the error tests seems to match Windows XP's rsaenh.dll CSP, @@ -185,7 +186,12 @@ static void test_acquire_context(void) hProv = 0; SetLastError(0xdeadbeef); result = pCryptAcquireContextA(&hProv, szKeySet, szRsaBaseProv, PROV_RSA_FULL, 0); - ok(result && (GetLastError() == ERROR_ENVVAR_NOT_FOUND || GetLastError() == ERROR_SUCCESS || GetLastError() == ERROR_RING2_STACK_IN_USE || GetLastError() == NTE_FAIL), "%d/%ld\n", result, GetLastError()); + GLE = GetLastError(); + ok(result && (GLE == ERROR_ENVVAR_NOT_FOUND || + GLE == ERROR_SUCCESS || + GLE == ERROR_RING2_STACK_IN_USE || + GLE == NTE_FAIL || + GLE == ERROR_NOT_LOGGED_ON), "%d/%ld\n", result, GLE); if (hProv) pCryptReleaseContext(hProv, 0); @@ -194,7 +200,12 @@ static void test_acquire_context(void) hProv = 0; SetLastError(0xdeadbeef); result = pCryptAcquireContextA(&hProv, szKeySet, "", PROV_RSA_FULL, 0); - ok(result && (GetLastError() == ERROR_ENVVAR_NOT_FOUND || GetLastError() == ERROR_SUCCESS || GetLastError() == ERROR_RING2_STACK_IN_USE || GetLastError() == NTE_FAIL), "%d/%ld\n", result, GetLastError()); + GLE = GetLastError(); + ok(result && (GLE == ERROR_ENVVAR_NOT_FOUND || + GLE == ERROR_SUCCESS || + GLE == ERROR_RING2_STACK_IN_USE || + GLE == NTE_FAIL || + GLE == ERROR_NOT_LOGGED_ON), "%d/%ld\n", result, GetLastError()); if (hProv) pCryptReleaseContext(hProv, 0);

1 0

wine/dlls/shell32 systray.c
by Alexandre Julliard Nov. 8, 2005

Nov. 8, 2005

ChangeSet ID: 21175 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/08 13:57:27 Modified files: dlls/shell32 : systray.c Log message: Vincent Béron <vberon(a)mecano.gme.usherb.ca> Unicodify systray.c. Patch: http://cvs.winehq.org/patch.py?id=21175 Old revision New revision Changes Path 1.31 1.32 +39 -35 wine/dlls/shell32/systray.c

1 0

wine/include windef.h
by Alexandre Julliard Nov. 8, 2005

Nov. 8, 2005

ChangeSet ID: 21174 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/08 10:13:21 Modified files: include : windef.h Log message: Add an argument to all uses of the __ONLY_IN_WINELIB macro (spotted by Berend Reitsma). Patch: http://cvs.winehq.org/patch.py?id=21174 Old revision New revision Changes Path 1.100 1.101 +8 -8 wine/include/windef.h Index: wine/include/windef.h diff -u -p wine/include/windef.h:1.100 wine/include/windef.h:1.101 --- wine/include/windef.h:1.100 8 Nov 2005 16:13:21 -0000 +++ wine/include/windef.h 8 Nov 2005 16:13:21 -0000 @@ -103,30 +103,30 @@ extern "C" { #endif #ifndef near -#define near __ONLY_IN_WINELIB() +#define near __ONLY_IN_WINELIB(/* nothing */) #endif #ifndef far -#define far __ONLY_IN_WINELIB() +#define far __ONLY_IN_WINELIB(/* nothing */) #endif #ifndef _near -#define _near __ONLY_IN_WINELIB() +#define _near __ONLY_IN_WINELIB(/* nothing */) #endif #ifndef _far -#define _far __ONLY_IN_WINELIB() +#define _far __ONLY_IN_WINELIB(/* nothing */) #endif #ifndef NEAR -#define NEAR __ONLY_IN_WINELIB() +#define NEAR __ONLY_IN_WINELIB(/* nothing */) #endif #ifndef FAR -#define FAR __ONLY_IN_WINELIB() +#define FAR __ONLY_IN_WINELIB(/* nothing */) #endif #ifndef _MSC_VER # ifndef _declspec -# define _declspec(x) __ONLY_IN_WINELIB() +# define _declspec(x) __ONLY_IN_WINELIB(/* nothing */) # endif # ifndef __declspec -# define __declspec(x) __ONLY_IN_WINELIB() +# define __declspec(x) __ONLY_IN_WINELIB(/* nothing */) # endif #endif

1 0

wine/dlls/shdocvw tests/shortcut.c shdocvw_mai ...
by Alexandre Julliard Nov. 8, 2005

Nov. 8, 2005

ChangeSet ID: 21173 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/08 10:12:06 Modified files: dlls/shdocvw/tests: shortcut.c dlls/shdocvw : shdocvw_main.c shdocvw.h Makefile.in Added files: dlls/shdocvw : shlinstobj.c Log message: Michael Jung <mjung(a)iss.tu-darmstadt.de> Support for shell instance objects. Removed a wine_todo for a no longer failing test. Added a test for IPersistFolder3::GetCurFolder. Patch: http://cvs.winehq.org/patch.py?id=21173 Old revision New revision Changes Path 1.1 1.2 +22 -10 wine/dlls/shdocvw/tests/shortcut.c 1.37 1.38 +2 -1 wine/dlls/shdocvw/shdocvw_main.c 1.23 1.24 +5 -0 wine/dlls/shdocvw/shdocvw.h 1.16 1.17 +3 -1 wine/dlls/shdocvw/Makefile.in Added 1.1 +0 -0 wine/dlls/shdocvw/shlinstobj.c

1 0

wine/dlls/mapi32/tests prop.c
by Alexandre Julliard Nov. 8, 2005

Nov. 8, 2005

ChangeSet ID: 21172 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/08 10:10:37 Modified files: dlls/mapi32/tests: prop.c Log message: Get rid of FAR keywords. Patch: http://cvs.winehq.org/patch.py?id=21172 Old revision New revision Changes Path 1.11 1.12 +4 -4 wine/dlls/mapi32/tests/prop.c Index: wine/dlls/mapi32/tests/prop.c diff -u -p wine/dlls/mapi32/tests/prop.c:1.11 wine/dlls/mapi32/tests/prop.c:1.12 --- wine/dlls/mapi32/tests/prop.c:1.11 8 Nov 2005 16:10:37 -0000 +++ wine/dlls/mapi32/tests/prop.c 8 Nov 2005 16:10:37 -0000 @@ -51,8 +51,8 @@ static ULONG (WINAPI *pFBadProp)( static ULONG (WINAPI *pFBadColumnSet)(LPSPropTagArray); static SCODE (WINAPI *pCreateIProp)(LPCIID,ALLOCATEBUFFER*,ALLOCATEMORE*, FREEBUFFER*,LPVOID,LPPROPDATA*); -static SCODE (WINAPI *pMAPIAllocateBuffer)(ULONG, LPVOID FAR); -static SCODE (WINAPI *pMAPIAllocateMore)(ULONG, LPVOID, LPVOID FAR); +static SCODE (WINAPI *pMAPIAllocateBuffer)(ULONG, LPVOID); +static SCODE (WINAPI *pMAPIAllocateMore)(ULONG, LPVOID, LPVOID); static SCODE (WINAPI *pMAPIFreeBuffer)(LPVOID); static BOOL InitFuncPtrs(void) @@ -1155,8 +1155,8 @@ static void test_IProp(void) /* Create the object */ lpIProp = NULL; - sc = pCreateIProp(&IID_IMAPIPropData, (ALLOCATEBUFFER FAR *)pMAPIAllocateBuffer, (ALLOCATEMORE FAR*)pMAPIAllocateMore, - (FREEBUFFER FAR *)pMAPIFreeBuffer, NULL, &lpIProp); + sc = pCreateIProp(&IID_IMAPIPropData, (ALLOCATEBUFFER *)pMAPIAllocateBuffer, (ALLOCATEMORE*)pMAPIAllocateMore, + (FREEBUFFER *)pMAPIFreeBuffer, NULL, &lpIProp); ok(sc == S_OK && lpIProp, "CreateIProp: expected S_OK, non-null, got 0x%08lX,%p\n", sc, lpIProp);

1 0

wine/dlls/msxml3 tests/domdoc.c node.c
by Alexandre Julliard Nov. 8, 2005

Nov. 8, 2005

ChangeSet ID: 21171 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/08 10:10:13 Modified files: dlls/msxml3/tests: domdoc.c dlls/msxml3 : node.c Log message: Huw Davies <huw(a)codeweavers.com> Implement selectSingleNode. Patch: http://cvs.winehq.org/patch.py?id=21171 Old revision New revision Changes Path 1.7 1.8 +7 -0 wine/dlls/msxml3/tests/domdoc.c 1.13 1.14 +13 -2 wine/dlls/msxml3/node.c Index: wine/dlls/msxml3/tests/domdoc.c diff -u -p wine/dlls/msxml3/tests/domdoc.c:1.7 wine/dlls/msxml3/tests/domdoc.c:1.8 --- wine/dlls/msxml3/tests/domdoc.c:1.7 8 Nov 2005 16:10:13 -0000 +++ wine/dlls/msxml3/tests/domdoc.c 8 Nov 2005 16:10:13 -0000 @@ -447,6 +447,13 @@ void test_domnode( void ) else ok( FALSE, "no element\n"); + r = IXMLDOMNode_selectSingleNode( element, (BSTR)szdl, &node ); + ok( r == S_FALSE, "ret %08lx\n", r ); + r = IXMLDOMNode_selectSingleNode( element, (BSTR)szbs, &node ); + ok( r == S_OK, "ret %08lx\n", r ); + r = IXMLDOMNode_Release( node ); + ok( r == 0, "ret %08lx\n", r ); + if (list) { r = IXMLDOMNodeList_get_length( list, &count ); Index: wine/dlls/msxml3/node.c diff -u -p wine/dlls/msxml3/node.c:1.13 wine/dlls/msxml3/node.c:1.14 --- wine/dlls/msxml3/node.c:1.13 8 Nov 2005 16:10:13 -0000 +++ wine/dlls/msxml3/node.c 8 Nov 2005 16:10:13 -0000 @@ -586,8 +586,19 @@ static HRESULT WINAPI xmlnode_selectSing BSTR queryString, IXMLDOMNode** resultNode) { - FIXME("\n"); - return E_NOTIMPL; + xmlnode *This = impl_from_IXMLDOMNode( iface ); + IXMLDOMNodeList *list; + HRESULT r; + + TRACE("%p %s %p\n", This, debugstr_w(queryString), resultNode ); + + r = IXMLDOMNode_selectNodes(iface, queryString, &list); + if(SUCCEEDED(r)) + { + r = IXMLDOMNodeList_nextNode(list, resultNode); + IXMLDOMNodeList_Release(list); + } + return r; } static HRESULT WINAPI xmlnode_get_parsed(

1 0