January 2007 - Wine-Commits

Jacek Caban : urlmon: Added IInternetSession:: CreateBinding beginning implementation.
by Alexandre Julliard Jan. 24, 2007

Jan. 24, 2007

Module: wine Branch: master Commit: e40f814be034a2bc9891691accfccb2ebab6ddab URL: http://source.winehq.org/git/wine.git/?a=commit;h=e40f814be034a2bc9891691ac… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 23 19:33:30 2007 +0100 urlmon: Added IInternetSession::CreateBinding beginning implementation. --- dlls/urlmon/Makefile.in | 1 + dlls/urlmon/bindprot.c | 254 +++++++++++++++++++++++++++++++++++++++++++++ dlls/urlmon/session.c | 8 +- dlls/urlmon/urlmon_main.h | 2 + 4 files changed, 263 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/Makefile.in b/dlls/urlmon/Makefile.in index 488114a..fd12022 100644 --- a/dlls/urlmon/Makefile.in +++ b/dlls/urlmon/Makefile.in @@ -9,6 +9,7 @@ EXTRALIBS = -luuid C_SRCS = \ binding.c \ + bindprot.c \ file.c \ format.c \ ftp.c \ diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c new file mode 100644 index 0000000..9d08671 --- /dev/null +++ b/dlls/urlmon/bindprot.c @@ -0,0 +1,254 @@ +/* + * Copyright 2007 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 + */ + +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "ole2.h" +#include "urlmon.h" +#include "urlmon_main.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(urlmon); + +typedef struct { + const IInternetProtocolVtbl *lpInternetProtocolVtbl; + const IInternetBindInfoVtbl *lpInternetBindInfoVtbl; + + LONG ref; +} BindProtocol; + +#define PROTOCOL(x) ((IInternetProtocol*) &(x)->lpInternetProtocolVtbl) +#define BINDINFO(x) ((IInternetBindInfo*) &(x)->lpInternetBindInfoVtbl) + +#define PROTOCOL_THIS(iface) DEFINE_THIS(BindProtocol, InternetProtocol, iface) + +static HRESULT WINAPI BindProtocol_QueryInterface(IInternetProtocol *iface, REFIID riid, void **ppv) +{ + BindProtocol *This = PROTOCOL_THIS(iface); + + *ppv = NULL; + if(IsEqualGUID(&IID_IUnknown, riid)) { + TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); + *ppv = PROTOCOL(This); + }else if(IsEqualGUID(&IID_IInternetProtocolRoot, riid)) { + TRACE("(%p)->(IID_IInternetProtocolRoot %p)\n", This, ppv); + *ppv = PROTOCOL(This); + }else if(IsEqualGUID(&IID_IInternetProtocol, riid)) { + TRACE("(%p)->(IID_IInternetProtocol %p)\n", This, ppv); + *ppv = PROTOCOL(This); + }else if(IsEqualGUID(&IID_IInternetBindInfo, riid)) { + TRACE("(%p)->(IID_IInternetBindInfo %p)\n", This, ppv); + *ppv = BINDINFO(This); + } + + if(*ppv) { + IInternetProtocol_AddRef(iface); + return S_OK; + } + + WARN("not supported interface %s\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI BindProtocol_AddRef(IInternetProtocol *iface) +{ + BindProtocol *This = PROTOCOL_THIS(iface); + LONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p) ref=%d\n", This, ref); + return ref; +} + +static ULONG WINAPI BindProtocol_Release(IInternetProtocol *iface) +{ + BindProtocol *This = PROTOCOL_THIS(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) { + HeapFree(GetProcessHeap(), 0, This); + + URLMON_UnlockModule(); + } + + return ref; +} + +static HRESULT WINAPI BindProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, + IInternetProtocolSink *pOIProtSink, IInternetBindInfo *pOIBindInfo, + DWORD grfPI, DWORD dwReserved) +{ + BindProtocol *This = PROTOCOL_THIS(iface); + + FIXME("(%p)->(%s %p %p %08x %d)\n", This, debugstr_w(szUrl), pOIProtSink, + pOIBindInfo, grfPI, dwReserved); + + if(!szUrl || !pOIProtSink || !pOIBindInfo) + return E_INVALIDARG; + + return E_NOTIMPL; +} + +static HRESULT WINAPI BindProtocol_Continue(IInternetProtocol *iface, PROTOCOLDATA *pProtocolData) +{ + BindProtocol *This = PROTOCOL_THIS(iface); + FIXME("(%p)->(%p)\n", This, pProtocolData); + return E_NOTIMPL; +} + +static HRESULT WINAPI BindProtocol_Abort(IInternetProtocol *iface, HRESULT hrReason, + DWORD dwOptions) +{ + BindProtocol *This = PROTOCOL_THIS(iface); + FIXME("(%p)->(%08x %08x)\n", This, hrReason, dwOptions); + return E_NOTIMPL; +} + +static HRESULT WINAPI BindProtocol_Terminate(IInternetProtocol *iface, DWORD dwOptions) +{ + BindProtocol *This = PROTOCOL_THIS(iface); + FIXME("(%p)->(%08x)\n", This, dwOptions); + return E_NOTIMPL; +} + +static HRESULT WINAPI BindProtocol_Suspend(IInternetProtocol *iface) +{ + BindProtocol *This = PROTOCOL_THIS(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI BindProtocol_Resume(IInternetProtocol *iface) +{ + BindProtocol *This = PROTOCOL_THIS(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI BindProtocol_Read(IInternetProtocol *iface, void *pv, + ULONG cb, ULONG *pcbRead) +{ + BindProtocol *This = PROTOCOL_THIS(iface); + FIXME("(%p)->(%p %u %p)\n", This, pv, cb, pcbRead); + return E_NOTIMPL; +} + +static HRESULT WINAPI BindProtocol_Seek(IInternetProtocol *iface, LARGE_INTEGER dlibMove, + DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition) +{ + BindProtocol *This = PROTOCOL_THIS(iface); + FIXME("(%p)->(%d %d %p)\n", This, dlibMove.u.LowPart, dwOrigin, plibNewPosition); + return E_NOTIMPL; +} + +static HRESULT WINAPI BindProtocol_LockRequest(IInternetProtocol *iface, DWORD dwOptions) +{ + BindProtocol *This = PROTOCOL_THIS(iface); + FIXME("(%p)->(%08x)\n", This, dwOptions); + return E_NOTIMPL; +} + +static HRESULT WINAPI BindProtocol_UnlockRequest(IInternetProtocol *iface) +{ + BindProtocol *This = PROTOCOL_THIS(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +#undef PROTOCOL_THIS + +static const IInternetProtocolVtbl BindProtocolVtbl = { + BindProtocol_QueryInterface, + BindProtocol_AddRef, + BindProtocol_Release, + BindProtocol_Start, + BindProtocol_Continue, + BindProtocol_Abort, + BindProtocol_Terminate, + BindProtocol_Suspend, + BindProtocol_Resume, + BindProtocol_Read, + BindProtocol_Seek, + BindProtocol_LockRequest, + BindProtocol_UnlockRequest +}; + +#define BINDINFO_THIS(iface) DEFINE_THIS(BindProtocol, InternetBindInfo, iface) + +static HRESULT WINAPI BindInfo_QueryInterface(IInternetBindInfo *iface, + REFIID riid, void **ppv) +{ + BindProtocol *This = BINDINFO_THIS(iface); + return IInternetProtocol_QueryInterface(PROTOCOL(This), riid, ppv); +} + +static ULONG WINAPI BindInfo_AddRef(IInternetBindInfo *iface) +{ + BindProtocol *This = BINDINFO_THIS(iface); + return IBinding_AddRef(PROTOCOL(This)); +} + +static ULONG WINAPI BindInfo_Release(IInternetBindInfo *iface) +{ + BindProtocol *This = BINDINFO_THIS(iface); + return IBinding_Release(PROTOCOL(This)); +} + +static HRESULT WINAPI BindInfo_GetBindInfo(IInternetBindInfo *iface, + DWORD *grfBINDF, BINDINFO *pbindinfo) +{ + BindProtocol *This = BINDINFO_THIS(iface); + FIXME("(%p)->(%p %p)\n", This, grfBINDF, pbindinfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI BindInfo_GetBindString(IInternetBindInfo *iface, + ULONG ulStringType, LPOLESTR *ppwzStr, ULONG cEl, ULONG *pcElFetched) +{ + BindProtocol *This = BINDINFO_THIS(iface); + FIXME("(%p)->(%d %p %d %p)\n", This, ulStringType, ppwzStr, cEl, pcElFetched); + return E_NOTIMPL; +} + +#undef BINDFO_THIS + +static const IInternetBindInfoVtbl InternetBindInfoVtbl = { + BindInfo_QueryInterface, + BindInfo_AddRef, + BindInfo_Release, + BindInfo_GetBindInfo, + BindInfo_GetBindString +}; + +HRESULT create_binding_protocol(LPCWSTR url, IInternetProtocol **protocol) +{ + BindProtocol *ret = HeapAlloc(GetProcessHeap(), 0, sizeof(BindProtocol)); + + ret->lpInternetProtocolVtbl = &BindProtocolVtbl; + ret->lpInternetBindInfoVtbl = &InternetBindInfoVtbl; + ret->ref = 1; + + *protocol = PROTOCOL(ret); + return S_OK; +} diff --git a/dlls/urlmon/session.c b/dlls/urlmon/session.c index ed87d27..a9eb292 100644 --- a/dlls/urlmon/session.c +++ b/dlls/urlmon/session.c @@ -268,9 +268,13 @@ static HRESULT WINAPI InternetSession_Cr LPBC pBC, LPCWSTR szUrl, IUnknown *pUnkOuter, IUnknown **ppUnk, IInternetProtocol **ppOInetProt, DWORD dwOption) { - FIXME("(%p %s %p %p %p %08x)\n", pBC, debugstr_w(szUrl), pUnkOuter, ppUnk, + TRACE("(%p %s %p %p %p %08x)\n", pBC, debugstr_w(szUrl), pUnkOuter, ppUnk, ppOInetProt, dwOption); - return E_NOTIMPL; + + if(pBC || pUnkOuter || ppUnk || dwOption) + FIXME("Unsupported arguments\n"); + + return create_binding_protocol(szUrl, ppOInetProt); } static HRESULT WINAPI InternetSession_SetSessionOption(IInternetSession *iface, diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h index c3af9ea..bc48062 100644 --- a/dlls/urlmon/urlmon_main.h +++ b/dlls/urlmon/urlmon_main.h @@ -60,4 +60,6 @@ HRESULT get_protocol_handler(LPCWSTR url HRESULT start_binding(LPCWSTR url, IBindCtx *pbc, REFIID riid, void **ppv); +HRESULT create_binding_protocol(LPCWSTR url, IInternetProtocol **protocol); + #endif /* __WINE_URLMON_MAIN_H */

