March 2015 - Wine-commits - list.winehq.org

André Hentschel : loader: Run checks also on ARM Linux.
by Alexandre Julliard 30 Mar '15

30 Mar '15

Module: wine Branch: master Commit: 9a1fab59e7d5d993760224b250a8b52d30f58952 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a1fab59e7d5d993760224b25… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Mar 27 21:22:01 2015 +0100 loader: Run checks also on ARM Linux. --- loader/main.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/loader/main.c b/loader/main.c index ce21173..bb752b5 100644 --- a/loader/main.c +++ b/loader/main.c @@ -109,8 +109,9 @@ static void check_command_line( int argc, char *argv[] ) } -#if defined(__linux__) && defined(__i386__) +#if defined(__linux__) && (defined(__i386__) || defined(__arm__)) +#ifdef __i386__ /* separate thread to check for NPTL and TLS features */ static void *needs_pthread( void *arg ) { @@ -140,6 +141,11 @@ static void check_threading(void) pthread_join( id, &ret ); if (!ret) exit(1); } +#else +static void check_threading(void) +{ +} +#endif static void check_vmsplit( void *stack ) { @@ -171,7 +177,11 @@ static int pre_exec(void) check_threading(); check_vmsplit( &temp ); set_max_limit( RLIMIT_AS ); - return 1; +#ifdef __i386__ + return 1; /* we have a preloader on x86 */ +#else + return 0; +#endif } #elif defined(__linux__) && defined(__x86_64__)

1 0

Jacek Caban : wmsdkidl.idl: Added IWMReaderAdvanced* declarations.
by Alexandre Julliard 30 Mar '15

30 Mar '15

