December 2006 - Wine-commits

Alexandre Julliard : dlls: Merged the make_dlls script into the global make_makefiles.
by Alexandre Julliard 24 Dec '06

24 Dec '06

Module: wine Branch: master Commit: 0134db6e9b900585492e3f745ed80ab799ff2442 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0134db6e9b900585492e3f745… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Dec 24 14:05:12 2006 +0100 dlls: Merged the make_dlls script into the global make_makefiles. --- dlls/.gitignore | 2 +- dlls/Makefile.in | 2 +- dlls/make_dlls | 387 -------------------------------------------------- tools/make_makefiles | 269 ++++++++++++++++++++++++++++++++++- 4 files changed, 267 insertions(+), 393 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0134db6e9b900585492e3…

1 0

Jacek Caban : itss: Added ITSProtocol stub implementation.
by Alexandre Julliard 24 Dec '06

24 Dec '06

Module: wine Branch: master Commit: 7d95f0c4dac013069032ff647ad57349b5fdcac0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d95f0c4dac013069032ff647… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Dec 24 01:22:30 2006 +0100 itss: Added ITSProtocol stub implementation. --- dlls/itss/Makefile.in | 1 + dlls/itss/itss.c | 3 + dlls/itss/itsstor.h | 3 + dlls/itss/protocol.c | 201 +++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 208 insertions(+), 0 deletions(-) diff --git a/dlls/itss/Makefile.in b/dlls/itss/Makefile.in index 1485dfd..65f8967 100644 --- a/dlls/itss/Makefile.in +++ b/dlls/itss/Makefile.in @@ -12,6 +12,7 @@ C_SRCS = \ lzx.c \ itss.c \ moniker.c \ + protocol.c \ storage.c RC_SRCS = rsrc.rc diff --git a/dlls/itss/itss.c b/dlls/itss/itss.c index 683b02e..cca4f61 100644 --- a/dlls/itss/itss.c +++ b/dlls/itss/itss.c @@ -145,6 +145,7 @@ static const IClassFactoryVtbl ITSSCF_Vt static const IClassFactoryImpl ITStorage_factory = { &ITSSCF_Vtbl, ITSS_create }; static const IClassFactoryImpl MSITStore_factory = { &ITSSCF_Vtbl, ITS_IParseDisplayName_create }; +static const IClassFactoryImpl ITSProtocol_factory = { &ITSSCF_Vtbl, ITSProtocol_create }; /*********************************************************************** * DllGetClassObject (ITSS.@) @@ -159,6 +160,8 @@ HRESULT WINAPI DllGetClassObject(REFCLSI factory = &ITStorage_factory; else if (IsEqualGUID(&CLSID_MSITStore, rclsid)) factory = &MSITStore_factory; + else if (IsEqualGUID(&CLSID_ITSProtocol, rclsid)) + factory = &ITSProtocol_factory; else { FIXME("%s: no class found.\n", debugstr_guid(rclsid)); diff --git a/dlls/itss/itsstor.h b/dlls/itss/itsstor.h index 736dd88..d134725 100644 --- a/dlls/itss/itsstor.h +++ b/dlls/itss/itsstor.h @@ -35,9 +35,12 @@ extern HRESULT ITS_IParseDisplayName_cre IUnknown *pUnkOuter, LPVOID *ppObj); +extern HRESULT ITSProtocol_create(IUnknown *pUnkOuter, LPVOID *ppobj); + extern LONG dll_count; static inline void ITSS_LockModule(void) { InterlockedIncrement(&dll_count); } static inline void ITSS_UnlockModule(void) { InterlockedDecrement(&dll_count); } +#define DEFINE_THIS(cls,ifc,iface) ((cls*)((BYTE*)(iface)-offsetof(cls,lp ## ifc ## Vtbl))) #endif /* __WINE_ITS_STORAGE_PRIVATE__ */ diff --git a/dlls/itss/protocol.c b/dlls/itss/protocol.c new file mode 100644 index 0000000..5a192af --- /dev/null +++ b/dlls/itss/protocol.c @@ -0,0 +1,201 @@ +/* + * 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 + */ + +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "ole2.h" +#include "urlmon.h" +#include "itsstor.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(itss); + +typedef struct { + const IInternetProtocolVtbl *lpInternetProtocolVtbl; + LONG ref; +} ITSProtocol; + +#define PROTOCOL_THIS(iface) DEFINE_THIS(ITSProtocol, InternetProtocol, iface) + +#define PROTOCOL(x) ((IInternetProtocol*) &(x)->lpInternetProtocolVtbl) + +static HRESULT WINAPI ITSProtocol_QueryInterface(IInternetProtocol *iface, REFIID riid, void **ppv) +{ + ITSProtocol *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); + } + + if(*ppv) { + IInternetProtocol_AddRef(iface); + return S_OK; + } + + WARN("not supported interface %s\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI ITSProtocol_AddRef(IInternetProtocol *iface) +{ + ITSProtocol *This = PROTOCOL_THIS(iface); + LONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p) ref=%d\n", This, ref); + return ref; +} + +static ULONG WINAPI ITSProtocol_Release(IInternetProtocol *iface) +{ + ITSProtocol *This = PROTOCOL_THIS(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) { + HeapFree(GetProcessHeap(), 0, This); + ITSS_UnlockModule(); + } + + return ref; +} + +static HRESULT WINAPI ITSProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, + IInternetProtocolSink *pOIProtSink, IInternetBindInfo *pOIBindInfo, + DWORD grfPI, DWORD dwReserved) +{ + ITSProtocol *This = PROTOCOL_THIS(iface); + FIXME("(%p)->(%s %p %p %08x %d)\n", This, debugstr_w(szUrl), pOIProtSink, + pOIBindInfo, grfPI, dwReserved); + return E_NOTIMPL; +} + +static HRESULT WINAPI ITSProtocol_Continue(IInternetProtocol *iface, PROTOCOLDATA *pProtocolData) +{ + ITSProtocol *This = PROTOCOL_THIS(iface); + FIXME("(%p)->(%p)\n", This, pProtocolData); + return E_NOTIMPL; +} + +static HRESULT WINAPI ITSProtocol_Abort(IInternetProtocol *iface, HRESULT hrReason, + DWORD dwOptions) +{ + ITSProtocol *This = PROTOCOL_THIS(iface); + FIXME("(%p)->(%08x %08x)\n", This, hrReason, dwOptions); + return E_NOTIMPL; +} + +static HRESULT WINAPI ITSProtocol_Terminate(IInternetProtocol *iface, DWORD dwOptions) +{ + ITSProtocol *This = PROTOCOL_THIS(iface); + FIXME("(%p)->(%08x)\n", This, dwOptions); + return E_NOTIMPL; +} + +static HRESULT WINAPI ITSProtocol_Suspend(IInternetProtocol *iface) +{ + ITSProtocol *This = PROTOCOL_THIS(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ITSProtocol_Resume(IInternetProtocol *iface) +{ + ITSProtocol *This = PROTOCOL_THIS(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ITSProtocol_Read(IInternetProtocol *iface, void *pv, + ULONG cb, ULONG *pcbRead) +{ + ITSProtocol *This = PROTOCOL_THIS(iface); + FIXME("(%p)->(%p %u %p)\n", This, pv, cb, pcbRead); + return E_NOTIMPL; +} + +static HRESULT WINAPI ITSProtocol_Seek(IInternetProtocol *iface, LARGE_INTEGER dlibMove, + DWORD dwOrgin, ULARGE_INTEGER *plibNewPosition) +{ + ITSProtocol *This = PROTOCOL_THIS(iface); + FIXME("(%p)->(%d %d %p)\n", This, dlibMove.u.LowPart, dwOrgin, plibNewPosition); + return E_NOTIMPL; +} + +static HRESULT WINAPI ITSProtocol_LockRequest(IInternetProtocol *iface, DWORD dwOptions) +{ + ITSProtocol *This = PROTOCOL_THIS(iface); + FIXME("(%p)->(%08x)\n", This, dwOptions); + return E_NOTIMPL; +} + +static HRESULT WINAPI ITSProtocol_UnlockRequest(IInternetProtocol *iface) +{ + ITSProtocol *This = PROTOCOL_THIS(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +#undef PROTOCOL_THIS + +static const IInternetProtocolVtbl ITSProtocolVtbl = { + ITSProtocol_QueryInterface, + ITSProtocol_AddRef, + ITSProtocol_Release, + ITSProtocol_Start, + ITSProtocol_Continue, + ITSProtocol_Abort, + ITSProtocol_Terminate, + ITSProtocol_Suspend, + ITSProtocol_Resume, + ITSProtocol_Read, + ITSProtocol_Seek, + ITSProtocol_LockRequest, + ITSProtocol_UnlockRequest +}; + +HRESULT ITSProtocol_create(IUnknown *pUnkOuter, LPVOID *ppobj) +{ + ITSProtocol *ret; + + TRACE("(%p %p)\n", pUnkOuter, ppobj); + + ITSS_LockModule(); + + ret = HeapAlloc(GetProcessHeap(), 0, sizeof(ITSProtocol)); + + ret->lpInternetProtocolVtbl = &ITSProtocolVtbl; + ret->ref = 1; + + *ppobj = PROTOCOL(ret); + + return S_OK; +}