1 0

Paul Vriens : oleaut32/tests: Cast-qual warning fixes.
by Alexandre Julliard Jan. 24, 2007

Jan. 24, 2007

Module: wine Branch: master Commit: 1d6132bed6db133cd1476b22e5261fcb6d1d8b5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d6132bed6db133cd1476b22e… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Jan 23 14:41:12 2007 +0100 oleaut32/tests: Cast-qual warning fixes. --- dlls/oleaut32/tests/typelib.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index baeb370..0af9774 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -277,12 +277,12 @@ static void test_CreateDispTypeInfo(void FUNCDESC *pFuncDesc; MEMBERID memid; - static const WCHAR func1[] = {'f','u','n','c','1',0}; + static WCHAR func1[] = {'f','u','n','c','1',0}; static const WCHAR func2[] = {'f','u','n','c','2',0}; static const WCHAR func3[] = {'f','u','n','c','3',0}; static const WCHAR parm1[] = {'p','a','r','m','1',0}; static const WCHAR parm2[] = {'p','a','r','m','2',0}; - OLECHAR *name = (OLECHAR *)func1; + OLECHAR *name = func1; ifdata.pmethdata = methdata; ifdata.cMembers = sizeof(methdata) / sizeof(methdata[0]);

1 0

Paul Vriens : ole32/tests: Cast-qual warning fixes.
by Alexandre Julliard Jan. 24, 2007

Jan. 24, 2007

Module: wine Branch: master Commit: e89cac747cf7972775b6ad779051e6fea378e35c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e89cac747cf7972775b6ad779… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Jan 23 14:40:20 2007 +0100 ole32/tests: Cast-qual warning fixes. --- dlls/ole32/tests/compobj.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index eb9f281..9dc2d2d 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -39,9 +39,9 @@ HRESULT (WINAPI * pCoInitializeEx)(LPVOI static const CLSID CLSID_non_existent = { 0x12345678, 0x1234, 0x1234, { 0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0 } }; static const CLSID CLSID_CDeviceMoniker = { 0x4315d437, 0x5b8c, 0x11d0, { 0xbd, 0x3b, 0x00, 0xa0, 0xc9, 0x11, 0xce, 0x86 } }; -static const WCHAR devicedotone[] = {'d','e','v','i','c','e','.','1',0}; +static WCHAR devicedotone[] = {'d','e','v','i','c','e','.','1',0}; static const WCHAR wszNonExistent[] = {'N','o','n','E','x','i','s','t','e','n','t',0}; -static const WCHAR wszCLSID_CDeviceMoniker[] = +static WCHAR wszCLSID_CDeviceMoniker[] = { '{', '4','3','1','5','d','4','3','7','-', @@ -159,7 +159,7 @@ static void test_CLSIDFromProgID(void) ok(hr == S_OK, "CLSIDFromProgID failed with error 0x%08x\n", hr); ok(IsEqualCLSID(&clsid, &CLSID_CDeviceMoniker), "clsid wasn't equal to CLSID_CDeviceMoniker\n"); - hr = CLSIDFromString((LPOLESTR)devicedotone, &clsid); + hr = CLSIDFromString(devicedotone, &clsid); ok_ole_success(hr, "CLSIDFromString"); ok(IsEqualCLSID(&clsid, &CLSID_CDeviceMoniker), "clsid wasn't equal to CLSID_CDeviceMoniker\n"); @@ -180,7 +180,7 @@ static void test_CLSIDFromProgID(void) static void test_CLSIDFromString(void) { CLSID clsid; - HRESULT hr = CLSIDFromString((LPOLESTR)wszCLSID_CDeviceMoniker, &clsid); + HRESULT hr = CLSIDFromString(wszCLSID_CDeviceMoniker, &clsid); ok_ole_success(hr, "CLSIDFromString"); ok(IsEqualCLSID(&clsid, &CLSID_CDeviceMoniker), "clsid wasn't equal to CLSID_CDeviceMoniker\n");

1 0

Paul Vriens : msxml3/tests: Cast-qual warning fixes.
by Alexandre Julliard Jan. 24, 2007

Jan. 24, 2007

Module: wine Branch: master Commit: 695fa7542a5be9ccd3eff9c870834a88c25bb0e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=695fa7542a5be9ccd3eff9c87… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Jan 23 14:39:01 2007 +0100 msxml3/tests: Cast-qual warning fixes. --- dlls/msxml3/tests/domdoc.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index ef660ee..104bd5a 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -91,10 +91,10 @@ static const WCHAR szDocument[] = { }; static const WCHAR szOpen[] = { 'o','p','e','n',0 }; -static const WCHAR szdl[] = { 'd','l',0 }; +static WCHAR szdl[] = { 'd','l',0 }; static const WCHAR szvr[] = { 'v','r',0 }; static const WCHAR szlc[] = { 'l','c',0 }; -static const WCHAR szbs[] = { 'b','s',0 }; +static WCHAR szbs[] = { 'b','s',0 }; static const WCHAR szstr1[] = { 's','t','r','1',0 }; static const WCHAR szstr2[] = { 's','t','r','2',0 }; static const WCHAR szstar[] = { '*',0 }; @@ -545,10 +545,10 @@ todo_wine ok( FALSE, "no element\n"); node = (void*)0xdeadbeef; - r = IXMLDOMNode_selectSingleNode( element, (BSTR)szdl, &node ); + r = IXMLDOMNode_selectSingleNode( element, szdl, &node ); ok( r == S_FALSE, "ret %08x\n", r ); ok( node == NULL, "node %p\n", node ); - r = IXMLDOMNode_selectSingleNode( element, (BSTR)szbs, &node ); + r = IXMLDOMNode_selectSingleNode( element, szbs, &node ); ok( r == S_OK, "ret %08x\n", r ); r = IXMLDOMNode_Release( node ); ok( r == 0, "ret %08x\n", r );

1 0

Huw Davies : rpcrt4: Implement NdrSimpleType{Marshall,Unmarshall}.
by Alexandre Julliard Jan. 24, 2007

Jan. 24, 2007

Module: wine Branch: master Commit: e3abd2b3ff140e4ec43fb6b3f95ce045643b6ea9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3abd2b3ff140e4ec43fb6b3f… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jan 23 11:50:06 2007 +0000 rpcrt4: Implement NdrSimpleType{Marshall,Unmarshall}. --- dlls/rpcrt4/ndr_marshall.c | 4 ++-- dlls/rpcrt4/tests/ndr_marshall.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index f5aee76..3dc5265 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -1524,7 +1524,7 @@ void WINAPI NdrPointerFree(PMIDL_STUB_ME void WINAPI NdrSimpleTypeMarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char* pMemory, unsigned char FormatChar ) { - FIXME("stub\n"); + NdrBaseTypeMarshall(pStubMsg, pMemory, &FormatChar); } /*********************************************************************** @@ -1533,7 +1533,7 @@ void WINAPI NdrSimpleTypeMarshall( PMIDL void WINAPI NdrSimpleTypeUnmarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char* pMemory, unsigned char FormatChar ) { - FIXME("stub\n"); + NdrBaseTypeUnmarshall(pStubMsg, &pMemory, &FormatChar, 0); } /*********************************************************************** diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index 4a5566f..a1d8f5e 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -73,6 +73,42 @@ static const MIDL_STUB_DESC Object_StubD }; +static void test_ndr_simple_type(void) +{ + RPC_MESSAGE RpcMessage; + MIDL_STUB_MESSAGE StubMsg; + MIDL_STUB_DESC StubDesc; + long l, l2 = 0; + + StubDesc = Object_StubDesc; + StubDesc.pFormatTypes = NULL; + + NdrClientInitializeNew( + &RpcMessage, + &StubMsg, + &StubDesc, + 0); + + StubMsg.BufferLength = 16; + StubMsg.RpcMsg->Buffer = StubMsg.BufferStart = StubMsg.Buffer = HeapAlloc(GetProcessHeap(), 0, StubMsg.BufferLength); + l = 0xcafebabe; + NdrSimpleTypeMarshall(&StubMsg, (unsigned char*)&l, 8 /* FC_LONG */); + ok(StubMsg.Buffer == StubMsg.BufferStart + 4, "%p %p\n", StubMsg.Buffer, StubMsg.BufferStart); + ok(*(long*)StubMsg.BufferStart == l, "%ld\n", *(long*)StubMsg.BufferStart); + + StubMsg.Buffer = StubMsg.BufferStart + 1; + NdrSimpleTypeMarshall(&StubMsg, (unsigned char*)&l, 8 /* FC_LONG */); + ok(StubMsg.Buffer == StubMsg.BufferStart + 8, "%p %p\n", StubMsg.Buffer, StubMsg.BufferStart); + ok(*(long*)(StubMsg.BufferStart + 4) == l, "%ld\n", *(long*)StubMsg.BufferStart); + + StubMsg.Buffer = StubMsg.BufferStart + 1; + NdrSimpleTypeUnmarshall(&StubMsg, (unsigned char*)&l2, 8 /* FC_LONG */); + ok(StubMsg.Buffer == StubMsg.BufferStart + 8, "%p %p\n", StubMsg.Buffer, StubMsg.BufferStart); + ok(l2 == l, "%ld\n", l2); + + HeapFree(GetProcessHeap(), 0, StubMsg.BufferStart); +} + static void test_pointer_marshal(const unsigned char *formattypes, void *memsrc, long srcsize, @@ -950,6 +986,7 @@ todo_wine { START_TEST( ndr_marshall ) { + test_ndr_simple_type(); test_simple_types(); test_simple_struct(); test_fullpointer_xlat();

1 0

Hans Leidekker : usp10: Document ScriptPlace and ScriptShape.
by Alexandre Julliard Jan. 24, 2007

Jan. 24, 2007

Module: wine Branch: master Commit: dfcdbba1817459f81b8c93a20945fe6f50de55c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfcdbba1817459f81b8c93a20… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Tue Jan 23 11:03:26 2007 +0100 usp10: Document ScriptPlace and ScriptShape. --- dlls/usp10/usp10.c | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index c03db35..c3b0a17 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1201,6 +1201,23 @@ HRESULT WINAPI ScriptIsComplex(const WCH /*********************************************************************** * ScriptShape (USP10.@) * + * Produce glyphs and visual attributes for a run. + * + * PARAMS + * hdc [I] Device context. + * psc [I/O] Opaque pointer to a script cache. + * pwcChars [I] Array of characters specifying the run. + * cChars [I] Number of characters in pwcChars. + * cMaxGlyphs [I] Length of pwOutGlyphs. + * psa [I/O] String analysis. + * pwOutGlyphs [O] Array of glyphs. + * pwLogClust [O] Array of logical cluster info. + * psva [O] Array of visual attributes. + * pcGlyphs [O] Number of glyphs returned. + * + * RETURNS + * Success: S_OK + * Failure: Non-zero HRESULT value. */ HRESULT WINAPI ScriptShape(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcChars, int cChars, int cMaxGlyphs, @@ -1257,6 +1274,22 @@ HRESULT WINAPI ScriptShape(HDC hdc, SCRI /*********************************************************************** * ScriptPlace (USP10.@) * + * Produce advance widths for a run. + * + * PARAMS + * hdc [I] Device context. + * psc [I/O] Opaque pointer to a script cache. + * pwGlyphs [I] Array of glyphs. + * cGlyphs [I] Number of glyphs in pwGlyphs. + * psva [I] Array of visual attributes. + * psa [I/O] String analysis. + * piAdvance [O] Array of advance widths. + * pGoffset [O] Glyph offsets. + * pABC [O] Combined ABC width. + * + * RETURNS + * Success: S_OK + * Failure: Non-zero HRESULT value. */ HRESULT WINAPI ScriptPlace(HDC hdc, SCRIPT_CACHE *psc, const WORD *pwGlyphs, int cGlyphs, const SCRIPT_VISATTR *psva,

1 0

Hans Leidekker : usp10: Move text metrics into the script cache. Start using accessor functions.
by Alexandre Julliard Jan. 24, 2007

Jan. 24, 2007

Module: wine Branch: master Commit: 06ed81ecc0b4b9aada4d439a94c43e2411680dce URL: http://source.winehq.org/git/wine.git/?a=commit;h=06ed81ecc0b4b9aada4d439a9… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Tue Jan 23 11:03:12 2007 +0100 usp10: Move text metrics into the script cache. Start using accessor functions. --- dlls/usp10/usp10.c | 80 +++++++++++++++++++++++++++++++--------------------- 1 files changed, 48 insertions(+), 32 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 4aab525..c03db35 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -145,6 +145,8 @@ static const SCRIPT_PROPERTIES *script_p typedef struct { HDC hdc; + LONG height; + WCHAR default_char; } ScriptCache; typedef struct { @@ -190,15 +192,50 @@ static inline void usp_free(LPVOID mem) HeapFree(GetProcessHeap(), 0, mem); } +static HDC get_cache_hdc(SCRIPT_CACHE *psc) +{ + return ((ScriptCache *)*psc)->hdc; +} + +static WCHAR get_cache_default_char(SCRIPT_CACHE *psc) +{ + return ((ScriptCache *)*psc)->default_char; +} + +static LONG get_cache_height(SCRIPT_CACHE *psc) +{ + return ((ScriptCache *)*psc)->height; +} + +static HRESULT init_script_cache(const HDC hdc, ScriptCache *sc) +{ + TEXTMETRICW metric; + + if (!GetTextMetricsW(hdc, &metric)) return E_INVALIDARG; + sc->height = metric.tmHeight; + sc->default_char = metric.tmDefaultChar; + sc->hdc = hdc; + return S_OK; +} + static HRESULT get_script_cache(const HDC hdc, SCRIPT_CACHE *psc) { if (!psc) return E_INVALIDARG; if (!*psc) { + HRESULT ret; + ScriptCache *sc; + if (!hdc) return E_PENDING; - if (!(*psc = usp_alloc(sizeof(ScriptCache)))) return E_OUTOFMEMORY; - ((ScriptCache *)*psc)->hdc = hdc; + if (!(sc = usp_zero_alloc(sizeof(ScriptCache)))) return E_OUTOFMEMORY; + if ((ret = init_script_cache(hdc, sc))) + { + usp_free(sc); + return ret; + } + *psc = sc; } + TRACE("<- %p\n", *psc); return S_OK; } @@ -284,7 +321,6 @@ HRESULT WINAPI ScriptGetProperties(const HRESULT WINAPI ScriptGetFontProperties(HDC hdc, SCRIPT_CACHE *psc, SCRIPT_FONTPROPERTIES *sfp) { HRESULT hr; - TEXTMETRICW ptm; TRACE("%p,%p,%p\n", hdc, psc, sfp); @@ -296,10 +332,7 @@ HRESULT WINAPI ScriptGetFontProperties(H /* return something sensible? */ sfp->wgBlank = 0; - if (GetTextMetricsW(((ScriptCache *)*psc)->hdc, &ptm)) - sfp->wgDefault = ptm.tmDefaultChar; - else - sfp->wgDefault = 0; + sfp->wgDefault = get_cache_default_char(psc); sfp->wgInvalid = 0; sfp->wgKashida = 0xffff; sfp->iKashidaWidth = 0; @@ -1191,7 +1224,7 @@ HRESULT WINAPI ScriptShape(HDC hdc, SCRI TRACE("\n"); if (!psa->fNoGlyphIndex) { /* Glyph translate */ - if (!(GetGlyphIndicesW(((ScriptCache *)*psc)->hdc, pwcChars, cChars, pwOutGlyphs, 0))) + if (!(GetGlyphIndicesW(get_cache_hdc(psc), pwcChars, cChars, pwOutGlyphs, 0))) return S_FALSE; TRACE("After: "); @@ -1247,7 +1280,7 @@ HRESULT WINAPI ScriptPlace(HDC hdc, SCRI memset(pABC, 0, sizeof(ABC)); /* FIXME: set pGoffset to more reasonable values */ - if (!GetCharABCWidthsI(((ScriptCache *)*psc)->hdc, 0, cGlyphs, (WORD *) pwGlyphs, lpABC )) + if (!GetCharABCWidthsI(get_cache_hdc(psc), 0, cGlyphs, (WORD *) pwGlyphs, lpABC )) { WARN("Could not get ABC values\n"); for (wcnt = 0; wcnt < cGlyphs; wcnt++) { @@ -1311,7 +1344,7 @@ HRESULT WINAPI ScriptGetCMap(HDC hdc, SC TRACE("%4x",pwcInChars[cnt]); TRACE("\n"); - GetGlyphIndicesW(((ScriptCache *)*psc)->hdc, pwcInChars, cChars, pwOutGlyphs, 0); + GetGlyphIndicesW(get_cache_hdc(psc), pwcInChars, cChars, pwOutGlyphs, 0); TRACE("After: "); for (cnt = 0; cnt < cChars; cnt++) { @@ -1345,7 +1378,7 @@ HRESULT WINAPI ScriptTextOut(const HDC h if (!psa->fNoGlyphIndex) /* Have Glyphs? */ fuOptions |= ETO_GLYPH_INDEX; /* Say don't do translation to glyph */ - if (!ExtTextOutW(((ScriptCache *)*psc)->hdc, x, y, fuOptions, lprc, pwGlyphs, cGlyphs, NULL)) + if (!ExtTextOutW(get_cache_hdc(psc), x, y, fuOptions, lprc, pwGlyphs, cGlyphs, NULL)) return S_FALSE; return S_OK; @@ -1368,17 +1401,13 @@ HRESULT WINAPI ScriptTextOut(const HDC h HRESULT WINAPI ScriptCacheGetHeight(HDC hdc, SCRIPT_CACHE *psc, LONG *height) { HRESULT hr; - TEXTMETRICW metric; TRACE("(%p, %p, %p)\n", hdc, psc, height); if (!height) return E_INVALIDARG; if ((hr = get_script_cache(hdc, psc))) return hr; - /* FIXME: get this from the cache */ - if (!GetTextMetricsW(((ScriptCache *)*psc)->hdc, &metric)) return E_INVALIDARG; - - *height = metric.tmHeight; + *height = get_cache_height(psc); return S_OK; } @@ -1406,7 +1435,7 @@ HRESULT WINAPI ScriptGetGlyphABCWidth(HD if ((hr = get_script_cache(hdc, psc))) return hr; /* FIXME: get this from the cache */ - if (!GetCharABCWidthsW(((ScriptCache *)*psc)->hdc, glyph, glyph, abc)) return E_HANDLE; + if (!GetCharABCWidthsW(get_cache_hdc(psc), glyph, glyph, abc)) return E_HANDLE; return S_OK; } @@ -1529,7 +1558,6 @@ const SIZE * WINAPI ScriptString_pSize(S { unsigned int i, j; StringAnalysis *analysis = ssa; - TEXTMETRICW metric; TRACE("(%p)\n", ssa); @@ -1537,20 +1565,8 @@ const SIZE * WINAPI ScriptString_pSize(S if (!analysis->sz) { - if (!(analysis->sz = usp_alloc(sizeof(SIZE)))) - return NULL; - - /* FIXME: These values should be calculated at a more - * appropriate place so that we can just pass cached - * values here. - */ - if (!GetTextMetricsW(analysis->sc->hdc, &metric)) - { - usp_free(analysis->sz); - analysis->sz = NULL; - return NULL; - } - analysis->sz->cy = metric.tmHeight; + if (!(analysis->sz = usp_alloc(sizeof(SIZE)))) return NULL; + analysis->sz->cy = analysis->sc->height; analysis->sz->cx = 0; for (i = 0; i < analysis->numItems; i++)

1 0

Hans Leidekker : usp10: Remove duplicate font selection code from the tests .
by Alexandre Julliard Jan. 24, 2007

Jan. 24, 2007

Module: wine Branch: master Commit: 6a12d679b08c6c35e7d1a121f4009534660b32fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a12d679b08c6c35e7d1a121f… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Tue Jan 23 11:02:51 2007 +0100 usp10: Remove duplicate font selection code from the tests. --- dlls/usp10/tests/usp10.c | 50 +++++++++------------------------------------ 1 files changed, 10 insertions(+), 40 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 3bd6257..40840c3 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -61,23 +61,8 @@ static void test_ScriptItemIzeShapePlace int piAdvance[256]; GOFFSET pGoffset[256]; ABC pABC[256]; - LOGFONTA lf; - HFONT zfont; int cnt; - - lstrcpyA(lf.lfFaceName, "Symbol"); - lf.lfHeight = 10; - lf.lfItalic = 0; - lf.lfEscapement = 0; - lf.lfOrientation = 0; - lf.lfUnderline = 0; - lf.lfStrikeOut = 0; - lf.lfWeight = 3; - lf.lfWidth = 10; - - zfont = (HFONT) SelectObject(hdc, CreateFontIndirectA(&lf)); - /* Start testing usp10 functions */ /* This test determines that the pointer returned by ScriptGetProperties is valid * by checking a known value in the table */ @@ -711,23 +696,6 @@ static void test_ScriptStringXtoCP_CPtoX int X; BOOL fTrailing; - LOGFONTA lf; - HFONT zfont; - - lstrcpyA(lf.lfFaceName, "Symbol"); - lf.lfHeight = 10; - lf.lfCharSet = 0; - lf.lfItalic = 0; - lf.lfEscapement = 0; - lf.lfOrientation = 0; - lf.lfUnderline = 0; - lf.lfStrikeOut = 0; - lf.lfWeight = 400; - lf.lfWidth = 0; - lf.lfPitchAndFamily = 0; - - zfont = (HFONT) SelectObject(hdc, CreateFontIndirectA(&lf)); - /* Test with hdc, this should be a valid test * Here we generrate an SCRIPT_STRING_ANALYSIS that will be used as input to the * following character positions to X and X to character position functions. @@ -880,17 +848,9 @@ static void test_ScriptCacheGetHeight(HD static void test_ScriptGetGlyphABCWidth(HDC hdc) { HRESULT hr; - LOGFONTA lf; - HFONT hfont; SCRIPT_CACHE sc = NULL; ABC abc; - memset(&lf, 0, sizeof(lf)); - - lstrcpyA(lf.lfFaceName, "Symbol"); - hfont = CreateFontIndirectA(&lf); - hfont = SelectObject(hdc, hfont); - hr = ScriptGetGlyphABCWidth(NULL, NULL, 'a', NULL); ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got 0x%08x\n", hr); @@ -1239,6 +1199,8 @@ START_TEST(usp10) { HWND hwnd; HDC hdc; + LOGFONTA lf; + HFONT hfont; unsigned short pwOutGlyphs[256]; @@ -1253,6 +1215,14 @@ START_TEST(usp10) hdc = GetDC(hwnd); /* We now have a hdc */ ok( hdc != NULL, "HDC failed to be created %p\n", hdc); + memset(&lf, 0, sizeof(HFONT)); + lstrcpyA(lf.lfFaceName, "Symbol"); + lf.lfHeight = 10; + lf.lfWeight = 3; + lf.lfWidth = 10; + + hfont = SelectObject(hdc, CreateFontIndirectA(&lf)); + test_ScriptItemIzeShapePlace(hdc,pwOutGlyphs); test_ScriptGetCMap(hdc, pwOutGlyphs); test_ScriptCacheGetHeight(hdc);

1 0

Dmitry Timoshkov : user32: Do not use DIB APIs for bitmap bits in a device dependent format.
by Alexandre Julliard Jan. 24, 2007

Jan. 24, 2007

Module: wine Branch: master Commit: 7670d76690f12a240ec0241a4bd96b8f5f5a7c6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7670d76690f12a240ec0241a4… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Jan 23 16:47:45 2007 +0800 user32: Do not use DIB APIs for bitmap bits in a device dependent format. --- dlls/user32/cursoricon.c | 80 ++++++++-------------------------------------- 1 files changed, 14 insertions(+), 66 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index a5e0d00..7bbb79a 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1236,24 +1236,7 @@ HICON16 WINAPI CreateIcon16( HINSTANCE16 * Success: handle to an icon * Failure: NULL * - * BUGS - * - * - The provided bitmaps are not resized! - * - The documentation says the lpXORbits bitmap must be in a device - * dependent format. But we must still resize it and perform depth - * conversions if necessary. - * - I'm a bit unsure about the how the 'device dependent format' thing works. - * I did some tests on windows and found that if you provide a 16bpp bitmap - * in lpXORbits, then its format but be 565 RGB if the screen's bit depth - * is 16bpp but it must be 555 RGB if the screen's bit depth is anything - * else. I don't know if this is part of the GDI specs or if this is a - * quirk of the graphics card driver. - * - You may think that we check whether the bit depths match or not - * as an optimization. But the truth is that the conversion using - * CreateDIBitmap does not work for some bit depth (e.g. 8bpp) and I have - * no idea why. - * - I'm pretty sure that all the things we do in CreateIcon should - * also be done in CreateIconIndirect... + * FIXME: Do we need to resize the bitmaps? */ HICON WINAPI CreateIcon( HINSTANCE hInstance, /* [in] the application's hInstance */ @@ -1264,58 +1247,23 @@ HICON WINAPI CreateIcon( LPCVOID lpANDbits, /* [in] a monochrome bitmap representing the icon's mask */ LPCVOID lpXORbits) /* [in] the icon's 'color' bitmap */ { + ICONINFO iinfo; HICON hIcon; - HDC hdc; - TRACE_(icon)("%dx%dx%d, xor=%p, and=%p\n", - nWidth, nHeight, bPlanes * bBitsPixel, lpXORbits, lpANDbits); + TRACE_(icon)("%dx%d, planes %d, bpp %d, xor %p, and %p\n", + nWidth, nHeight, bPlanes, bBitsPixel, lpXORbits, lpANDbits); - hdc=GetDC(0); - if (!hdc) - return 0; + iinfo.fIcon = TRUE; + iinfo.xHotspot = ICON_HOTSPOT; + iinfo.yHotspot = ICON_HOTSPOT; + iinfo.hbmMask = CreateBitmap( nWidth, nHeight, 1, 1, lpANDbits ); + iinfo.hbmColor = CreateBitmap( nWidth, nHeight, bPlanes, bBitsPixel, lpXORbits ); + + hIcon = CreateIconIndirect( &iinfo ); + + DeleteObject( iinfo.hbmMask ); + DeleteObject( iinfo.hbmColor ); - if (GetDeviceCaps(hdc,BITSPIXEL)==bBitsPixel) { - CURSORICONINFO info; - - info.ptHotSpot.x = ICON_HOTSPOT; - info.ptHotSpot.y = ICON_HOTSPOT; - info.nWidth = nWidth; - info.nHeight = nHeight; - info.nWidthBytes = 0; - info.bPlanes = bPlanes; - info.bBitsPerPixel = bBitsPixel; - - hIcon=HICON_32(CreateCursorIconIndirect16(0, &info, lpANDbits, lpXORbits)); - } else { - ICONINFO iinfo; - BITMAPINFO bmi; - - iinfo.fIcon=TRUE; - iinfo.xHotspot=ICON_HOTSPOT; - iinfo.yHotspot=ICON_HOTSPOT; - iinfo.hbmMask=CreateBitmap(nWidth,nHeight,1,1,lpANDbits); - - bmi.bmiHeader.biSize=sizeof(bmi.bmiHeader); - bmi.bmiHeader.biWidth=nWidth; - bmi.bmiHeader.biHeight=-nHeight; - bmi.bmiHeader.biPlanes=bPlanes; - bmi.bmiHeader.biBitCount=bBitsPixel; - bmi.bmiHeader.biCompression=BI_RGB; - bmi.bmiHeader.biSizeImage=0; - bmi.bmiHeader.biXPelsPerMeter=0; - bmi.bmiHeader.biYPelsPerMeter=0; - bmi.bmiHeader.biClrUsed=0; - bmi.bmiHeader.biClrImportant=0; - - iinfo.hbmColor = CreateDIBitmap( hdc, &bmi.bmiHeader, - CBM_INIT, lpXORbits, - &bmi, DIB_RGB_COLORS ); - - hIcon=CreateIconIndirect(&iinfo); - DeleteObject(iinfo.hbmMask); - DeleteObject(iinfo.hbmColor); - } - ReleaseDC(0,hdc); return hIcon; }

1 0

Dmitry Timoshkov : user32: Using DIB APIs to convert a DDB to monochrome is wrong, do it differently.
by Alexandre Julliard Jan. 24, 2007

Jan. 24, 2007

Module: wine Branch: master Commit: 81a294f76d47fcacdfff185617f27c6872d578fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=81a294f76d47fcacdfff18561… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Jan 23 16:46:53 2007 +0800 user32: Using DIB APIs to convert a DDB to monochrome is wrong, do it differently. --- dlls/user32/cursoricon.c | 40 +++++++++++++++++++++++++++------------- 1 files changed, 27 insertions(+), 13 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 26adfde..a5e0d00 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1846,8 +1846,6 @@ HICON WINAPI CreateIconIndirect(PICONINF sizeof(CURSORICONINFO) + sizeXor + sizeAnd ); if (hObj) { - HDC hdc; - BITMAPINFO bi; CURSORICONINFO *info; info = (CURSORICONINFO *)GlobalLock16( hObj ); @@ -1884,18 +1882,34 @@ HICON WINAPI CreateIconIndirect(PICONINF /* Transfer the bitmap bits to the CURSORICONINFO structure */ /* Some apps pass a color bitmap as a mask, convert it to b/w */ - hdc = GetDC( 0 ); - memset(&bi, 0, sizeof(bi) ); - bi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); - bi.bmiHeader.biWidth = bmpAnd.bmWidth; - bi.bmiHeader.biHeight = bmpAnd.bmHeight; - bi.bmiHeader.biPlanes = 1; - bi.bmiHeader.biBitCount = 1; - bi.bmiHeader.biCompression = BI_RGB; - bi.bmiHeader.biSizeImage = sizeAnd; - GetDIBits( hdc, iconinfo->hbmMask, 0, bmpAnd.bmHeight, (char*)(info + 1), &bi, DIB_RGB_COLORS ); - ReleaseDC( 0, hdc ); + if (bmpAnd.bmBitsPixel == 1) + { + GetBitmapBits( iconinfo->hbmMask, sizeAnd, (char*)(info + 1) ); + } + else + { + HDC hdc, hdc_mem; + HBITMAP hbmp_old, hbmp_mem_old, hbmp_mono; + + hdc = GetDC( 0 ); + hdc_mem = CreateCompatibleDC( hdc ); + hbmp_mono = CreateBitmap( bmpAnd.bmWidth, bmpAnd.bmHeight, 1, 1, NULL ); + + hbmp_old = SelectObject( hdc, iconinfo->hbmMask ); + hbmp_mem_old = SelectObject( hdc_mem, hbmp_mono ); + + BitBlt( hdc_mem, 0, 0, bmpAnd.bmWidth, bmpAnd.bmHeight, hdc, 0, 0, SRCCOPY ); + + SelectObject( hdc, hbmp_old ); + SelectObject( hdc_mem, hbmp_mem_old ); + + DeleteDC( hdc_mem ); + ReleaseDC( 0, hdc ); + + GetBitmapBits( hbmp_mono, sizeAnd, (char*)(info + 1) ); + DeleteObject( hbmp_mono ); + } if (iconinfo->hbmColor) GetBitmapBits( iconinfo->hbmColor, sizeXor, (char*)(info + 1) + sizeAnd ); GlobalUnlock16( hObj ); }

1 0