Module: wine Branch: master Commit: 292d7bdf0f1438ad91bb72bf7edc6e70338c03c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=292d7bdf0f1438ad91bb72bf7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 27 17:57:37 2015 +0100 wmsdkidl.idl: Added IWMReaderAdvanced* declarations. --- include/wmsdkidl.idl | 293 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 293 insertions(+) diff --git a/include/wmsdkidl.idl b/include/wmsdkidl.idl index 1618f86..dc584fc 100644 --- a/include/wmsdkidl.idl +++ b/include/wmsdkidl.idl @@ -60,6 +60,29 @@ typedef struct _WMWriterStatisticsEx DWORD dwTotalSampleDropsInMultiplexer; } WM_WRITER_STATISTICS_EX; +typedef struct _WMReaderStatistics +{ + DWORD cbSize; + DWORD dwBandwidth; + DWORD cPacketsReceived; + DWORD cPacketsRecovered; + DWORD cPacketsLost; + WORD wQuality; +} WM_READER_STATISTICS; + +typedef struct _WMReaderClientInfo +{ + DWORD cbSize; + WCHAR *wszLang; + WCHAR *wszBrowserUserAgent; + WCHAR *wszBrowserWebPage; + QWORD qwReserved; + LPARAM *pReserved; + WCHAR *wszHostExe; + QWORD qwHostVersion; + WCHAR *wszPlayerUserAgent; +} WM_READER_CLIENTINFO; + typedef enum WMT_ATTR_DATATYPE { WMT_TYPE_DWORD = 0, @@ -143,6 +166,23 @@ typedef enum WMT_VERSION WMT_VER_9_0 = 0x00090000 } WMT_VERSION; +typedef enum WMT_PLAY_MODE +{ + WMT_PLAY_MODE_AUTOSELECT, + WMT_PLAY_MODE_LOCAL, + WMT_PLAY_MODE_DOWNLOAD, + WMT_PLAY_MODE_STREAMING +} WMT_PLAY_MODE; + +typedef enum tagWMT_OFFSET_FORMAT +{ + WMT_OFFSET_FORMAT_100NS, + WMT_OFFSET_FORMAT_FRAME_NUMBERS, + WMT_OFFSET_FORMAT_PLAYLIST_OFFSET, + WMT_OFFSET_FORMAT_TIMECODE, + WMT_OFFSET_FORMAT_100NS_APPROXIMATE +} WMT_OFFSET_FORMAT; + typedef LPCWSTR LPCWSTR_WMSDK_TYPE_SAFE; [ @@ -441,6 +481,259 @@ interface IWMReader : IUnknown [ object, + uuid(e5b7ca9a-0f1c-4f66-9002-74ec50d8b304), + pointer_default(unique), + local +] +interface IWMPlayerHook : IUnknown +{ + HRESULT PreDecode(); +} + +[ + object, + uuid(96406bea-2b2b-11d3-b36b-00c04f6108ff), + pointer_default(unique), + local +] +interface IWMReaderAdvanced : IUnknown +{ + HRESULT SetUserProvidedClock( + [in] BOOL fUserClock); + + HRESULT GetUserProvidedClock( + [out] BOOL *pfUserClock); + + HRESULT DeliverTime( + [in] QWORD cnsTime); + + HRESULT SetManualStreamSelection( + [in] BOOL fSelection); + + HRESULT GetManualStreamSelection( + [out] BOOL *pfSelection); + + HRESULT SetStreamsSelected( + [in] WORD cStreamCount, + [in] WORD *pwStreamNumbers, + [in] WMT_STREAM_SELECTION *pSelections); + + HRESULT GetStreamSelected( + [in] WORD wStreamNum, + [out] WMT_STREAM_SELECTION *pSelection); + + HRESULT SetReceiveSelectionCallbacks( + [in] BOOL fGetCallbacks); + + HRESULT GetReceiveSelectionCallbacks( + [out] BOOL *pfGetCallbacks); + + HRESULT SetReceiveStreamSamples( + [in] WORD wStreamNum, + [in] BOOL fReceiveStreamSamples); + + HRESULT GetReceiveStreamSamples( + [in] WORD wStreamNum, + [out] BOOL *pfReceiveStreamSamples); + + HRESULT SetAllocateForOutput( + [in] DWORD dwOutputNum, + [in] BOOL fAllocate); + + HRESULT GetAllocateForOutput( + [in] DWORD dwOutputNum, + [out] BOOL *pfAllocate); + + HRESULT SetAllocateForStream( + [in] WORD wStreamNum, + [in] BOOL fAllocate); + + HRESULT GetAllocateForStream( + [in] WORD dwSreamNum, + [out] BOOL *pfAllocate); + + HRESULT GetStatistics( + [in, out] WM_READER_STATISTICS *pStatistics); + + HRESULT SetClientInfo( + [in] WM_READER_CLIENTINFO *pClientInfo); + + HRESULT GetMaxOutputSampleSize( + [in] DWORD dwOutput, + [out] DWORD *pcbMax); + + HRESULT GetMaxStreamSampleSize( + [in] WORD wStream, + [out] DWORD *pcbMax); + + HRESULT NotifyLateDelivery( + QWORD cnsLateness); +} + +[ + object, + uuid(ae14a945-b90c-4d0d-9127-80d665f7d73e), + pointer_default(unique), + local +] +interface IWMReaderAdvanced2 : IWMReaderAdvanced +{ + HRESULT SetPlayMode( + [in] WMT_PLAY_MODE Mode); + + HRESULT GetPlayMode( + [out] WMT_PLAY_MODE *pMode); + + HRESULT GetBufferProgress( + [out] DWORD *pdwPercent, + [out] QWORD *pcnsBuffering); + + HRESULT GetDownloadProgress( + [out] DWORD *pdwPercent, + [out] QWORD *pqwBytesDownloaded, + [out] QWORD *pcnsDownload); + + HRESULT GetSaveAsProgress( + [out] DWORD *pdwPercent); + + HRESULT SaveFileAs( + [in] const WCHAR *pwszFilename); + + HRESULT GetProtocolName( + [out, size_is(*pcchProtocol)] WCHAR *pwszProtocol, + [in, out] DWORD *pcchProtocol); + + HRESULT StartAtMarker( + [in] WORD wMarkerIndex, + [in] QWORD cnsDuration, + [in] float fRate, + [in] void *pvContext); + + HRESULT GetOutputSetting( + [in] DWORD dwOutputNum, + [in] LPCWSTR pszName, + [out] WMT_ATTR_DATATYPE *pType, + [out, size_is(*pcbLength)] BYTE *pValue, + [in, out] WORD *pcbLength); + + HRESULT SetOutputSetting( + [in] DWORD dwOutputNum, + [in] LPCWSTR pszName, + [in] WMT_ATTR_DATATYPE Type, + [in, size_is(cbLength)] const BYTE *pValue, + [in] WORD cbLength); + + HRESULT Preroll( + [in] QWORD cnsStart, + [in] QWORD cnsDuration, + [in] float fRate); + + HRESULT SetLogClientID( + [in] BOOL fLogClientID); + + HRESULT GetLogClientID( + [out] BOOL *pfLogClientID); + + HRESULT StopBuffering(); + + HRESULT OpenStream( + [in] IStream *pStream, + [in] IWMReaderCallback *pCallback, + [in] void *pvContext); +} + +[ + object, + uuid(5dc0674b-f04B-4a4e-9f2a-b1afde2c8100), + pointer_default(unique), + local +] +interface IWMReaderAdvanced3 : IWMReaderAdvanced2 +{ + HRESULT StopNetStreaming(); + + HRESULT StartAtPosition( + [in] WORD wStreamNum, + [in] void *pvOffsetStart, + [in] void *pvDuration, + [in] WMT_OFFSET_FORMAT dwOffsetFormat, + [in] float fRate, + [in] void *pvContext); +} + +[ + object, + uuid(945a76a2-12ae-4d48-bd3c-cd1d90399b85), + pointer_default(unique), + local +] +interface IWMReaderAdvanced4 : IWMReaderAdvanced3 +{ + HRESULT GetLanguageCount( + [in] DWORD dwOutputNum, + [out] WORD *pwLanguageCount); + + HRESULT GetLanguage( + [in] DWORD dwOutputNum, + [in] WORD wLanguage, + [out, size_is(*pcchLanguageStringLength)] WCHAR *pwszLanguageString, + [in, out] WORD *pcchLanguageStringLength); + + HRESULT GetMaxSpeedFactor( + [out] double *pdblFactor); + + HRESULT IsUsingFastCache( + [out] BOOL *pfUsingFastCache); + + HRESULT AddLogParam( + [in] LPCWSTR wszNameSpace, + [in] LPCWSTR wszName, + [in] LPCWSTR wszValue); + + HRESULT SendLogParams(); + + HRESULT CanSaveFileAs( + [out] BOOL *pfCanSave); + + HRESULT CancelSaveFileAs(); + + HRESULT GetURL( + [out, size_is(*pcchURL)] WCHAR *pwszURL, + [in, out] DWORD *pcchURL); +} + +[ + object, + uuid(24c44db0-55d1-49ae-a5cc-f13815e36363), + pointer_default(unique), + local +] +interface IWMReaderAdvanced5 : IWMReaderAdvanced4 +{ + HRESULT SetPlayerHook( + [in] DWORD dwOutputNum, + [in] IWMPlayerHook *pHook); +} + +[ + object, + uuid(18a2e7f8-428f-4acd-8a00-e64639bc93de), + pointer_default(unique), + local +] +interface IWMReaderAdvanced6 : IWMReaderAdvanced5 +{ + HRESULT SetProtectStreamSamples( + [in, size_is(cbCertificate)] BYTE *pbCertificate, + [in] DWORD cbCertificate, + [in] DWORD dwCertificateType, + [in] DWORD dwFlags, + [out, size_is(*pcbInitializationVector)] BYTE *pbInitializationVector, + [in, out] DWORD *pcbInitializationVector); +} + +[ + object, uuid(9397f121-7705-4dc9-b049-98b698188414), pointer_default( unique ), local

1 0

Vincent Povirk : windowscodecs: Implement PngDecoder_Block_GetCount.
by Alexandre Julliard 30 Mar '15

30 Mar '15

Module: wine Branch: master Commit: 43c97b871f2e60983ed07025428effed62ec795d URL: http://source.winehq.org/git/wine.git/?a=commit;h=43c97b871f2e60983ed070254… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Mar 25 14:26:28 2015 -0500 windowscodecs: Implement PngDecoder_Block_GetCount. --- dlls/windowscodecs/pngformat.c | 80 +++++++++++++++++++++++++++++++++++-- dlls/windowscodecs/tests/metadata.c | 6 +-- 2 files changed, 79 insertions(+), 7 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 260330f..53a2122 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -292,6 +292,11 @@ static void user_warning_fn(png_structp png_ptr, png_const_charp warning_message } typedef struct { + ULARGE_INTEGER ofs, len; + IWICMetadataReader* reader; +} metadata_block_info; + +typedef struct { IWICBitmapDecoder IWICBitmapDecoder_iface; IWICBitmapFrameDecode IWICBitmapFrameDecode_iface; IWICMetadataBlockReader IWICMetadataBlockReader_iface; @@ -307,6 +312,8 @@ typedef struct { const WICPixelFormatGUID *format; BYTE *image_bits; CRITICAL_SECTION lock; /* must be held when png structures are accessed or initialized is set */ + ULONG metadata_count; + metadata_block_info* metadata_blocks; } PngDecoder; static inline PngDecoder *impl_from_IWICBitmapDecoder(IWICBitmapDecoder *iface) @@ -362,6 +369,7 @@ static ULONG WINAPI PngDecoder_Release(IWICBitmapDecoder *iface) { PngDecoder *This = impl_from_IWICBitmapDecoder(iface); ULONG ref = InterlockedDecrement(&This->ref); + ULONG i; TRACE("(%p) refcount=%u\n", iface, ref); @@ -373,6 +381,12 @@ static ULONG WINAPI PngDecoder_Release(IWICBitmapDecoder *iface) This->lock.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->lock); HeapFree(GetProcessHeap(), 0, This->image_bits); + for (i=0; i<This->metadata_count; i++) + { + if (This->metadata_blocks[i].reader) + IWICMetadataReader_Release(This->metadata_blocks[i].reader); + } + HeapFree(GetProcessHeap(), 0, This->metadata_blocks); HeapFree(GetProcessHeap(), 0, This); } @@ -425,6 +439,10 @@ static HRESULT WINAPI PngDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p png_uint_32 transparency; png_color_16p trans_values; jmp_buf jmpbuf; + BYTE chunk_type[4]; + ULONG chunk_size; + ULARGE_INTEGER chunk_start; + ULONG metadata_blocks_size = 0; TRACE("(%p,%p,%x)\n", iface, pIStream, cacheOptions); @@ -607,13 +625,60 @@ static HRESULT WINAPI PngDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p ppng_read_end(This->png_ptr, This->end_info); + /* Find the metadata chunks in the file. */ + seek.QuadPart = 8; + hr = IStream_Seek(pIStream, seek, STREAM_SEEK_SET, &chunk_start); + if (FAILED(hr)) goto end; + + do + { + hr = read_png_chunk(pIStream, chunk_type, NULL, &chunk_size); + if (FAILED(hr)) goto end; + + if (chunk_type[0] >= 'a' && chunk_type[0] <= 'z' && + memcmp(chunk_type, "tRNS", 4) && memcmp(chunk_type, "pHYs", 4)) + { + /* This chunk is considered metadata. */ + if (This->metadata_count == metadata_blocks_size) + { + metadata_block_info* new_metadata_blocks; + ULONG new_metadata_blocks_size; + + new_metadata_blocks_size = 4 + metadata_blocks_size * 2; + new_metadata_blocks = HeapAlloc(GetProcessHeap(), 0, + new_metadata_blocks_size * sizeof(*new_metadata_blocks)); + + if (!new_metadata_blocks) + { + hr = E_OUTOFMEMORY; + goto end; + } + + memcpy(new_metadata_blocks, This->metadata_blocks, + This->metadata_count * sizeof(*new_metadata_blocks)); + + HeapFree(GetProcessHeap(), 0, This->metadata_blocks); + This->metadata_blocks = new_metadata_blocks; + metadata_blocks_size = new_metadata_blocks_size; + } + + This->metadata_blocks[This->metadata_count].ofs = chunk_start; + This->metadata_blocks[This->metadata_count].len.QuadPart = chunk_size + 12; + This->metadata_blocks[This->metadata_count].reader = NULL; + This->metadata_count++; + } + + seek.QuadPart = chunk_start.QuadPart + chunk_size + 12; /* skip data and CRC */ + hr = IStream_Seek(pIStream, seek, STREAM_SEEK_SET, &chunk_start); + if (FAILED(hr)) goto end; + } while (memcmp(chunk_type, "IEND", 4)); + This->stream = pIStream; IStream_AddRef(This->stream); This->initialized = TRUE; end: - LeaveCriticalSection(&This->lock); return hr; @@ -983,10 +1048,15 @@ static HRESULT WINAPI PngDecoder_Block_GetContainerFormat(IWICMetadataBlockReade static HRESULT WINAPI PngDecoder_Block_GetCount(IWICMetadataBlockReader *iface, UINT *pcCount) { - static int once; + PngDecoder *This = impl_from_IWICMetadataBlockReader(iface); + TRACE("%p,%p\n", iface, pcCount); - if (!once++) FIXME("stub\n"); - return E_NOTIMPL; + + if (!pcCount) return E_INVALIDARG; + + *pcCount = This->metadata_count; + + return S_OK; } static HRESULT WINAPI PngDecoder_Block_GetReaderByIndex(IWICMetadataBlockReader *iface, @@ -1042,6 +1112,8 @@ HRESULT PngDecoder_CreateInstance(REFIID iid, void** ppv) This->image_bits = NULL; InitializeCriticalSection(&This->lock); This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": PngDecoder.lock"); + This->metadata_count = 0; + This->metadata_blocks = NULL; ret = IWICBitmapDecoder_QueryInterface(&This->IWICBitmapDecoder_iface, iid, ppv); IWICBitmapDecoder_Release(&This->IWICBitmapDecoder_iface); diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index 20fe54c..1a7587f 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -946,11 +946,11 @@ static void test_metadata_png(void) ok(IsEqualGUID(&containerformat, &GUID_ContainerFormatPng), "unexpected container format\n"); hr = IWICMetadataBlockReader_GetCount(blockreader, NULL); - todo_wine ok(hr == E_INVALIDARG, "GetCount failed, hr=%x\n", hr); + ok(hr == E_INVALIDARG, "GetCount failed, hr=%x\n", hr); hr = IWICMetadataBlockReader_GetCount(blockreader, &count); - todo_wine ok(hr == S_OK, "GetCount failed, hr=%x\n", hr); - todo_wine ok(count == 1, "unexpected count %d\n", count); + ok(hr == S_OK, "GetCount failed, hr=%x\n", hr); + ok(count == 1, "unexpected count %d\n", count); if (0) {

1 0

Vincent Povirk : windowscodecs: Implement PngDecoder_Block_GetReaderByIndex.
by Alexandre Julliard 30 Mar '15

30 Mar '15

Module: wine Branch: master Commit: f2f5cd831bdda21deef1fca67febe78fb174d582 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2f5cd831bdda21deef1fca67… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Mar 25 14:42:15 2015 -0500 windowscodecs: Implement PngDecoder_Block_GetReaderByIndex. --- dlls/windowscodecs/pngformat.c | 47 +++++++++++++++++++++++++++++++++++-- dlls/windowscodecs/tests/metadata.c | 6 ++--- 2 files changed, 48 insertions(+), 5 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 53a2122..679ad3d 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -1062,8 +1062,51 @@ static HRESULT WINAPI PngDecoder_Block_GetCount(IWICMetadataBlockReader *iface, static HRESULT WINAPI PngDecoder_Block_GetReaderByIndex(IWICMetadataBlockReader *iface, UINT nIndex, IWICMetadataReader **ppIMetadataReader) { - FIXME("%p,%d,%p\n", iface, nIndex, ppIMetadataReader); - return E_NOTIMPL; + PngDecoder *This = impl_from_IWICMetadataBlockReader(iface); + HRESULT hr; + IWICComponentFactory* factory; + IWICStream* stream; + + TRACE("%p,%d,%p\n", iface, nIndex, ppIMetadataReader); + + if (nIndex >= This->metadata_count || !ppIMetadataReader) + return E_INVALIDARG; + + if (!This->metadata_blocks[nIndex].reader) + { + hr = StreamImpl_Create(&stream); + + if (SUCCEEDED(hr)) + { + hr = IWICStream_InitializeFromIStreamRegion(stream, This->stream, + This->metadata_blocks[nIndex].ofs, This->metadata_blocks[nIndex].len); + + if (SUCCEEDED(hr)) + hr = ComponentFactory_CreateInstance(&IID_IWICComponentFactory, (void**)&factory); + + if (SUCCEEDED(hr)) + { + hr = IWICComponentFactory_CreateMetadataReaderFromContainer(factory, + &GUID_ContainerFormatPng, NULL, WICMetadataCreationAllowUnknown, + (IStream*)stream, &This->metadata_blocks[nIndex].reader); + + IWICComponentFactory_Release(factory); + } + + IWICStream_Release(stream); + } + + if (FAILED(hr)) + { + *ppIMetadataReader = NULL; + return hr; + } + } + + *ppIMetadataReader = This->metadata_blocks[nIndex].reader; + IWICMetadataReader_AddRef(*ppIMetadataReader); + + return S_OK; } static HRESULT WINAPI PngDecoder_Block_GetEnumerator(IWICMetadataBlockReader *iface, diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index 1a7587f..6e629fb 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -960,19 +960,19 @@ static void test_metadata_png(void) } hr = IWICMetadataBlockReader_GetReaderByIndex(blockreader, 0, &reader); - todo_wine ok(hr == S_OK, "GetReaderByIndex failed, hr=%x\n", hr); + ok(hr == S_OK, "GetReaderByIndex failed, hr=%x\n", hr); if (SUCCEEDED(hr)) { hr = IWICMetadataReader_GetMetadataFormat(reader, &containerformat); ok(hr == S_OK, "GetMetadataFormat failed, hr=%#x\n", hr); - ok(IsEqualGUID(&containerformat, &GUID_MetadataFormatChunktIME) || + todo_wine ok(IsEqualGUID(&containerformat, &GUID_MetadataFormatChunktIME) || broken(IsEqualGUID(&containerformat, &GUID_MetadataFormatUnknown)) /* Windows XP */, "unexpected container format\n"); hr = IWICMetadataReader_GetCount(reader, &count); ok(hr == S_OK, "GetCount error %#x\n", hr); - ok(count == 6 || broken(count == 1) /* XP */, "expected 6, got %u\n", count); + todo_wine ok(count == 6 || broken(count == 1) /* XP */, "expected 6, got %u\n", count); if (count == 6) compare_metadata(reader, td, count);

1 0

Piotr Caban : server: Fix DACL to permissions conversion.
by Alexandre Julliard 30 Mar '15

30 Mar '15

Module: wine Branch: master Commit: 00b3f055be5dbf54bc56ab6b6609e0cac50b61e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00b3f055be5dbf54bc56ab6b6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 27 15:17:38 2015 +0100 server: Fix DACL to permissions conversion. --- dlls/advapi32/tests/security.c | 3 ++- server/file.c | 22 ++++++++++++++-------- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 0e9cf8c..a3690e8 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -3484,7 +3484,8 @@ static void test_GetNamedSecurityInfoA(void) h = CreateFileA(tmpfile, GENERIC_READ, FILE_SHARE_DELETE|FILE_SHARE_WRITE|FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); - todo_wine ok(h != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError()); + ok(h != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError()); + CloseHandle(h); bret = InitializeAcl(pDacl, 100, ACL_REVISION); ok(bret, "Failed to initialize ACL.\n"); diff --git a/server/file.c b/server/file.c index f565f5a..aa5ff01 100644 --- a/server/file.c +++ b/server/file.c @@ -473,7 +473,7 @@ static mode_t file_access_to_mode( unsigned int access ) mode_t sd_to_mode( const struct security_descriptor *sd, const SID *owner ) { mode_t new_mode = 0; - mode_t denied_mode = 0; + mode_t bits_to_set = ~0; mode_t mode; int present; const ACL *dacl = sd_get_dacl( sd, &present ); @@ -498,16 +498,16 @@ mode_t sd_to_mode( const struct security_descriptor *sd, const SID *owner ) mode = file_access_to_mode( ad_ace->Mask ); if (security_equal_sid( sid, security_world_sid )) { - denied_mode |= (mode << 6) | (mode << 3) | mode; /* all */ + bits_to_set &= ~((mode << 6) | (mode << 3) | mode); /* all */ } else if ((security_equal_sid( user, owner ) && token_sid_present( current->process->token, sid, TRUE ))) { - denied_mode |= (mode << 6) | (mode << 3); /* user + group */ + bits_to_set &= ~((mode << 6) | (mode << 3)); /* user + group */ } else if (security_equal_sid( sid, owner )) { - denied_mode |= (mode << 6); /* user only */ + bits_to_set &= ~(mode << 6); /* user only */ } break; case ACCESS_ALLOWED_ACE_TYPE: @@ -516,16 +516,22 @@ mode_t sd_to_mode( const struct security_descriptor *sd, const SID *owner ) mode = file_access_to_mode( aa_ace->Mask ); if (security_equal_sid( sid, security_world_sid )) { - new_mode |= (mode << 6) | (mode << 3) | mode; /* all */ + mode = (mode << 6) | (mode << 3) | mode; /* all */ + new_mode |= mode & bits_to_set; + bits_to_set &= ~mode; } else if ((security_equal_sid( user, owner ) && token_sid_present( current->process->token, sid, FALSE ))) { - new_mode |= (mode << 6) | (mode << 3); /* user + group */ + mode = (mode << 6) | (mode << 3); /* user + group */ + new_mode |= mode & bits_to_set; + bits_to_set &= ~mode; } else if (security_equal_sid( sid, owner )) { - new_mode |= (mode << 6); /* user only */ + mode = (mode << 6); /* user only */ + new_mode |= mode & bits_to_set; + bits_to_set &= ~mode; } break; } @@ -535,7 +541,7 @@ mode_t sd_to_mode( const struct security_descriptor *sd, const SID *owner ) /* no ACL means full access rights to anyone */ new_mode = S_IRWXU | S_IRWXG | S_IRWXO; - return new_mode & ~denied_mode; + return new_mode; } static int file_set_sd( struct object *obj, const struct security_descriptor *sd,

1 0

Aaryaman Vasishta : d3drm: Fix hard-coded HRESULT return in Direct3DRMFrame_create.
by Alexandre Julliard 30 Mar '15

30 Mar '15

Module: wine Branch: master Commit: bb83e30635790ae1a209f81e06b12f1f276fc0a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb83e30635790ae1a209f81e0… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Sun Mar 29 01:00:47 2015 +0530 d3drm: Fix hard-coded HRESULT return in Direct3DRMFrame_create. --- dlls/d3drm/frame.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index d66e9bf..20acf56 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -2301,5 +2301,5 @@ HRESULT Direct3DRMFrame_create(REFIID riid, IUnknown *parent, IUnknown **out) hr = IDirect3DRMFrame3_QueryInterface(&object->IDirect3DRMFrame3_iface, riid, (void **)out); IDirect3DRMFrame3_Release(&object->IDirect3DRMFrame3_iface); - return S_OK; + return hr; }

1 0

Mark Harmstone : ntdll: Treat strings as case-insensitive in find_window_class.
by Alexandre Julliard 30 Mar '15

30 Mar '15

Module: wine Branch: master Commit: 104161cfd29b20d3720cb9e88d3398511e21b794 URL: http://source.winehq.org/git/wine.git/?a=commit;h=104161cfd29b20d3720cb9e88… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Sat Mar 28 21:24:49 2015 +0000 ntdll: Treat strings as case-insensitive in find_window_class. --- dlls/ntdll/actctx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 4552e40..715a760 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -3332,7 +3332,7 @@ static NTSTATUS find_window_class(ACTIVATION_CONTEXT* actctx, const UNICODE_STRI { const WCHAR *nameW = (WCHAR*)((BYTE*)actctx->wndclass_section + iter->name_offset); - if (!strcmpW(nameW, name->Buffer)) + if (!strcmpiW(nameW, name->Buffer)) { index = iter; break;

1 0

Hugh McMaster : attrib: Fix incorrect comment.
by Alexandre Julliard 30 Mar '15

30 Mar '15

Module: wine Branch: master Commit: d4fb6257f5d88adb69f1bacd3f7d810a1d416eb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4fb6257f5d88adb69f1bacd3… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Mar 30 22:58:17 2015 +1100 attrib: Fix incorrect comment. --- programs/attrib/attrib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/attrib/attrib.c b/programs/attrib/attrib.c index 7e3b01e..0938cb8 100644 --- a/programs/attrib/attrib.c +++ b/programs/attrib/attrib.c @@ -64,7 +64,7 @@ static int __cdecl ATTRIB_wprintf(const WCHAR *format, ...) /* * Allocate buffer to use when writing to console * Note: Not freed - memory will be allocated once and released when - * xcopy ends + * attrib ends */ if (!output_bufW) output_bufW = HeapAlloc(GetProcessHeap(), 0,

1 0

Nikolay Sivov : comctl32/listview: Fix scrolling in LV_VIEW_DETAILS view.
by Alexandre Julliard 30 Mar '15

30 Mar '15

Module: wine Branch: master Commit: 3c9db1df604a0a56ddd769413f20053fa4cdbc4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c9db1df604a0a56ddd769413… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 28 18:35:07 2015 +0300 comctl32/listview: Fix scrolling in LV_VIEW_DETAILS view. --- dlls/comctl32/listview.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 3ac84a9..0b3439b 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4565,13 +4565,22 @@ static void LISTVIEW_DrawItemPart(LISTVIEW_INFO *infoPtr, LVITEMW *item, const N OffsetRect(&rcIcon, pos->x, pos->y); OffsetRect(&rcStateIcon, pos->x, pos->y); OffsetRect(&rcLabel, pos->x, pos->y); - TRACE(" rcBox=%s, rcSelect=%s, rcIcon=%s. rcLabel=%s\n", + TRACE("%d: box=%s, select=%s, icon=%s. label=%s\n", item->iSubItem, wine_dbgstr_rect(&rcBox), wine_dbgstr_rect(&rcSelect), wine_dbgstr_rect(&rcIcon), wine_dbgstr_rect(&rcLabel)); /* FIXME: temporary hack */ rcSelect.left = rcLabel.left; + if (infoPtr->uView == LV_VIEW_DETAILS && item->iSubItem == 0) + { + if (!(infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT)) + OffsetRect(&rcSelect, LISTVIEW_GetColumnInfo(infoPtr, 0)->rcHeader.left, 0); + OffsetRect(&rcIcon, LISTVIEW_GetColumnInfo(infoPtr, 0)->rcHeader.left, 0); + OffsetRect(&rcStateIcon, LISTVIEW_GetColumnInfo(infoPtr, 0)->rcHeader.left, 0); + OffsetRect(&rcLabel, LISTVIEW_GetColumnInfo(infoPtr, 0)->rcHeader.left, 0); + } + /* in icon mode, the label rect is really what we want to draw the * background for */ /* in detail mode, we want to paint background for label rect when @@ -4900,9 +4909,9 @@ static void LISTVIEW_RefreshReport(LISTVIEW_INFO *infoPtr, ITERATOR *i, HDC hdc, { INT rgntype; RECT rcClip, rcItem; - POINT Origin, Position; + POINT Origin; RANGES colRanges; - INT col, index; + INT col; ITERATOR j; TRACE("()\n"); @@ -4919,7 +4928,7 @@ static void LISTVIEW_RefreshReport(LISTVIEW_INFO *infoPtr, ITERATOR *i, HDC hdc, /* narrow down the columns we need to paint */ for(col = 0; col < DPA_GetPtrCount(infoPtr->hdpaColumns); col++) { - index = SendMessageW(infoPtr->hwndHeader, HDM_ORDERTOINDEX, col, 0); + INT index = SendMessageW(infoPtr->hwndHeader, HDM_ORDERTOINDEX, col, 0); LISTVIEW_GetHeaderRect(infoPtr, index, &rcItem); if ((rcItem.right + Origin.x >= rcClip.left) && (rcItem.left + Origin.x < rcClip.right)) @@ -4935,10 +4944,12 @@ static void LISTVIEW_RefreshReport(LISTVIEW_INFO *infoPtr, ITERATOR *i, HDC hdc, while(iterator_next(i)) { RANGES subitems; + POINT Position; ITERATOR k; SelectObject(hdc, infoPtr->hFont); LISTVIEW_GetItemOrigin(infoPtr, i->nItem, &Position); + Position.x = Origin.x; Position.y += Origin.y; subitems = ranges_create(DPA_GetPtrCount(infoPtr->hdpaColumns)); @@ -4947,7 +4958,6 @@ static void LISTVIEW_RefreshReport(LISTVIEW_INFO *infoPtr, ITERATOR *i, HDC hdc, while(iterator_next(&j)) { LISTVIEW_GetHeaderRect(infoPtr, j.nItem, &rcItem); - Position.x = (j.nItem == 0) ? rcItem.left + Origin.x : Origin.x; if (rgntype == COMPLEXREGION && !((infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT) && j.nItem == 0)) {

1 0

Nikolay Sivov : comctl32/listview: Always forward LVM_GETCOLUMNORDERARRAY to header.
by Alexandre Julliard 30 Mar '15

30 Mar '15

Module: wine Branch: master Commit: 5c2e7075df45370c6d74b230a8531fcea2fd473f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c2e7075df45370c6d74b230a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 28 22:06:26 2015 +0300 comctl32/listview: Always forward LVM_GETCOLUMNORDERARRAY to header. --- dlls/comctl32/listview.c | 9 ++------- dlls/comctl32/tests/listview.c | 22 +++++++++++++++++++++- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 0b3439b..44aaba0 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -6502,14 +6502,9 @@ static BOOL LISTVIEW_GetColumnT(const LISTVIEW_INFO *infoPtr, INT nColumn, LPLVC return TRUE; } - -static BOOL LISTVIEW_GetColumnOrderArray(const LISTVIEW_INFO *infoPtr, INT iCount, LPINT lpiArray) +static inline BOOL LISTVIEW_GetColumnOrderArray(const LISTVIEW_INFO *infoPtr, INT iCount, LPINT lpiArray) { - TRACE("iCount=%d, lpiArray=%p\n", iCount, lpiArray); - - if (!lpiArray) - return FALSE; - + if (!infoPtr->hwndHeader) return FALSE; return SendMessageW(infoPtr->hwndHeader, HDM_GETORDERARRAY, iCount, (LPARAM)lpiArray); } diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 8ce1cfe..0947251 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -176,6 +176,8 @@ static const struct message listview_ownerdata_switchto_seq[] = { static const struct message listview_getorderarray_seq[] = { { LVM_GETCOLUMNORDERARRAY, sent|id|wparam, 2, 0, LISTVIEW_ID }, { HDM_GETORDERARRAY, sent|id|wparam, 2, 0, HEADER_ID }, + { LVM_GETCOLUMNORDERARRAY, sent|id|wparam, 0, 0, LISTVIEW_ID }, + { HDM_GETORDERARRAY, sent|id|wparam, 0, 0, HEADER_ID }, { 0 } }; @@ -1413,13 +1415,28 @@ static void test_items(void) static void test_columns(void) { - HWND hwnd; + HWND hwnd, header; LVCOLUMNA column; LVITEMA item; INT order[2]; CHAR buff[5]; DWORD rc; + hwnd = CreateWindowExA(0, "SysListView32", "foo", LVS_LIST, + 10, 10, 100, 200, hwndparent, NULL, NULL, NULL); + ok(hwnd != NULL, "failed to create listview window\n"); + + header = (HWND)SendMessageA(hwnd, LVM_GETHEADER, 0, 0); + ok(header == NULL, "got %p\n", header); + + rc = SendMessageA(hwnd, LVM_GETCOLUMNORDERARRAY, 2, (LPARAM)&order); + ok(rc == 0, "got %d\n", rc); + + header = (HWND)SendMessageA(hwnd, LVM_GETHEADER, 0, 0); + ok(header == NULL, "got %p\n", header); + + DestroyWindow(hwnd); + hwnd = CreateWindowExA(0, "SysListView32", "foo", LVS_REPORT, 10, 10, 100, 200, hwndparent, NULL, NULL, NULL); ok(hwnd != NULL, "failed to create listview window\n"); @@ -1457,6 +1474,9 @@ static void test_columns(void) ok(order[0] == 0, "Expected order 0, got %d\n", order[0]); ok(order[1] == 1, "Expected order 1, got %d\n", order[1]); + rc = SendMessageA(hwnd, LVM_GETCOLUMNORDERARRAY, 0, 0); + expect(0, rc); + ok_sequence(sequences, LISTVIEW_SEQ_INDEX, listview_getorderarray_seq, "get order array", FALSE); /* after column added subitem is considered as present */

1 0