July 2012 - Wine-commits - list.winehq.org

Dmitry Timoshkov : windowscodecs: Test pixel format of the loaded TIFF image.
by Alexandre Julliard 13 Jul '12

13 Jul '12

Module: wine Branch: master Commit: 6d1a13a7d655e4cfec54fe49a038517d2686d7da URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d1a13a7d655e4cfec54fe49a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jul 13 11:47:07 2012 +0900 windowscodecs: Test pixel format of the loaded TIFF image. --- dlls/windowscodecs/tests/tiffformat.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/tests/tiffformat.c b/dlls/windowscodecs/tests/tiffformat.c index fb57b91..0874053 100644 --- a/dlls/windowscodecs/tests/tiffformat.c +++ b/dlls/windowscodecs/tests/tiffformat.c @@ -17,6 +17,7 @@ */ #include <stdarg.h> +#include <stdio.h> #define COBJMACROS @@ -93,6 +94,18 @@ static const struct tiff_1bpp_data }; #include "poppack.h" +static const char *debugstr_guid(const GUID *guid) +{ + static char buf[50]; + + if (!guid) return "(null)"; + sprintf(buf, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", + guid->Data1, guid->Data2, guid->Data3, guid->Data4[0], + guid->Data4[1], guid->Data4[2], guid->Data4[3], guid->Data4[4], + guid->Data4[5], guid->Data4[6], guid->Data4[7]); + return buf; +} + static IWICBitmapDecoder *create_decoder(IWICImagingFactory *factory, const void *image_data, UINT image_size) { @@ -130,6 +143,7 @@ static void test_tiff_palette(void) IWICBitmapDecoder *decoder; IWICBitmapFrameDecode *frame; IWICPalette *palette; + GUID format; hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, &IID_IWICImagingFactory, (void **)&factory); @@ -141,6 +155,11 @@ static void test_tiff_palette(void) hr = IWICBitmapDecoder_GetFrame(decoder, 0, &frame); ok(hr == S_OK, "GetFrame error %#x\n", hr); + hr = IWICBitmapFrameDecode_GetPixelFormat(frame, &format); + ok(hr == S_OK, "GetPixelFormat error %#x\n", hr); + ok(IsEqualGUID(&format, &GUID_WICPixelFormatBlackWhite), + "got wrong format %s\n", debugstr_guid(&format)); + hr = IWICImagingFactory_CreatePalette(factory, &palette); ok(hr == S_OK, "CreatePalette error %#x\n", hr); hr = IWICBitmapFrameDecode_CopyPalette(frame, palette);

1 0

Hans Leidekker : wbemprox: Implement Win32_NetworkAdapter. MACAddress and Win32_NetworkAdapter.PNPDeviceID.
by Alexandre Julliard 13 Jul '12

13 Jul '12