1 0

Alex Villacís Lasso : oleaut32: Fix tests for redundant headers in OLEPicture load from IStream.
by Alexandre Julliard 24 Dec '06

24 Dec '06

Module: wine Branch: master Commit: 8b95d95eb8f854f7126af1b6b2474f65e738ccb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b95d95eb8f854f7126af1b6b… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Sat Dec 23 22:02:33 2006 -0500 oleaut32: Fix tests for redundant headers in OLEPicture load from IStream. --- dlls/oleaut32/tests/olepicture.c | 54 +++++++++++++++++++------------------- 1 files changed, 27 insertions(+), 27 deletions(-) diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index 8e653ce..64f225b 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -191,12 +191,13 @@ test_pic(const unsigned char *imgdata, u LARGE_INTEGER seekto; ULARGE_INTEGER newpos1; DWORD * header; - unsigned int i; + unsigned int i,j; /* Let the fun begin */ hglob = GlobalAlloc (0, imgsize); data = GlobalLock (hglob); memcpy(data, imgdata, imgsize); + GlobalUnlock(hglob); data = NULL; hres = CreateStreamOnHGlobal (hglob, FALSE, &stream); ok (hres == S_OK, "createstreamonhglobal failed? doubt it... hres 0x%08x\n", hres); @@ -210,34 +211,29 @@ test_pic(const unsigned char *imgdata, u /* again with Non Statable and Non Seekable stream */ stream = (LPSTREAM)NoStatStreamImpl_Construct(hglob); + hglob = 0; /* Non-statable impl always deletes on release */ test_pic_with_stream(stream, 0); IStream_Release(stream); - - /* free memory */ - GlobalUnlock(hglob); - GlobalFree(hglob); - - /* more fun!!! */ - hglob = GlobalAlloc (0, imgsize + 8 * (2 * sizeof(DWORD))); - data = GlobalLock (hglob); - header = (DWORD *)data; - - /* multiple copies of header */ - memcpy(data,"lt\0\0",4); - header[1] = imgsize; - memcpy(&(header[2]), header, 2 * sizeof(DWORD)); - memcpy(&(header[4]), header, 4 * sizeof(DWORD)); - memcpy(&(header[8]), header, 8 * sizeof(DWORD)); - - memcpy(data + 8 * (2 * sizeof(DWORD)), imgdata, imgsize); - for (i = 1; i <= 8; i++) { + /* more fun!!! */ + hglob = GlobalAlloc (0, imgsize + i * (2 * sizeof(DWORD))); + data = GlobalLock (hglob); + header = (DWORD *)data; + + /* multiple copies of header */ + memcpy(data,"lt\0\0",4); + header[1] = imgsize; + for (j = 2; j <= i; j++) { + memcpy(&(header[2 * (j - 1)]), header, 2 * sizeof(DWORD)); + } + memcpy(data + i * (2 * sizeof(DWORD)), imgdata, imgsize); + GlobalUnlock(hglob); data = NULL; + hres = CreateStreamOnHGlobal (hglob, FALSE, &stream); ok (hres == S_OK, "createstreamonhglobal failed? doubt it... hres 0x%08x\n", hres); memset(&seekto,0,sizeof(seekto)); - seekto.u.LowPart = (8 - i) * (2 * sizeof(DWORD)); hres = IStream_Seek(stream,seekto,SEEK_CUR,&newpos1); ok (hres == S_OK, "istream seek failed? doubt it... hres 0x%08x\n", hres); test_pic_with_stream(stream, imgsize); @@ -246,14 +242,11 @@ test_pic(const unsigned char *imgdata, u /* again with Non Statable and Non Seekable stream */ stream = (LPSTREAM)NoStatStreamImpl_Construct(hglob); + hglob = 0; /* Non-statable impl always deletes on release */ test_pic_with_stream(stream, 0); - IStream_Release(stream); + IStream_Release(stream); } - - /* free memory */ - GlobalUnlock(hglob); - GlobalFree(hglob); } static void test_empty_image(void) { @@ -670,6 +663,13 @@ static HRESULT WINAPI NoStatStreamImpl_C } static const IStreamVtbl NoStatStreamImpl_Vtbl; +/* + Build an object that implements IStream, without IStream_Stat capabilities. + Receives a memory handle with data buffer. If memory handle is non-null, + it is assumed to be unlocked, otherwise an internal memory handle is allocated. + In any case the object takes ownership of memory handle and will free it on + object release. + */ static NoStatStreamImpl* NoStatStreamImpl_Construct(HGLOBAL hGlobal) { NoStatStreamImpl* newStream; @@ -678,7 +678,7 @@ static NoStatStreamImpl* NoStatStreamImp if (newStream!=0) { newStream->lpVtbl = &NoStatStreamImpl_Vtbl; - newStream->ref = 0; + newStream->ref = 1; newStream->supportHandle = hGlobal; if (!newStream->supportHandle)

1 0

Jacek Caban : itss: Move registration code to inf file and add missing registry.
by Alexandre Julliard 24 Dec '06

24 Dec '06

Module: wine Branch: master Commit: b79fa300adfed75ad9d601cf2578dfbc540d72e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b79fa300adfed75ad9d601cf2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Dec 23 23:50:53 2006 +0100 itss: Move registration code to inf file and add missing registry. --- dlls/itss/Makefile.in | 5 +- dlls/itss/itss.c | 72 +++++++ dlls/itss/itss.inf | 79 +++++++ dlls/itss/regsvr.c | 563 ------------------------------------------------- dlls/itss/rsrc.rc | 19 ++ include/wine/itss.idl | 2 + 6 files changed, 176 insertions(+), 564 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b79fa300adfed75ad9d60…

1 0

Jacek Caban : itss: DllCanUnloadNow code clean up.
by Alexandre Julliard 24 Dec '06

24 Dec '06

Module: wine Branch: master Commit: 162b3350e13a0b861a5a1ae770247fd49cd38e6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=162b3350e13a0b861a5a1ae77… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Dec 23 23:51:55 2006 +0100 itss: DllCanUnloadNow code clean up. --- dlls/itss/itss.c | 12 ++++++------ dlls/itss/itsstor.h | 5 +++++ dlls/itss/moniker.c | 10 ++++------ dlls/itss/storage.c | 17 ++++++++--------- 4 files changed, 23 insertions(+), 21 deletions(-) diff --git a/dlls/itss/itss.c b/dlls/itss/itss.c index 742465d..683b02e 100644 --- a/dlls/itss/itss.c +++ b/dlls/itss/itss.c @@ -93,13 +93,13 @@ ITSSCF_QueryInterface(LPCLASSFACTORY ifa static ULONG WINAPI ITSSCF_AddRef(LPCLASSFACTORY iface) { - InterlockedIncrement(&dll_count); + ITSS_LockModule(); return 2; } static ULONG WINAPI ITSSCF_Release(LPCLASSFACTORY iface) { - InterlockedDecrement(&dll_count); + ITSS_UnlockModule(); return 1; } @@ -127,9 +127,9 @@ static HRESULT WINAPI ITSSCF_LockServer( TRACE("(%p)->(%d)\n", iface, dolock); if (dolock) - InterlockedIncrement(&dll_count); + ITSS_LockModule(); else - InterlockedDecrement(&dll_count); + ITSS_UnlockModule(); return S_OK; } @@ -210,7 +210,7 @@ static ULONG WINAPI ITStorageImpl_Releas if (ref == 0) { HeapFree(GetProcessHeap(), 0, This); - InterlockedDecrement(&dll_count); + ITSS_UnlockModule(); } return ref; @@ -364,8 +364,8 @@ static HRESULT ITSS_create(IUnknown *pUn TRACE("-> %p\n", its); *ppObj = (LPVOID) its; - InterlockedIncrement(&dll_count); + ITSS_LockModule(); return S_OK; } diff --git a/dlls/itss/itsstor.h b/dlls/itss/itsstor.h index af9fec4..736dd88 100644 --- a/dlls/itss/itsstor.h +++ b/dlls/itss/itsstor.h @@ -35,4 +35,9 @@ extern HRESULT ITS_IParseDisplayName_cre IUnknown *pUnkOuter, LPVOID *ppObj); +extern LONG dll_count; +static inline void ITSS_LockModule(void) { InterlockedIncrement(&dll_count); } +static inline void ITSS_UnlockModule(void) { InterlockedDecrement(&dll_count); } + + #endif /* __WINE_ITS_STORAGE_PRIVATE__ */ diff --git a/dlls/itss/moniker.c b/dlls/itss/moniker.c index 1a9401c..5149a14 100644 --- a/dlls/itss/moniker.c +++ b/dlls/itss/moniker.c @@ -44,8 +44,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(itss); -extern LONG dll_count; - /*****************************************************************************/ typedef struct { @@ -91,7 +89,7 @@ static ULONG WINAPI ITS_IMonikerImpl_Rel if (ref == 0) { HeapFree(GetProcessHeap(), 0, This); - InterlockedDecrement(&dll_count); + ITSS_UnlockModule(); } return ref; @@ -369,8 +367,8 @@ static HRESULT ITS_IMoniker_create( IMon TRACE("-> %p %s %s\n", itsmon, debugstr_w(itsmon->szFile), debugstr_w(itsmon->szHtml) ); *ppObj = (IMoniker*) itsmon; - InterlockedIncrement(&dll_count); + ITSS_LockModule(); return S_OK; } @@ -416,7 +414,7 @@ static ULONG WINAPI ITS_IParseDisplayNam if (ref == 0) { HeapFree(GetProcessHeap(), 0, This); - InterlockedDecrement(&dll_count); + ITSS_UnlockModule(); } return ref; @@ -480,7 +478,7 @@ HRESULT ITS_IParseDisplayName_create(IUn TRACE("-> %p\n", its); *ppObj = (LPVOID) its; - InterlockedIncrement(&dll_count); + ITSS_LockModule(); return S_OK; } diff --git a/dlls/itss/storage.c b/dlls/itss/storage.c index 1275808..d2e346c 100644 --- a/dlls/itss/storage.c +++ b/dlls/itss/storage.c @@ -45,8 +45,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(itss); -extern LONG dll_count; - /************************************************************************/ typedef struct _ITSS_IStorageImpl @@ -128,7 +126,7 @@ static ULONG WINAPI ITSS_IEnumSTATSTG_Re This->first = t; } HeapFree(GetProcessHeap(), 0, This); - InterlockedDecrement(&dll_count); + ITSS_UnlockModule(); } return ref; @@ -254,8 +252,8 @@ static IEnumSTATSTG_Impl *ITSS_create_en stgenum->first = NULL; stgenum->last = NULL; stgenum->current = NULL; - InterlockedIncrement(&dll_count); + ITSS_LockModule(); TRACE(" -> %p\n", stgenum ); return stgenum; @@ -299,7 +297,7 @@ static ULONG WINAPI ITSS_IStorageImpl_Re if (ref == 0) { HeapFree(GetProcessHeap(), 0, This); - InterlockedDecrement(&dll_count); + ITSS_UnlockModule(); } return ref; @@ -574,8 +572,8 @@ static HRESULT ITSS_create_chm_storage( strcpyW( stg->dir, dir ); *ppstgOpen = (IStorage*) stg; - InterlockedIncrement(&dll_count); + ITSS_LockModule(); return S_OK; } @@ -638,8 +636,8 @@ static ULONG WINAPI ITSS_IStream_Release if (ref == 0) { IStorage_Release( (IStorage*) This->stg ); - HeapFree(GetProcessHeap(), 0, This); - InterlockedDecrement(&dll_count); + HeapFree(GetProcessHeap(), 0, This); + ITSS_UnlockModule(); } return ref; @@ -825,7 +823,8 @@ static IStream_Impl *ITSS_create_stream( memcpy( &stm->ui, ui, sizeof stm->ui ); stm->stg = stg; IStorage_AddRef( (IStorage*) stg ); - InterlockedIncrement(&dll_count); + + ITSS_LockModule(); TRACE(" -> %p\n", stm );

1 0

Jacek Caban : itss: DllUnregisterServer is not a stub.
by Alexandre Julliard 24 Dec '06

24 Dec '06

Module: wine Branch: master Commit: ab4822ec735449c26993d6a4cedea169704ffaac URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab4822ec735449c26993d6a4c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Dec 23 23:47:42 2006 +0100 itss: DllUnregisterServer is not a stub. --- dlls/itss/itss.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/itss/itss.spec b/dlls/itss/itss.spec index a5e0c57..7437ca8 100644 --- a/dlls/itss/itss.spec +++ b/dlls/itss/itss.spec @@ -3,4 +3,4 @@ @ stub DllInstall @ stdcall -private DllMain(long long ptr) @ stdcall -private DllRegisterServer() -@ stub DllUnregisterServer +@ stdcall -private DllUnregisterServer()

1 0

Jacek Caban : itss: Rename CLSID_ITSProtocol to CLSID_MSITStore.
by Alexandre Julliard 24 Dec '06

24 Dec '06

Module: wine Branch: master Commit: e6fd4d42f09511bda400931c53685260b30d82f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6fd4d42f09511bda400931c5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Dec 23 23:48:57 2006 +0100 itss: Rename CLSID_ITSProtocol to CLSID_MSITStore. ITSProtocol is a different object. --- dlls/itss/itss.c | 6 +++--- dlls/itss/regsvr.c | 2 +- include/wine/itss.idl | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/itss/itss.c b/dlls/itss/itss.c index 1448632..33b1608 100644 --- a/dlls/itss/itss.c +++ b/dlls/itss/itss.c @@ -141,7 +141,7 @@ static const IClassFactoryVtbl ITSSCF_Vt }; static const IClassFactoryImpl ITStorage_factory = { &ITSSCF_Vtbl, ITSS_create }; -static const IClassFactoryImpl ITSProtocol_factory = { &ITSSCF_Vtbl, ITS_IParseDisplayName_create }; +static const IClassFactoryImpl MSITStore_factory = { &ITSSCF_Vtbl, ITS_IParseDisplayName_create }; /*********************************************************************** * DllGetClassObject (ITSS.@) @@ -154,8 +154,8 @@ HRESULT WINAPI DllGetClassObject(REFCLSI if (IsEqualGUID(&CLSID_ITStorage, rclsid)) factory = &ITStorage_factory; - else if (IsEqualGUID(&CLSID_ITSProtocol, rclsid)) - factory = &ITSProtocol_factory; + else if (IsEqualGUID(&CLSID_MSITStore, rclsid)) + factory = &MSITStore_factory; else { FIXME("%s: no class found.\n", debugstr_guid(rclsid)); diff --git a/dlls/itss/regsvr.c b/dlls/itss/regsvr.c index 675af8a..bac6ac1 100644 --- a/dlls/itss/regsvr.c +++ b/dlls/itss/regsvr.c @@ -513,7 +513,7 @@ static struct regsvr_coclass const cocla "itss.dll", "Both" }, - { &CLSID_ITSProtocol, + { &CLSID_MSITStore, "Microsoft InforTech Protocol for IE 3.0", NULL, "itss.dll", diff --git a/include/wine/itss.idl b/include/wine/itss.idl index 8566855..b613b6b 100644 --- a/include/wine/itss.idl +++ b/include/wine/itss.idl @@ -89,5 +89,5 @@ interface IITStorage : IUnknown [in] ECompactionLev iLev); } -cpp_quote("DEFINE_GUID(CLSID_ITStorage,0x5d02926a,0x212e,0x11d0,0x9d,0xf9,0x00,0xa0,0xc9,0x22,0xe6,0xec );") -cpp_quote("DEFINE_GUID(CLSID_ITSProtocol,0x9d148290,0xb9c8,0x11d0,0xa4,0xcc,0x00,0x00,0xf8,0x01,0x49,0xf6);") +cpp_quote("DEFINE_GUID(CLSID_ITStorage,0x5d02926a,0x212e,0x11d0,0x9d,0xf9,0x00,0xa0,0xc9,0x22,0xe6,0xec);") +cpp_quote("DEFINE_GUID(CLSID_MSITStore,0x9d148290,0xb9c8,0x11d0,0xa4,0xcc,0x00,0x00,0xf8,0x01,0x49,0xf6);")

1 0

Hans Leidekker : usp10: Implement ScriptString_pLogAttr.
by Alexandre Julliard 24 Dec '06

24 Dec '06

Module: wine Branch: master Commit: cd6fe7dfa79f2d91bbf07a5000ea509419ceb2b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd6fe7dfa79f2d91bbf07a500… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sat Dec 23 17:19:31 2006 +0100 usp10: Implement ScriptString_pLogAttr. --- dlls/usp10/usp10.c | 27 +++++++++++++++++++++++++++ dlls/usp10/usp10.spec | 2 +- 2 files changed, 28 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 4791677..99b057e 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -165,6 +165,7 @@ typedef struct { SCRIPT_ITEM* pItem; int numItems; StringGlyphs* glyphs; + SCRIPT_LOGATTR* logattrs; SIZE* sz; } StringAnalysis; @@ -589,6 +590,9 @@ HRESULT WINAPI ScriptStringAnalyse(HDC h psState, analysis->pItem, &analysis->numItems); } + if ((analysis->logattrs = HeapAlloc(GetProcessHeap(), 0, sizeof(SCRIPT_LOGATTR) * cString))) + ScriptBreak(pString, cString, (SCRIPT_STRING_ANALYSIS)analysis, analysis->logattrs); + analysis->glyphs = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(StringGlyphs)*analysis->numItems); sc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(SCRIPT_CACHE)); @@ -786,6 +790,7 @@ HRESULT WINAPI ScriptStringFree(SCRIPT_S HeapFree(GetProcessHeap(), 0, analysis->glyphs); HeapFree(GetProcessHeap(), 0, analysis->pItem); + HeapFree(GetProcessHeap(), 0, analysis->logattrs); HeapFree(GetProcessHeap(), 0, analysis->sz); HeapFree(GetProcessHeap(), 0, analysis); @@ -1538,3 +1543,25 @@ const SIZE * WINAPI ScriptString_pSize(S } return analysis->sz; } + +/*********************************************************************** + * ScriptString_pLogAttr (USP10.@) + * + * Retrieve logical attributes of an analysed string. + * + * PARAMS + * ssa [I] string analysis. + * + * RETURNS + * Success: Pointer to an array of SCRIPT_LOGATTR structures. + * Failure: NULL + */ +const SCRIPT_LOGATTR * WINAPI ScriptString_pLogAttr(SCRIPT_STRING_ANALYSIS ssa) +{ + StringAnalysis *analysis = ssa; + + TRACE("(%p)\n", ssa); + + if (!analysis) return NULL; + return analysis->logattrs; +} diff --git a/dlls/usp10/usp10.spec b/dlls/usp10/usp10.spec index 73ea447..83e97ba 100644 --- a/dlls/usp10/usp10.spec +++ b/dlls/usp10/usp10.spec @@ -25,7 +25,7 @@ @ stdcall ScriptStringOut(ptr long long long ptr long long long) @ stdcall ScriptStringValidate(ptr) @ stdcall ScriptStringXtoCP(ptr long ptr ptr) -@ stub ScriptString_pLogAttr +@ stdcall ScriptString_pLogAttr(ptr) @ stdcall ScriptString_pSize(ptr) @ stub ScriptString_pcOutChars @ stdcall ScriptTextOut(ptr ptr long long long ptr ptr ptr long ptr long ptr ptr ptr)

1 0

Rob Shearman : oleaut32: Fix a crash when executing the VarAnd test with an old version of oleaut32 .dll.
by Alexandre Julliard 24 Dec '06

24 Dec '06

Module: wine Branch: master Commit: 029d244ea9acdcd688463fb41888345eaa396a4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=029d244ea9acdcd688463fb41… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sat Dec 23 15:51:41 2006 +0000 oleaut32: Fix a crash when executing the VarAnd test with an old version of oleaut32.dll. --- dlls/oleaut32/tests/vartest.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 58abd26..554c96f 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -5350,9 +5350,9 @@ static void test_VarAnd(void) V_VT(&right) = rightvt | ExtraFlags[i]; V_VT(&result) = VT_EMPTY; resvt = VT_EMPTY; - if (leftvt == VT_BSTR) + if ((leftvt | ExtraFlags[i]) == VT_BSTR) V_BSTR(&left) = true_str; - if (rightvt == VT_BSTR) + if ((rightvt | ExtraFlags[i]) == VT_BSTR) V_BSTR(&right) = true_str; /* Native VarAnd always returns a error when using any extra

1 0

Hans Leidekker : usp10: Implement ScriptString_pSize.
by Alexandre Julliard 24 Dec '06

24 Dec '06

Module: wine Branch: master Commit: 092edd81e653b2be20e65f5d2af8458ec7b01701 URL: http://source.winehq.org/git/wine.git/?a=commit;h=092edd81e653b2be20e65f5d2… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sat Dec 23 11:07:55 2006 +0100 usp10: Implement ScriptString_pSize. --- dlls/usp10/tests/usp10.c | 2 +- dlls/usp10/usp10.c | 50 +++++++++++++++++++++++++++++++++++++++++++++- dlls/usp10/usp10.spec | 2 +- include/usp10.h | 2 +- 4 files changed, 52 insertions(+), 4 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index b291301..d637aeb 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -897,7 +897,7 @@ static void test_ScriptCacheGetHeight(HD { HRESULT hr; SCRIPT_CACHE sc = NULL; - long height; + LONG height; hr = ScriptCacheGetHeight(NULL, NULL, NULL); ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got 0x%08x\n", hr); diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 448153f..85fc82d 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -703,6 +703,7 @@ HRESULT WINAPI ScriptStringFree(SCRIPT_S HeapFree(GetProcessHeap(), 0, analysis->glyphs); HeapFree(GetProcessHeap(), 0, analysis->pItem); + HeapFree(GetProcessHeap(), 0, analysis->sz); HeapFree(GetProcessHeap(), 0, analysis); if(invalid) @@ -1248,7 +1249,7 @@ HRESULT WINAPI ScriptTextOut(const HDC h * Success: S_OK * Failure: Non-zero HRESULT value. */ -HRESULT WINAPI ScriptCacheGetHeight(HDC hdc, SCRIPT_CACHE *psc, long *height) +HRESULT WINAPI ScriptCacheGetHeight(HDC hdc, SCRIPT_CACHE *psc, LONG *height) { HDC phdc; Scriptcache *pScriptcache; @@ -1388,3 +1389,50 @@ HRESULT WINAPI ScriptStringValidate(SCRI FIXME("(%p): stub\n", ssa); return S_OK; } + +/*********************************************************************** + * ScriptString_pSize (USP10.@) + * + * Retrieve width and height of an analysed string. + * + * PARAMS + * ssa [I] string analysis. + * + * RETURNS + * Success: Pointer to a SIZE structure. + * Failure: NULL + */ +const SIZE * WINAPI ScriptString_pSize(SCRIPT_STRING_ANALYSIS ssa) +{ + unsigned int i, j; + StringAnalysis *analysis = ssa; + TEXTMETRICW metric; + + TRACE("(%p)\n", ssa); + + if (!analysis) return NULL; + + if (!analysis->sz) + { + if (!(analysis->sz = HeapAlloc(GetProcessHeap(), 0, 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->hdc, &metric)) + { + HeapFree(GetProcessHeap(), 0, analysis->sz); + analysis->sz = NULL; + return NULL; + } + analysis->sz->cy = metric.tmHeight; + + analysis->sz->cx = 0; + for (i = 0; i < analysis->numItems; i++) + for (j = 0; j < analysis->glyphs[i].numGlyphs; j++) + analysis->sz->cx += analysis->glyphs[i].piAdvance[j]; + } + return analysis->sz; +} diff --git a/dlls/usp10/usp10.spec b/dlls/usp10/usp10.spec index 56fd85b..73ea447 100644 --- a/dlls/usp10/usp10.spec +++ b/dlls/usp10/usp10.spec @@ -26,7 +26,7 @@ @ stdcall ScriptStringValidate(ptr) @ stdcall ScriptStringXtoCP(ptr long ptr ptr) @ stub ScriptString_pLogAttr -@ stub ScriptString_pSize +@ stdcall ScriptString_pSize(ptr) @ stub ScriptString_pcOutChars @ stdcall ScriptTextOut(ptr ptr long long long ptr ptr ptr long ptr long ptr ptr ptr) @ stdcall ScriptXtoCP(long long long ptr ptr ptr ptr ptr ptr) diff --git a/include/usp10.h b/include/usp10.h index 9b997c4..6dc7584 100644 --- a/include/usp10.h +++ b/include/usp10.h @@ -245,7 +245,7 @@ HRESULT WINAPI ScriptShape(HDC hdc, SCRI HRESULT WINAPI ScriptPlace(HDC hdc, SCRIPT_CACHE *psc, const WORD *pwGlyphs, int cGlyphs, const SCRIPT_VISATTR *psva, SCRIPT_ANALYSIS *psa, int *piAdvance, GOFFSET *pGoffset, ABC *pABC ); HRESULT WINAPI ScriptBreak(const WCHAR *pwcChars, int cChars, const SCRIPT_ANALYSIS *psa, SCRIPT_LOGATTR *psla); -HRESULT WINAPI ScriptCacheGetHeight(HDC hdc, SCRIPT_CACHE *psc, long *tmHeight); +HRESULT WINAPI ScriptCacheGetHeight(HDC hdc, SCRIPT_CACHE *psc, LONG *tmHeight); HRESULT WINAPI ScriptCPtoX(int iCP, BOOL fTrailing, int cChars, int cGlyphs, const WORD *pwLogClust, const SCRIPT_VISATTR *psva, const int *piAdvance, const SCRIPT_ANALYSIS *psa, int *piX); HRESULT WINAPI ScriptXtoCP(int iX, int cChars, int cGlyphs, const WORD *pwLogClust, const SCRIPT_VISATTR *psva,

1 0