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

Hans Leidekker : wbemprox: Add support for creating new tables.
by Alexandre Julliard July 13, 2012

July 13, 2012

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: Implement GetConvertStg().
by Alexandre Julliard July 13, 2012

July 13, 2012

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

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

July 13, 2012

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

Dmitry Timoshkov : windowscodecs: Use predefined WICBitmapPaletteTypeFixedGray16 palette instead of a handmade one .
by Alexandre Julliard July 13, 2012

July 13, 2012

Module: wine Branch: master Commit: b82023b7c280e7becfb208ddfd7b83797e70df77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b82023b7c280e7becfb208ddf… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jul 13 10:08:58 2012 +0900 windowscodecs: Use predefined WICBitmapPaletteTypeFixedGray16 palette instead of a handmade one. --- dlls/windowscodecs/converter.c | 30 +++++++++--------------------- 1 files changed, 9 insertions(+), 21 deletions(-) diff --git a/dlls/windowscodecs/converter.c b/dlls/windowscodecs/converter.c index bd83be3..98e727e 100644 --- a/dlls/windowscodecs/converter.c +++ b/dlls/windowscodecs/converter.c @@ -82,16 +82,6 @@ static inline FormatConverter *impl_from_IWICFormatConverter(IWICFormatConverter return CONTAINING_RECORD(iface, FormatConverter, IWICFormatConverter_iface); } -static void make_grayscale_palette(WICColor *colors, UINT num_colors) -{ - int i, v; - for (i=0; i<num_colors; i++) - { - v = i * 255 / (num_colors-1); - colors[i] = 0xff000000 | v<<16 | v<<8 | v; - } -} - static HRESULT copypixels_to_32bppBGRA(struct FormatConverter *This, const WICRect *prc, UINT cbStride, UINT cbBufferSize, BYTE *pbBuffer, enum pixelformat source_format) { @@ -248,21 +238,19 @@ static HRESULT copypixels_to_32bppBGRA(struct FormatConverter *This, const WICRe IWICPalette *palette; UINT actualcolors; - if (source_format == format_4bppIndexed) - { - res = PaletteImpl_Create(&palette); - if (FAILED(res)) return res; + res = PaletteImpl_Create(&palette); + if (FAILED(res)) return res; + if (source_format == format_4bppIndexed) res = IWICBitmapSource_CopyPalette(This->source, palette); - if (SUCCEEDED(res)) - res = IWICPalette_GetColors(palette, 16, colors, &actualcolors); + else + res = IWICPalette_InitializePredefined(palette, WICBitmapPaletteTypeFixedGray16, FALSE); - IWICPalette_Release(palette); + if (SUCCEEDED(res)) + res = IWICPalette_GetColors(palette, 16, colors, &actualcolors); - if (FAILED(res)) return res; - } - else - make_grayscale_palette(colors, 16); + IWICPalette_Release(palette); + if (FAILED(res)) return res; srcstride = (prc->Width+1)/2; srcdatasize = srcstride * prc->Height;

1 0

Nikolay Sivov : ole32: COM cleanup of storage IStream implementation.
by Alexandre Julliard July 13, 2012

July 13, 2012

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

Dmitry Timoshkov : windowscodecs: Test pixel format of the loaded TIFF image.
by Alexandre Julliard July 13, 2012

July 13, 2012

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: Add a partial StdRegProv class implementation.
by Alexandre Julliard July 13, 2012

July 13, 2012

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

Alexandre Goujon : kernel32/tests: Add a helper to test CDROM ioctl.
by Alexandre Julliard July 12, 2012

July 12, 2012

Module: wine Branch: master Commit: 7c27a969973d2b54215be7906bf465239d15a260 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c27a969973d2b54215be7906… Author: Alexandre Goujon <ale.goujon(a)gmail.com> Date: Wed Jul 11 22:26:48 2012 +0200 kernel32/tests: Add a helper to test CDROM ioctl. --- dlls/kernel32/tests/volume.c | 43 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 43 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index 2755af5..b459ba6 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -730,6 +730,48 @@ static void test_GetVolumePathNamesForVolumeNameW(void) ok(error == ERROR_FILE_NOT_FOUND, "expected ERROR_FILE_NOT_FOUND got %u\n", error); } +static void test_cdrom_ioctl(void) +{ + char drive_letter, drive_path[] = "A:\\", drive_full_path[] = "\\\\.\\A:"; + DWORD bitmask; + HANDLE handle; + + bitmask = GetLogicalDrives(); + if(!bitmask) + { + trace("GetLogicalDrives failed : %u\n", GetLastError()); + return; + } + + for(drive_letter='A'; drive_letter<='Z'; drive_letter++) + { + if(!(bitmask & (1 << (drive_letter-'A') ))) + continue; + + drive_path[0] = drive_letter; + if(GetDriveTypeA(drive_path) != DRIVE_CDROM) + { + trace("Skipping %c:, not a CDROM drive.\n", drive_letter); + continue; + } + + trace("Testing with %c:\n", drive_letter); + + drive_full_path[4] = drive_letter; + handle = CreateFileA(drive_full_path, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0); + if(handle == INVALID_HANDLE_VALUE) + { + trace("Failed to open the device : %u\n", GetLastError()); + continue; + } + + /* Add your tests here */ + + CloseHandle(handle); + } + +} + START_TEST(volume) { hdll = GetModuleHandleA("kernel32.dll"); @@ -756,4 +798,5 @@ START_TEST(volume) test_disk_extents(); test_GetVolumePathNamesForVolumeNameA(); test_GetVolumePathNamesForVolumeNameW(); + test_cdrom_ioctl(); }

1 0

Erich Hoover : shell32: Fix FindExecutable search path when a default directory is supplied.
by Alexandre Julliard July 12, 2012

July 12, 2012

Module: wine Branch: master Commit: 6a1d2f80b87de75cd4ed2d1280ab8e885b691857 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a1d2f80b87de75cd4ed2d128… Author: Erich Hoover <ehoover(a)mines.edu> Date: Tue Jul 10 11:59:24 2012 -0600 shell32: Fix FindExecutable search path when a default directory is supplied. --- dlls/shell32/shlexec.c | 8 +++++++- dlls/shell32/tests/shlexec.c | 16 ++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index 77212f0..e351d86 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -603,7 +603,13 @@ static UINT SHELL_FindExecutable(LPCWSTR lpPath, LPCWSTR lpFile, LPCWSTR lpOpera { TRACE("SearchPathW returned non-zero\n"); lpFile = xlpFile; - /* Hey, isn't this value ignored? Why make this call? Shouldn't we return here? --dank*/ + /* The file was found in the application-supplied default directory (or the system search path) */ + } + else if (lpPath && SearchPathW(NULL, lpFile, wszExe, sizeof(xlpFile)/sizeof(WCHAR), xlpFile, NULL)) + { + TRACE("SearchPathW returned non-zero\n"); + lpFile = xlpFile; + /* The file was found in one of the directories in the system-wide search path */ } attribs = GetFileAttributesW(lpFile); diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 1c5fe7f..8e200aa 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -1307,6 +1307,7 @@ static void test_filename(void) static void test_find_executable(void) { + char notepad_path[MAX_PATH]; char filename[MAX_PATH]; char command[MAX_PATH]; const filename_tests_t* test; @@ -1329,6 +1330,21 @@ static void test_find_executable(void) ok(strcmp(command, "your word") != 0, "FindExecutable(NULL) returned command=[%s]\n", command); } + GetSystemDirectoryA( notepad_path, MAX_PATH ); + strcat( notepad_path, "\\notepad.exe" ); + + /* Search for something that should be in the system-wide search path (no default directory) */ + strcpy(command, "your word"); + rc=(INT_PTR)FindExecutableA("notepad.exe", NULL, command); + ok(rc > 32, "FindExecutable(%s) returned %ld\n", "notepad.exe", rc); + ok(strcasecmp(command, notepad_path) == 0, "FindExecutable(%s) returned command=[%s]\n", "notepad.exe", command); + + /* Search for something that should be in the system-wide search path (with default directory) */ + strcpy(command, "your word"); + rc=(INT_PTR)FindExecutableA("notepad.exe", tmpdir, command); + ok(rc > 32, "FindExecutable(%s) returned %ld\n", "notepad.exe", rc); + ok(strcasecmp(command, notepad_path) == 0, "FindExecutable(%s) returned command=[%s]\n", "notepad.exe", command); + strcpy(command, "your word"); rc=(INT_PTR)FindExecutableA(tmpdir, NULL, command); ok(rc == SE_ERR_NOASSOC /* >= win2000 */ || rc > 32 /* win98, nt4 */, "FindExecutable(NULL) returned %ld\n", rc);

1 0

Dmitry Timoshkov : windowscodecs: Add support for generating WICBitmapPaletteTypeFixedHalftone256 palette.
by Alexandre Julliard July 12, 2012

July 12, 2012

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