Module: wine Branch: master Commit: 5acdba54a0534a41ec8267bb4d4bb8d1dfb551f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5acdba54a0534a41ec8267bb4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 13 11:34:17 2012 +0200 wbemprox: Implement Win32_NetworkAdapter.MACAddress and Win32_NetworkAdapter.PNPDeviceID. --- dlls/wbemprox/builtin.c | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 53f9c6d..7993d6e 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -88,6 +88,8 @@ static const WCHAR prop_handleW[] = {'H','a','n','d','l','e',0}; static const WCHAR prop_interfaceindexW[] = {'I','n','t','e','r','f','a','c','e','I','n','d','e','x',0}; +static const WCHAR prop_macaddressW[] = + {'M','A','C','A','d','d','r','e','s','s',0}; static const WCHAR prop_manufacturerW[] = {'M','a','n','u','f','a','c','t','u','r','e','r',0}; static const WCHAR prop_modelW[] = @@ -104,6 +106,8 @@ static const WCHAR prop_osarchitectureW[] = {'O','S','A','r','c','h','i','t','e','c','t','u','r','e',0}; static const WCHAR prop_oslanguageW[] = {'O','S','L','a','n','g','u','a','g','e',0}; +static const WCHAR prop_pnpdeviceidW[] = + {'P','N','P','D','e','v','i','c','e','I','D',0}; static const WCHAR prop_pprocessidW[] = {'P','a','r','e','n','t','P','r','o','c','e','s','s','I','D',0}; static const WCHAR prop_processidW[] = @@ -162,7 +166,9 @@ static const struct column col_networkadapter[] = { { prop_deviceidW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, { prop_interfaceindexW, CIM_UINT32, VT_I4 }, + { prop_macaddressW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_netconnectionstatusW, CIM_UINT16, VT_I4 }, + { prop_pnpdeviceidW, CIM_STRING }, { prop_speedW, CIM_UINT64 } }; static const struct column col_os[] = @@ -221,6 +227,10 @@ static const WCHAR compsys_manufacturerW[] = {'T','h','e',' ','W','i','n','e',' ','P','r','o','j','e','c','t',0}; static const WCHAR compsys_modelW[] = {'W','i','n','e',0}; +static const WCHAR networkadapter_pnpdeviceidW[]= + {'P','C','I','\\','V','E','N','_','8','0','8','6','&','D','E','V','_','1','0','0','E','&', + 'S','U','B','S','Y','S','_','0','0','1','E','8','0','8','6','&','R','E','V','_','0','2','\\', + '3','&','2','6','7','A','6','1','6','A','&','1','&','1','8',0}; static const WCHAR os_captionW[] = {'M','i','c','r','o','s','o','f','t',' ','W','i','n','d','o','w','s',' ','X','P',' ', 'V','e','r','s','i','o','n',' ','=',' ','5','.','1','.','2','6','0','0',0}; @@ -268,7 +278,9 @@ struct record_networkadapter { const WCHAR *device_id; INT32 interface_index; + const WCHAR *mac_address; UINT16 netconnection_status; + const WCHAR *pnpdevice_id; UINT64 speed; }; struct record_operatingsystem @@ -439,6 +451,17 @@ static UINT16 get_connection_status( IF_OPER_STATUS status ) } return 0; } +static WCHAR *get_mac_address( const BYTE *addr, DWORD len ) +{ + static const WCHAR fmtW[] = + {'%','0','2','x',':','%','0','2','x',':','%','0','2','x',':', + '%','0','2','x',':','%','0','2','x',':','%','0','2','x',0}; + WCHAR *ret; + + if (len != 6 || !(ret = heap_alloc( 18 * sizeof(WCHAR) ))) return NULL; + sprintfW( ret, fmtW, addr[0], addr[1], addr[2], addr[3], addr[4], addr[5] ); + return ret; +} static void fill_networkadapter( struct table *table ) { @@ -470,7 +493,9 @@ static void fill_networkadapter( struct table *table ) sprintfW( device_id, fmtW, aa->u.s.IfIndex ); rec->device_id = heap_strdupW( device_id ); rec->interface_index = aa->u.s.IfIndex; + rec->mac_address = get_mac_address( aa->PhysicalAddress, aa->PhysicalAddressLength ); rec->netconnection_status = get_connection_status( aa->OperStatus ); + rec->pnpdevice_id = networkadapter_pnpdeviceidW; rec->speed = 1000000; offset += sizeof(*rec); }

1 0

Hans Leidekker : wbemprox: Return a null variant instead of an empty string if the property isn't set .
by Alexandre Julliard 13 Jul '12

13 Jul '12

Module: wine Branch: master Commit: cd5cad6959abe025e836091cfd4f22c101529ef2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd5cad6959abe025e836091cf… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 13 11:34:42 2012 +0200 wbemprox: Return a null variant instead of an empty string if the property isn't set. --- dlls/wbemprox/query.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 1d2eca7..77a3bf3 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -728,6 +728,9 @@ static void set_variant( VARTYPE vartype, LONGLONG val, BSTR val_bstr, VARIANT * V_VT( ret ) = VT_UI4; V_UI4( ret ) = val; return; + case VT_NULL: + V_VT( ret ) = VT_NULL; + return; default: ERR("unhandled variant type %u\n", vartype); return; @@ -758,8 +761,13 @@ HRESULT get_propval( const struct view *view, UINT index, const WCHAR *name, VAR { case CIM_STRING: case CIM_DATETIME: - vartype = VT_BSTR; - val_bstr = SysAllocString( (const WCHAR *)(INT_PTR)val ); + if (val) + { + vartype = VT_BSTR; + val_bstr = SysAllocString( (const WCHAR *)(INT_PTR)val ); + } + else + vartype = VT_NULL; break; case CIM_SINT16: if (!vartype) vartype = VT_I2;

1 0

Hans Leidekker : wbemprox: Add a partial StdRegProv class implementation.
by Alexandre Julliard 13 Jul '12

13 Jul '12

Module: wine Branch: master Commit: 4e6eb13c41f46fb4c6208dad1a1e13ac6b77fac2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e6eb13c41f46fb4c6208dad1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 13 11:35:09 2012 +0200 wbemprox: Add a partial StdRegProv class implementation. --- dlls/wbemprox/builtin.c | 96 ++++++++++++++++++++++++++++++++++++-- dlls/wbemprox/query.c | 29 +++++++++-- dlls/wbemprox/wbemprox_private.h | 3 + 3 files changed, 119 insertions(+), 9 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4e6eb13c41f46fb4c6208…

1 0

Hans Leidekker : wbemprox: Add support for creating new tables.
by Alexandre Julliard 13 Jul '12

13 Jul '12

Module: wine Branch: master Commit: 91049f5e753ae09ab569023e64a95e33901af2e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91049f5e753ae09ab569023e6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 13 11:35:39 2012 +0200 wbemprox: Add support for creating new tables. --- dlls/wbemprox/Makefile.in | 1 + dlls/wbemprox/builtin.c | 17 +-- dlls/wbemprox/main.c | 1 + dlls/wbemprox/query.c | 176 +------------------------ dlls/wbemprox/table.c | 280 ++++++++++++++++++++++++++++++++++++++ dlls/wbemprox/wbemprox_private.h | 14 ++ 6 files changed, 303 insertions(+), 186 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=91049f5e753ae09ab5690…

1 0

Nikolay Sivov : ole32: COM cleanup of storage IStream implementation.
by Alexandre Julliard 13 Jul '12

13 Jul '12

Module: wine Branch: master Commit: ea196ef0eb8994530929ea56576e2e67eaf934dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea196ef0eb8994530929ea565… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jul 13 09:45:37 2012 +0400 ole32: COM cleanup of storage IStream implementation. --- dlls/ole32/stg_stream.c | 58 +++++++++++++++------------------------------- dlls/ole32/storage32.c | 23 ++++++++++++------ dlls/ole32/storage32.h | 17 ++++++------- 3 files changed, 42 insertions(+), 56 deletions(-) diff --git a/dlls/ole32/stg_stream.c b/dlls/ole32/stg_stream.c index b09ba5b..019a789 100644 --- a/dlls/ole32/stg_stream.c +++ b/dlls/ole32/stg_stream.c @@ -74,9 +74,6 @@ static void StgStreamImpl_Destroy(StgStreamImpl* This) This->parentStorage = 0; - /* - * Finally, free the memory used-up by the class. - */ HeapFree(GetProcessHeap(), 0, This); } @@ -89,41 +86,24 @@ static HRESULT WINAPI StgStreamImpl_QueryInterface( REFIID riid, /* [in] */ void** ppvObject) /* [iid_is][out] */ { - StgStreamImpl* const This=(StgStreamImpl*)iface; + StgStreamImpl* This = impl_from_IStream(iface); - /* - * Perform a sanity check on the parameters. - */ if (ppvObject==0) return E_INVALIDARG; - /* - * Initialize the return parameter. - */ *ppvObject = 0; - /* - * Compare the riid with the interface IDs implemented by this object. - */ if (IsEqualIID(&IID_IUnknown, riid) || IsEqualIID(&IID_IPersist, riid) || IsEqualIID(&IID_IPersistStream, riid) || IsEqualIID(&IID_ISequentialStream, riid) || IsEqualIID(&IID_IStream, riid)) { - *ppvObject = This; + *ppvObject = &This->IStream_iface; } - - /* - * Check that we obtained an interface. - */ - if ((*ppvObject)==0) + else return E_NOINTERFACE; - /* - * Query Interface always increases the reference count by one when it is - * successful - */ IStream_AddRef(iface); return S_OK; @@ -136,7 +116,7 @@ static HRESULT WINAPI StgStreamImpl_QueryInterface( static ULONG WINAPI StgStreamImpl_AddRef( IStream* iface) { - StgStreamImpl* const This=(StgStreamImpl*)iface; + StgStreamImpl* This = impl_from_IStream(iface); return InterlockedIncrement(&This->ref); } @@ -147,7 +127,7 @@ static ULONG WINAPI StgStreamImpl_AddRef( static ULONG WINAPI StgStreamImpl_Release( IStream* iface) { - StgStreamImpl* const This=(StgStreamImpl*)iface; + StgStreamImpl* This = impl_from_IStream(iface); ULONG ref; @@ -179,7 +159,7 @@ static HRESULT WINAPI StgStreamImpl_Read( ULONG cb, /* [in] */ ULONG* pcbRead) /* [out] */ { - StgStreamImpl* const This=(StgStreamImpl*)iface; + StgStreamImpl* This = impl_from_IStream(iface); ULONG bytesReadBuffer; HRESULT res; @@ -235,7 +215,7 @@ static HRESULT WINAPI StgStreamImpl_Write( ULONG cb, /* [in] */ ULONG* pcbWritten) /* [out] */ { - StgStreamImpl* const This=(StgStreamImpl*)iface; + StgStreamImpl* This = impl_from_IStream(iface); ULONG bytesWritten = 0; HRESULT res; @@ -316,7 +296,7 @@ static HRESULT WINAPI StgStreamImpl_Seek( DWORD dwOrigin, /* [in] */ ULARGE_INTEGER* plibNewPosition) /* [out] */ { - StgStreamImpl* const This=(StgStreamImpl*)iface; + StgStreamImpl* This = impl_from_IStream(iface); ULARGE_INTEGER newPosition; DirEntry currentEntry; @@ -389,7 +369,7 @@ static HRESULT WINAPI StgStreamImpl_SetSize( IStream* iface, ULARGE_INTEGER libNewSize) /* [in] */ { - StgStreamImpl* const This=(StgStreamImpl*)iface; + StgStreamImpl* This = impl_from_IStream(iface); HRESULT hr; @@ -441,7 +421,7 @@ static HRESULT WINAPI StgStreamImpl_CopyTo( ULARGE_INTEGER* pcbRead, /* [out] */ ULARGE_INTEGER* pcbWritten) /* [out] */ { - StgStreamImpl* const This=(StgStreamImpl*)iface; + StgStreamImpl* This = impl_from_IStream(iface); HRESULT hr = S_OK; BYTE tmpBuffer[128]; ULONG bytesRead, bytesWritten, copySize; @@ -516,7 +496,7 @@ static HRESULT WINAPI StgStreamImpl_Commit( IStream* iface, DWORD grfCommitFlags) /* [in] */ { - StgStreamImpl* const This=(StgStreamImpl*)iface; + StgStreamImpl* This = impl_from_IStream(iface); if (!This->parentStorage) { @@ -547,7 +527,7 @@ static HRESULT WINAPI StgStreamImpl_LockRegion( ULARGE_INTEGER cb, /* [in] */ DWORD dwLockType) /* [in] */ { - StgStreamImpl* const This=(StgStreamImpl*)iface; + StgStreamImpl* This = impl_from_IStream(iface); if (!This->parentStorage) { @@ -565,7 +545,7 @@ static HRESULT WINAPI StgStreamImpl_UnlockRegion( ULARGE_INTEGER cb, /* [in] */ DWORD dwLockType) /* [in] */ { - StgStreamImpl* const This=(StgStreamImpl*)iface; + StgStreamImpl* This = impl_from_IStream(iface); if (!This->parentStorage) { @@ -590,7 +570,7 @@ static HRESULT WINAPI StgStreamImpl_Stat( STATSTG* pstatstg, /* [out] */ DWORD grfStatFlag) /* [in] */ { - StgStreamImpl* const This=(StgStreamImpl*)iface; + StgStreamImpl* This = impl_from_IStream(iface); DirEntry currentEntry; HRESULT hr; @@ -650,7 +630,7 @@ static HRESULT WINAPI StgStreamImpl_Clone( IStream* iface, IStream** ppstm) /* [out] */ { - StgStreamImpl* const This=(StgStreamImpl*)iface; + StgStreamImpl* This = impl_from_IStream(iface); HRESULT hres; StgStreamImpl* new_stream; LARGE_INTEGER seek_pos; @@ -672,7 +652,7 @@ static HRESULT WINAPI StgStreamImpl_Clone( if (!new_stream) return STG_E_INSUFFICIENTMEMORY; /* Currently the only reason for new_stream=0 */ - *ppstm = (IStream*) new_stream; + *ppstm = &new_stream->IStream_iface; IStream_AddRef(*ppstm); seek_pos.QuadPart = This->currentPosition.QuadPart; @@ -687,7 +667,7 @@ static HRESULT WINAPI StgStreamImpl_Clone( /* * Virtual function table for the StgStreamImpl class. */ -static const IStreamVtbl StgStreamImpl_Vtbl = +static const IStreamVtbl StgStreamVtbl = { StgStreamImpl_QueryInterface, StgStreamImpl_AddRef, @@ -725,12 +705,12 @@ StgStreamImpl* StgStreamImpl_Construct( newStream = HeapAlloc(GetProcessHeap(), 0, sizeof(StgStreamImpl)); - if (newStream!=0) + if (newStream) { /* * Set-up the virtual function table and reference count. */ - newStream->lpVtbl = &StgStreamImpl_Vtbl; + newStream->IStream_iface.lpVtbl = &StgStreamVtbl; newStream->ref = 0; newStream->parentStorage = parentStorage; diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index f233b61..95850d1 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -524,10 +524,10 @@ static HRESULT WINAPI StorageBaseImpl_OpenStream( newStream = StgStreamImpl_Construct(This, grfMode, streamEntryRef); - if (newStream!=0) + if (newStream) { newStream->grfMode = grfMode; - *ppstm = (IStream*)newStream; + *ppstm = &newStream->IStream_iface; IStream_AddRef(*ppstm); @@ -1007,10 +1007,9 @@ static HRESULT WINAPI StorageBaseImpl_CreateStream( */ newStream = StgStreamImpl_Construct(This, grfMode, newStreamEntryRef); - if (newStream != 0) + if (newStream) { - *ppstm = (IStream*)newStream; - + *ppstm = &newStream->IStream_iface; IStream_AddRef(*ppstm); } else @@ -1684,11 +1683,19 @@ static HRESULT StorageBaseImpl_CopyChildEntryTo(StorageBaseImpl *This, */ if (hr == S_OK) { - pstrChild = (IStream*)StgStreamImpl_Construct(This, STGM_READ|STGM_SHARE_EXCLUSIVE, srcEntry); - if (pstrChild) - IStream_AddRef(pstrChild); + StgStreamImpl *streamimpl = StgStreamImpl_Construct(This, STGM_READ|STGM_SHARE_EXCLUSIVE, srcEntry); + + if (streamimpl) + { + pstrChild = &streamimpl->IStream_iface; + if (pstrChild) + IStream_AddRef(pstrChild); + } else + { + pstrChild = NULL; hr = E_OUTOFMEMORY; + } } if (hr == S_OK) diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index 938bf7b..1e512ef 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -418,26 +418,20 @@ SmallBlockChainStream* Storage32Impl_BigBlocksToSmallBlocks( /**************************************************************************** * StgStreamImpl definitions. * - * This class implements the IStream32 interface and represents a stream + * This class implements the IStream interface and represents a stream * located inside a storage object. */ struct StgStreamImpl { - const IStreamVtbl *lpVtbl; /* Needs to be the first item in the struct - * since we want to cast this to an IStream pointer */ + IStream IStream_iface; + LONG ref; /* * We are an entry in the storage object's stream handler list */ - struct list StrmListEntry; /* - * Reference count - */ - LONG ref; - - /* * Storage that is the parent(owner) of the stream */ StorageBaseImpl* parentStorage; @@ -458,6 +452,11 @@ struct StgStreamImpl ULARGE_INTEGER currentPosition; }; +static inline StgStreamImpl *impl_from_IStream( IStream *iface ) +{ + return CONTAINING_RECORD(iface, StgStreamImpl, IStream_iface); +} + /* * Method definition for the StgStreamImpl class. */

1 0

Nikolay Sivov : ole32: Implement GetConvertStg().
by Alexandre Julliard 13 Jul '12

13 Jul '12

Module: wine Branch: master Commit: 7b373edb81306fa82385fde5501df69166d3d406 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b373edb81306fa82385fde55… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jul 13 11:56:26 2012 +0400 ole32: Implement GetConvertStg(). --- dlls/ole32/storage32.c | 36 +++++++++++++++++++++++++++++++++--- dlls/ole32/tests/storage32.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 95850d1..47341f7 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -9400,12 +9400,42 @@ HRESULT WINAPI OleConvertIStorageToOLESTREAM ( return hRes; } +enum stream_1ole_flags { + OleStream_LinkedObject = 0x00000001, + OleStream_Convert = 0x00000100 +}; + /*********************************************************************** * GetConvertStg (OLE32.@) */ -HRESULT WINAPI GetConvertStg(IStorage *stg) { - FIXME("unimplemented stub!\n"); - return E_FAIL; +HRESULT WINAPI GetConvertStg(IStorage *stg) +{ + static const WCHAR stream_1oleW[] = {1,'O','l','e',0}; + static const DWORD version_magic = 0x02000001; + DWORD header[2]; + IStream *stream; + HRESULT hr; + ULONG len; + + TRACE("%p\n", stg); + + if (!stg) return E_INVALIDARG; + + hr = IStorage_OpenStream(stg, stream_1oleW, NULL, STGM_READ | STGM_SHARE_EXCLUSIVE, 0, &stream); + if (FAILED(hr)) return hr; + + len = 0; + hr = IStream_Read(stream, header, sizeof(header), &len); + IStream_Release(stream); + if (FAILED(hr)) return hr; + + if (header[0] != version_magic) + { + ERR("got wrong version magic for \1Ole stream, 0x%08x\n", header[0]); + return E_FAIL; + } + + return header[1] & OleStream_Convert ? S_OK : S_FALSE; } /****************************************************************************** diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index bc0cc25..86b8d8e 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -2995,6 +2995,34 @@ static void test_hglobal_storage_creation(void) ILockBytes_Release(ilb); } +static void test_convert(void) +{ + static const WCHAR filename[] = {'s','t','o','r','a','g','e','.','s','t','g',0}; + IStorage *stg; + HRESULT hr; + + hr = GetConvertStg(NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = StgCreateDocfile( filename, STGM_CREATE | STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, &stg); + ok(hr == S_OK, "StgCreateDocfile failed\n"); + hr = GetConvertStg(stg); + ok(hr == STG_E_FILENOTFOUND, "got 0x%08x\n", hr); + hr = SetConvertStg(stg, TRUE); +todo_wine { + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = GetConvertStg(stg); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = SetConvertStg(stg, FALSE); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = GetConvertStg(stg); + ok(hr == S_FALSE, "got 0x%08x\n", hr); +} + IStorage_Release(stg); + + DeleteFileW(filename); +} + START_TEST(storage32) { CHAR temp[MAX_PATH]; @@ -3038,4 +3066,5 @@ START_TEST(storage32) test_copyto_locking(); test_copyto_recursive(); test_hglobal_storage_creation(); + test_convert(); }

1 0

Dmitry Timoshkov : windowscodecs: Add support for generating WICBitmapPaletteTypeFixedHalftone256 palette.
by Alexandre Julliard 13 Jul '12

13 Jul '12

Module: wine Branch: master Commit: 45f240c0cbefee748ea8380357649abddf8d03f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45f240c0cbefee748ea838035… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jul 12 16:14:11 2012 +0900 windowscodecs: Add support for generating WICBitmapPaletteTypeFixedHalftone256 palette. --- dlls/windowscodecs/palette.c | 26 ++++++++++++++++++++++++++ dlls/windowscodecs/tests/palette.c | 20 ++++++++++++++++++++ 2 files changed, 46 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/palette.c b/dlls/windowscodecs/palette.c index a024cd1..4541c7c 100644 --- a/dlls/windowscodecs/palette.c +++ b/dlls/windowscodecs/palette.c @@ -188,6 +188,27 @@ static WICColor *generate_halftone64_palette(UINT *count) return entries; } +static WICColor *generate_halftone256_palette(UINT *count) +{ + WICColor *entries; + UINT i; + + *count = 256; + entries = HeapAlloc(GetProcessHeap(), 0, 256 * sizeof(WICColor)); + if (!entries) return NULL; + + for (i = 0; i < 256; i++) + { + static const BYTE halftone_values_b[4] = { 0x00,0x55,0xaa,0xff }; + static const BYTE halftone_values_gr[8] = { 0x00,0x24,0x49,0x6d,0x92,0xb6,0xdb,0xff }; + entries[i] = 0xff000000; + entries[i] |= halftone_values_b[i%4]; + entries[i] |= halftone_values_gr[(i/4)%8] << 8; + entries[i] |= halftone_values_gr[(i/32)%8] << 16; + } + return entries; +} + static HRESULT WINAPI PaletteImpl_InitializePredefined(IWICPalette *iface, WICBitmapPaletteType type, BOOL add_transparent) { @@ -237,6 +258,11 @@ static HRESULT WINAPI PaletteImpl_InitializePredefined(IWICPalette *iface, if (!colors) return E_OUTOFMEMORY; break; + case WICBitmapPaletteTypeFixedHalftone256: + colors = generate_halftone256_palette(&count); + if (!colors) return E_OUTOFMEMORY; + break; + default: FIXME("(%p,%u,%d): stub\n", iface, type, add_transparent); return E_NOTIMPL; diff --git a/dlls/windowscodecs/tests/palette.c b/dlls/windowscodecs/tests/palette.c index e97ffc6..8e320c5 100644 --- a/dlls/windowscodecs/tests/palette.c +++ b/dlls/windowscodecs/tests/palette.c @@ -223,6 +223,23 @@ static void generate_halftone64_palette(DWORD *entries, UINT count) } } +static void generate_halftone256_palette(DWORD *entries, UINT count) +{ + static const BYTE halftone_values_b[4] = { 0x00,0x55,0xaa,0xff }; + static const BYTE halftone_values_gr[8] = { 0x00,0x24,0x49,0x6d,0x92,0xb6,0xdb,0xff }; + UINT i; + + assert(count == 256); + + for (i = 0; i < 256; i++) + { + entries[i] = 0xff000000; + entries[i] |= halftone_values_b[i%4]; + entries[i] |= halftone_values_gr[(i/4)%8] << 8; + entries[i] |= halftone_values_gr[(i/32)%8] << 16; + } +} + static void test_predefined_palette(void) { static struct test_data @@ -240,6 +257,7 @@ static void test_predefined_palette(void) { WICBitmapPaletteTypeFixedGray256, 0, 1, 256, { 0 } }, { WICBitmapPaletteTypeFixedHalftone8, 0, 0, 16, { 0 } }, { WICBitmapPaletteTypeFixedHalftone64, 0, 0, 72, { 0 } }, + { WICBitmapPaletteTypeFixedHalftone256, 0, 0, 256, { 0 } }, }; IWICImagingFactory *factory; IWICPalette *palette; @@ -298,6 +316,8 @@ static void test_predefined_palette(void) generate_halftone8_palette(td[i].color, td[i].count); else if (td[i].type == WICBitmapPaletteTypeFixedHalftone64) generate_halftone64_palette(td[i].color, td[i].count); + else if (td[i].type == WICBitmapPaletteTypeFixedHalftone256) + generate_halftone256_palette(td[i].color, td[i].count); for (j = 0; j < count; j++) {

1 0

Alistair Leslie-Hughes : scrrun: Add typelib support.
by Alexandre Julliard 13 Jul '12

13 Jul '12

Module: wine Branch: master Commit: 6c5588f95d2e27aa14a1cc15d4fdfda012a4bd2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c5588f95d2e27aa14a1cc15d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jun 15 15:17:42 2012 +1000 scrrun: Add typelib support. --- dlls/scrrun/Makefile.in | 2 +- dlls/scrrun/filesystem.c | 39 ++++++++++++++++++------ dlls/scrrun/scrrun.c | 68 ++++++++++++++++++++++++++++++++++++++++- dlls/scrrun/scrrun_private.h | 32 +++++++++++++++++++ 4 files changed, 128 insertions(+), 13 deletions(-) diff --git a/dlls/scrrun/Makefile.in b/dlls/scrrun/Makefile.in index d2ceb87..f6dcf62 100644 --- a/dlls/scrrun/Makefile.in +++ b/dlls/scrrun/Makefile.in @@ -1,5 +1,5 @@ MODULE = scrrun.dll -IMPORTS = uuid +IMPORTS = uuid oleaut32 C_SRCS = \ filesystem.c \ diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index a14d926..cd397a4 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -26,6 +26,7 @@ #include "ole2.h" #include "dispex.h" #include "scrrun.h" +#include "scrrun_private.h" #include "wine/debug.h" @@ -90,19 +91,26 @@ static HRESULT WINAPI filesys_GetTypeInfoCount(IFileSystem3 *iface, UINT *pctinf static HRESULT WINAPI filesys_GetTypeInfo(IFileSystem3 *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { - FIXME("(%p)->(%u %u %p)\n", iface, iTInfo, lcid, ppTInfo); - - return E_NOTIMPL; -} + TRACE("(%p)->(%u %u %p)\n", iface, iTInfo, lcid, ppTInfo); + return get_typeinfo(IFileSystem3_tid, ppTInfo);} static HRESULT WINAPI filesys_GetIDsOfNames(IFileSystem3 *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { - FIXME("(%p)->(%s %p %u %u %p)\n", iface, debugstr_guid(riid), rgszNames, cNames, - lcid, rgDispId); + ITypeInfo *typeinfo; + HRESULT hr; - return E_NOTIMPL; + TRACE("(%p)->(%s %p %u %u %p)\n", iface, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + + hr = get_typeinfo(IFileSystem3_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, rgszNames, cNames, rgDispId); + ITypeInfo_Release(typeinfo); + } + + return hr; } static HRESULT WINAPI filesys_Invoke(IFileSystem3 *iface, DISPID dispIdMember, @@ -110,10 +118,21 @@ static HRESULT WINAPI filesys_Invoke(IFileSystem3 *iface, DISPID dispIdMember, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { - FIXME("(%p)->(%d %s %d %d %p %p %p %p)\n", iface, dispIdMember, debugstr_guid(riid), - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + ITypeInfo *typeinfo; + HRESULT hr; - return E_NOTIMPL; + TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", iface, dispIdMember, debugstr_guid(riid), + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + + hr = get_typeinfo(IFileSystem3_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke(typeinfo, &iface, dispIdMember, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); + ITypeInfo_Release(typeinfo); + } + + return hr; } static HRESULT WINAPI filesys_get_Drives(IFileSystem3 *iface, IDriveCollection **ppdrives) diff --git a/dlls/scrrun/scrrun.c b/dlls/scrrun/scrrun.c index d1e2de2..d5ea369 100644 --- a/dlls/scrrun/scrrun.c +++ b/dlls/scrrun/scrrun.c @@ -27,6 +27,7 @@ #include <initguid.h> #include "scrrun.h" +#include "scrrun_private.h" #include "wine/debug.h" @@ -36,8 +37,6 @@ static HINSTANCE scrrun_instance; typedef HRESULT (*fnCreateInstance)(LPVOID *ppObj); -extern HRESULT WINAPI FileSystem_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; - static HRESULT WINAPI scrruncf_QueryInterface(IClassFactory *iface, REFIID riid, LPVOID *ppv ) { *ppv = NULL; @@ -88,6 +87,70 @@ static const struct IClassFactoryVtbl scrruncf_vtbl = static IClassFactory FileSystemFactory = { &scrruncf_vtbl }; +static ITypeLib *typelib; +static ITypeInfo *typeinfos[LAST_tid]; + +static REFIID tid_ids[] = { + &IID_NULL, + &IID_IFileSystem3, +}; + +static HRESULT load_typelib(void) +{ + HRESULT hres; + ITypeLib *tl; + + hres = LoadRegTypeLib(&LIBID_Scripting, 1, 0, LOCALE_SYSTEM_DEFAULT, &tl); + if(FAILED(hres)) { + ERR("LoadRegTypeLib failed: %08x\n", hres); + return hres; + } + + if(InterlockedCompareExchangePointer((void**)&typelib, tl, NULL)) + ITypeLib_Release(tl); + return hres; +} + +HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo) +{ + HRESULT hres; + + if (!typelib) + hres = load_typelib(); + if (!typelib) + return hres; + + if(!typeinfos[tid]) { + ITypeInfo *ti; + + hres = ITypeLib_GetTypeInfoOfGuid(typelib, tid_ids[tid], &ti); + if(FAILED(hres)) { + ERR("GetTypeInfoOfGuid(%s) failed: %08x\n", debugstr_guid(tid_ids[tid]), hres); + return hres; + } + + if(InterlockedCompareExchangePointer((void**)(typeinfos+tid), ti, NULL)) + ITypeInfo_Release(ti); + } + + *typeinfo = typeinfos[tid]; + return S_OK; +} + +static void release_typelib(void) +{ + unsigned i; + + if(!typelib) + return; + + for(i=0; i < sizeof(typeinfos)/sizeof(*typeinfos); i++) + if(typeinfos[i]) + ITypeInfo_Release(typeinfos[i]); + + ITypeLib_Release(typelib); +} + BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) { TRACE("%p, %u, %p\n", hinst, reason, reserved); @@ -101,6 +164,7 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) scrrun_instance = hinst; break; case DLL_PROCESS_DETACH: + release_typelib(); break; } return TRUE; diff --git a/dlls/scrrun/scrrun_private.h b/dlls/scrrun/scrrun_private.h new file mode 100644 index 0000000..fc700a6 --- /dev/null +++ b/dlls/scrrun/scrrun_private.h @@ -0,0 +1,32 @@ +/* + * Copyright 2012 Alistair Leslie-Hughes + * + * 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 + */ +#ifndef _SCRRUN_PRIVATE_H_ +#define _SCRRUN_PRIVATE_H + +extern HRESULT WINAPI FileSystem_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; + +typedef enum tid_t +{ + NULL_tid, + IFileSystem3_tid, + LAST_tid +} tid_t; + +HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo) DECLSPEC_HIDDEN; + +#endif

1 0

Nikolay Sivov : scrrun: Added IFileSystem3_FileExists implementation.
by Alexandre Julliard 13 Jul '12

13 Jul '12

Module: wine Branch: master Commit: 1ca6cacdb348746fbc3a8b56e9285593dcc7c437 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ca6cacdb348746fbc3a8b56e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 12 02:00:42 2012 +0400 scrrun: Added IFileSystem3_FileExists implementation. --- dlls/scrrun/filesystem.c | 10 ++++++---- dlls/scrrun/tests/Makefile.in | 2 +- dlls/scrrun/tests/filesystem.c | 21 ++++++++++++++++++++- 3 files changed, 27 insertions(+), 6 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index cd397a4..5c8fb7d 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -213,12 +213,14 @@ static HRESULT WINAPI filesys_DriveExists(IFileSystem3 *iface, BSTR DriveSpec, return E_NOTIMPL; } -static HRESULT WINAPI filesys_FileExists(IFileSystem3 *iface, BSTR FileSpec, - VARIANT_BOOL *pfExists) +static HRESULT WINAPI filesys_FileExists(IFileSystem3 *iface, BSTR path, VARIANT_BOOL *ret) { - FIXME("%p %s %p\n", iface, debugstr_w(FileSpec), pfExists); + TRACE("%p %s %p\n", iface, debugstr_w(path), ret); - return E_NOTIMPL; + if (!ret) return E_POINTER; + + *ret = GetFileAttributesW(path) != INVALID_FILE_ATTRIBUTES ? VARIANT_TRUE : VARIANT_FALSE; + return S_OK; } static HRESULT WINAPI filesys_FolderExists(IFileSystem3 *iface, BSTR FolderSpec, diff --git a/dlls/scrrun/tests/Makefile.in b/dlls/scrrun/tests/Makefile.in index 44cef8a..326eb1a 100644 --- a/dlls/scrrun/tests/Makefile.in +++ b/dlls/scrrun/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = scrrun.dll -IMPORTS = ole32 shlwapi uuid +IMPORTS = ole32 shlwapi uuid oleaut32 C_SRCS = \ filesystem.c diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index c48baa4..ff1856e 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -22,6 +22,7 @@ #include "windows.h" #include "ole2.h" +#include "oleauto.h" #include "dispex.h" #include "wine/test.h" @@ -31,11 +32,14 @@ static void test_interfaces(void) { + static const WCHAR pathW[] = {'p','a','t','h',0}; HRESULT hr; IDispatch *disp; IDispatchEx *dispex; IFileSystem3 *fs3; IObjectWithSite *site; + VARIANT_BOOL b; + BSTR path; hr = CoCreateInstance(&CLSID_FileSystemObject, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IDispatch, (void**)&disp); @@ -46,7 +50,6 @@ static void test_interfaces(void) hr = IDispatch_QueryInterface(disp, &IID_IFileSystem3, (void**)&fs3); ok(hr == S_OK, "got 0x%08x, expected 0x%08x\n", hr, S_OK); - IFileSystem3_Release(fs3); hr = IDispatch_QueryInterface(disp, &IID_IObjectWithSite, (void**)&site); ok(hr == E_NOINTERFACE, "got 0x%08x, expected 0x%08x\n", hr, E_NOINTERFACE); @@ -54,6 +57,22 @@ static void test_interfaces(void) hr = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); ok(hr == E_NOINTERFACE, "got 0x%08x, expected 0x%08x\n", hr, E_NOINTERFACE); + b = VARIANT_TRUE; + hr = IFileSystem3_FileExists(fs3, NULL, &b); + ok(hr == S_OK, "got 0x%08x, expected 0x%08x\n", hr, S_OK); + ok(b == VARIANT_FALSE, "got %x\n", b); + + hr = IFileSystem3_FileExists(fs3, NULL, NULL); + ok(hr == E_POINTER, "got 0x%08x, expected 0x%08x\n", hr, E_POINTER); + + path = SysAllocString(pathW); + b = VARIANT_TRUE; + hr = IFileSystem3_FileExists(fs3, path, &b); + ok(hr == S_OK, "got 0x%08x, expected 0x%08x\n", hr, S_OK); + ok(b == VARIANT_FALSE, "got %x\n", b); + SysFreeString(path); + + IFileSystem3_Release(fs3); IDispatch_Release(disp); }

1 0