December 2012 - Wine-commits

Andrew Eikum : winecoreaudio.drv: Improve IsFormatSupported handling.
by Alexandre Julliard 04 Dec '12

04 Dec '12

Module: wine Branch: master Commit: af20740d07a3f29e3e6bb7d5175b45b75059eb3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=af20740d07a3f29e3e6bb7d51… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Dec 3 10:28:07 2012 -0600 winecoreaudio.drv: Improve IsFormatSupported handling. --- dlls/winecoreaudio.drv/mmdevdrv.c | 47 ++++++++++++++++++++++++++++++++---- 1 files changed, 41 insertions(+), 6 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 06f46f7..8ee0dec 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -1131,6 +1131,12 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, if( duration < 3 * period) duration = 3 * period; }else{ + if(fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE){ + if(((WAVEFORMATEXTENSIBLE*)fmt)->dwChannelMask == 0 || + ((WAVEFORMATEXTENSIBLE*)fmt)->dwChannelMask & SPEAKER_RESERVED) + return AUDCLNT_E_UNSUPPORTED_FORMAT; + } + if(!period) period = DefaultPeriod; /* not minimum */ if(period < MinimumPeriod || period > 5000000) @@ -1445,12 +1451,31 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface, dump_fmt(pwfx); - if(outpwfx) + if(outpwfx){ *outpwfx = NULL; + if(mode != AUDCLNT_SHAREMODE_SHARED) + outpwfx = NULL; + } + + if(pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE){ + if(pwfx->nAvgBytesPerSec == 0 || + pwfx->nBlockAlign == 0 || + fmtex->Samples.wValidBitsPerSample > pwfx->wBitsPerSample) + return E_INVALIDARG; + if(fmtex->Samples.wValidBitsPerSample < pwfx->wBitsPerSample) + goto unsupported; + if(mode == AUDCLNT_SHAREMODE_EXCLUSIVE){ + if(fmtex->dwChannelMask == 0 || + fmtex->dwChannelMask & SPEAKER_RESERVED) + goto unsupported; + } + } - if(pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE && - fmtex->dwChannelMask != 0 && - fmtex->dwChannelMask != get_channel_mask(pwfx->nChannels)) + if(pwfx->nBlockAlign != pwfx->nChannels * pwfx->wBitsPerSample / 8 || + pwfx->nAvgBytesPerSec != pwfx->nBlockAlign * pwfx->nSamplesPerSec) + goto unsupported; + + if(pwfx->nChannels == 0) return AUDCLNT_E_UNSUPPORTED_FORMAT; OSSpinLockLock(&This->lock); @@ -1462,10 +1487,20 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface, TRACE("returning %08x\n", S_OK); return S_OK; } - OSSpinLockUnlock(&This->lock); + if(hr != AUDCLNT_E_UNSUPPORTED_FORMAT){ + TRACE("returning %08x\n", hr); + return hr; + } + +unsupported: + if(outpwfx){ + hr = IAudioClient_GetMixFormat(&This->IAudioClient_iface, outpwfx); + if(FAILED(hr)) + return hr; + return S_FALSE; + } - TRACE("returning %08x\n", AUDCLNT_E_UNSUPPORTED_FORMAT); return AUDCLNT_E_UNSUPPORTED_FORMAT; }

1 0

Andrew Eikum : wineoss.drv: Improve IsFormatSupported handling.
by Alexandre Julliard 04 Dec '12

04 Dec '12

Module: wine Branch: master Commit: dc0cef3d3b68ae10c80c13846265a9317eecdfd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc0cef3d3b68ae10c80c13846… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Dec 3 10:28:11 2012 -0600 wineoss.drv: Improve IsFormatSupported handling. --- dlls/wineoss.drv/mmdevdrv.c | 37 ++++++++++++++++++++++++++----------- 1 files changed, 26 insertions(+), 11 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 62ae7ca..9fc6f02 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -837,13 +837,12 @@ static WAVEFORMATEX *clone_format(const WAVEFORMATEX *fmt) return ret; } -static HRESULT setup_oss_device(int fd, const WAVEFORMATEX *fmt, - WAVEFORMATEX **out, BOOL query) +static HRESULT setup_oss_device(AUDCLNT_SHAREMODE mode, int fd, + const WAVEFORMATEX *fmt, WAVEFORMATEX **out) { int tmp, oss_format; double tenth; HRESULT ret = S_OK; - WAVEFORMATEXTENSIBLE *fmtex = (void*)fmt; WAVEFORMATEX *closest = NULL; tmp = oss_format = get_oss_format(fmt); @@ -858,6 +857,15 @@ static HRESULT setup_oss_device(int fd, const WAVEFORMATEX *fmt, return AUDCLNT_E_UNSUPPORTED_FORMAT; } + if(fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && + (fmt->nAvgBytesPerSec == 0 || + fmt->nBlockAlign == 0 || + ((WAVEFORMATEXTENSIBLE*)fmt)->Samples.wValidBitsPerSample > fmt->wBitsPerSample)) + return E_INVALIDARG; + + if(fmt->nChannels == 0) + return AUDCLNT_E_UNSUPPORTED_FORMAT; + closest = clone_format(fmt); if(!closest) return E_OUTOFMEMORY; @@ -885,14 +893,19 @@ static HRESULT setup_oss_device(int fd, const WAVEFORMATEX *fmt, closest->nChannels = tmp; } - if(closest->wFormatTag == WAVE_FORMAT_EXTENSIBLE){ - DWORD mask = get_channel_mask(closest->nChannels); + if(closest->wFormatTag == WAVE_FORMAT_EXTENSIBLE) + ((WAVEFORMATEXTENSIBLE*)closest)->dwChannelMask = get_channel_mask(closest->nChannels); - ((WAVEFORMATEXTENSIBLE*)closest)->dwChannelMask = mask; + if(fmt->nBlockAlign != fmt->nChannels * fmt->wBitsPerSample / 8 || + fmt->nAvgBytesPerSec != fmt->nBlockAlign * fmt->nSamplesPerSec || + (fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && + ((WAVEFORMATEXTENSIBLE*)fmt)->Samples.wValidBitsPerSample < fmt->wBitsPerSample)) + ret = S_FALSE; - if(query && fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && - fmtex->dwChannelMask != 0 && - fmtex->dwChannelMask != mask) + if(mode == AUDCLNT_SHAREMODE_EXCLUSIVE && + fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE){ + if(((WAVEFORMATEXTENSIBLE*)fmt)->dwChannelMask == 0 || + ((WAVEFORMATEXTENSIBLE*)fmt)->dwChannelMask & SPEAKER_RESERVED) ret = S_FALSE; } @@ -904,6 +917,8 @@ static HRESULT setup_oss_device(int fd, const WAVEFORMATEX *fmt, closest->nChannels * closest->wBitsPerSample / 8; closest->nAvgBytesPerSec = closest->nBlockAlign * closest->nSamplesPerSec; + if(closest->wFormatTag == WAVE_FORMAT_EXTENSIBLE) + ((WAVEFORMATEXTENSIBLE*)closest)->Samples.wValidBitsPerSample = closest->wBitsPerSample; *out = closest; } else CoTaskMemFree(closest); @@ -1055,7 +1070,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, return AUDCLNT_E_ALREADY_INITIALIZED; } - hr = setup_oss_device(This->fd, fmt, NULL, FALSE); + hr = setup_oss_device(mode, This->fd, fmt, NULL); if(FAILED(hr)){ LeaveCriticalSection(&This->lock); return hr; @@ -1237,7 +1252,7 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface, return AUDCLNT_E_DEVICE_INVALIDATED; } - ret = setup_oss_device(fd, pwfx, outpwfx, TRUE); + ret = setup_oss_device(mode, fd, pwfx, outpwfx); close(fd);

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 04 Dec '12

04 Dec '12

Module: wine Branch: master Commit: a769e4aeb07a9609ae435f542d4044801e19a920 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a769e4aeb07a9609ae435f542… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Mon Dec 3 22:11:47 2012 +0200 po: Update Lithuanian translation. --- po/lt.po | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/po/lt.po b/po/lt.po index 2434660..3607e91 100644 --- a/po/lt.po +++ b/po/lt.po @@ -641,11 +641,11 @@ msgstr "Kryptis" #: comdlg32.rc:318 view.rc:39 msgid "&Up" -msgstr "&Žemyn" +msgstr "&Aukštyn" #: comdlg32.rc:319 view.rc:40 msgid "&Down" -msgstr "&Aukštyn" +msgstr "&Žemyn" #: comdlg32.rc:321 comdlg32.rc:339 msgid "&Find Next" @@ -12424,11 +12424,11 @@ msgstr "&Sutalpinti į langą" #: view.rc:37 msgid "&Left" -msgstr "&Dešinėn" +msgstr "&Kairėn" #: view.rc:38 msgid "&Right" -msgstr "&Kairėn" +msgstr "&Dešinėn" #: view.rc:46 msgid "Regular Metafile Viewer"

1 0

André Hentschel : winemaker: Output UTF-8 Makefiles.
by Alexandre Julliard 04 Dec '12

04 Dec '12

Module: wine Branch: master Commit: 6541a19907bf2b0f14ad4b3dbb03a0758fd902b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6541a19907bf2b0f14ad4b3db… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Dec 3 19:46:44 2012 +0100 winemaker: Output UTF-8 Makefiles. --- tools/winemaker | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index 4e32fc1..9c5c6a0 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -1,4 +1,5 @@ #!/usr/bin/perl -w +use utf8; use strict; # Copyright 2000-2004 Francois Gouget for CodeWeavers @@ -2387,6 +2388,7 @@ sub generate_project_files($) print STDERR " $!\n"; return; } + binmode( FILEO, ':utf8' ); my $cpp_to_object; if (@$project_settings[$T_FLAGS] & $TF_HASCXX) {

1 0

André Hentschel : psapi/tests: Fix test on win8.
by Alexandre Julliard 04 Dec '12

04 Dec '12

Module: wine Branch: master Commit: cd465edb0002aa1f2829760a9cc296330f929ef9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd465edb0002aa1f2829760a9… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Dec 3 22:55:35 2012 +0100 psapi/tests: Fix test on win8. --- dlls/psapi/tests/psapi_main.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index 312d544..130c33e 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -317,7 +317,8 @@ todo_wine ret = pGetMappedFileNameA(GetCurrentProcess(), base, map_name, 0); ok(!ret, "GetMappedFileName should fail\n"); todo_wine - ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "wrong error %d\n", GetLastError()); SetLastError(0xdeadbeef); ret = pGetMappedFileNameA(GetCurrentProcess(), base, 0, sizeof(map_name));

1 0

Michael Stefaniuc : qmgr: COM cleanup for the IBackgroundCopyManager iface.
by Alexandre Julliard 04 Dec '12

04 Dec '12

Module: wine Branch: master Commit: a3fdfa22ffaf5093bbf5b8a90c4b6544345fba26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3fdfa22ffaf5093bbf5b8a90… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Dec 4 00:57:09 2012 +0100 qmgr: COM cleanup for the IBackgroundCopyManager iface. --- dlls/qmgr/qmgr.c | 72 +++++++++++++++++++---------------------------------- dlls/qmgr/qmgr.h | 2 +- 2 files changed, 27 insertions(+), 47 deletions(-) diff --git a/dlls/qmgr/qmgr.c b/dlls/qmgr/qmgr.c index 1ff6050..55a01e6 100644 --- a/dlls/qmgr/qmgr.c +++ b/dlls/qmgr/qmgr.c @@ -23,52 +23,39 @@ WINE_DEFAULT_DEBUG_CHANNEL(qmgr); -/* Add a reference to the iface pointer */ -static ULONG WINAPI BITS_IBackgroundCopyManager_AddRef( - IBackgroundCopyManager* iface) -{ - return 2; -} +BackgroundCopyManagerImpl globalMgr; -/* Attempt to provide a new interface to interact with iface */ -static HRESULT WINAPI BITS_IBackgroundCopyManager_QueryInterface( - IBackgroundCopyManager* iface, - REFIID riid, - LPVOID *ppvObject) +static HRESULT WINAPI BITS_IBackgroundCopyManager_QueryInterface(IBackgroundCopyManager *iface, + REFIID riid, void **ppv) { - BackgroundCopyManagerImpl * This = (BackgroundCopyManagerImpl *)iface; - - TRACE("IID: %s\n", debugstr_guid(riid)); + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(riid), ppv); - if (IsEqualGUID(riid, &IID_IUnknown) || - IsEqualGUID(riid, &IID_IBackgroundCopyManager)) + if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IBackgroundCopyManager)) { - *ppvObject = &This->lpVtbl; - BITS_IBackgroundCopyManager_AddRef(iface); + *ppv = iface; + IBackgroundCopyManager_AddRef(iface); return S_OK; } - *ppvObject = NULL; + *ppv = NULL; return E_NOINTERFACE; } -/* Release an interface to iface */ -static ULONG WINAPI BITS_IBackgroundCopyManager_Release( - IBackgroundCopyManager* iface) +static ULONG WINAPI BITS_IBackgroundCopyManager_AddRef(IBackgroundCopyManager *iface) +{ + return 2; +} + +static ULONG WINAPI BITS_IBackgroundCopyManager_Release(IBackgroundCopyManager *iface) { return 1; } /*** IBackgroundCopyManager interface methods ***/ -static HRESULT WINAPI BITS_IBackgroundCopyManager_CreateJob( - IBackgroundCopyManager* iface, - LPCWSTR DisplayName, - BG_JOB_TYPE Type, - GUID *pJobId, - IBackgroundCopyJob **ppJob) +static HRESULT WINAPI BITS_IBackgroundCopyManager_CreateJob(IBackgroundCopyManager *iface, + LPCWSTR DisplayName, BG_JOB_TYPE Type, GUID *pJobId, IBackgroundCopyJob **ppJob) { - BackgroundCopyManagerImpl * This = (BackgroundCopyManagerImpl *) iface; BackgroundCopyJobImpl *job; HRESULT hres; TRACE("\n"); @@ -81,35 +68,28 @@ static HRESULT WINAPI BITS_IBackgroundCopyManager_CreateJob( /* Add a reference to the job to job list */ IBackgroundCopyJob_AddRef(*ppJob); job = (BackgroundCopyJobImpl *) *ppJob; - EnterCriticalSection(&This->cs); - list_add_head(&This->jobs, &job->entryFromQmgr); - LeaveCriticalSection(&This->cs); + EnterCriticalSection(&globalMgr.cs); + list_add_head(&globalMgr.jobs, &job->entryFromQmgr); + LeaveCriticalSection(&globalMgr.cs); return S_OK; } -static HRESULT WINAPI BITS_IBackgroundCopyManager_GetJob( - IBackgroundCopyManager* iface, - REFGUID jobID, - IBackgroundCopyJob **ppJob) +static HRESULT WINAPI BITS_IBackgroundCopyManager_GetJob(IBackgroundCopyManager *iface, + REFGUID jobID, IBackgroundCopyJob **ppJob) { FIXME("Not implemented\n"); return E_NOTIMPL; } -static HRESULT WINAPI BITS_IBackgroundCopyManager_EnumJobs( - IBackgroundCopyManager* iface, - DWORD dwFlags, - IEnumBackgroundCopyJobs **ppEnum) +static HRESULT WINAPI BITS_IBackgroundCopyManager_EnumJobs(IBackgroundCopyManager *iface, + DWORD dwFlags, IEnumBackgroundCopyJobs **ppEnum) { TRACE("\n"); return EnumBackgroundCopyJobsConstructor((LPVOID *) ppEnum, iface); } -static HRESULT WINAPI BITS_IBackgroundCopyManager_GetErrorDescription( - IBackgroundCopyManager* iface, - HRESULT hResult, - DWORD LanguageId, - LPWSTR *pErrorDescription) +static HRESULT WINAPI BITS_IBackgroundCopyManager_GetErrorDescription(IBackgroundCopyManager *iface, + HRESULT hResult, DWORD LanguageId, LPWSTR *pErrorDescription) { FIXME("Not implemented\n"); return E_NOTIMPL; @@ -128,7 +108,7 @@ static const IBackgroundCopyManagerVtbl BITS_IBackgroundCopyManager_Vtbl = }; BackgroundCopyManagerImpl globalMgr = { - &BITS_IBackgroundCopyManager_Vtbl, + { &BITS_IBackgroundCopyManager_Vtbl }, { NULL, -1, 0, 0, 0, 0 }, NULL, LIST_INIT(globalMgr.jobs) diff --git a/dlls/qmgr/qmgr.h b/dlls/qmgr/qmgr.h index c504396..1057880 100644 --- a/dlls/qmgr/qmgr.h +++ b/dlls/qmgr/qmgr.h @@ -81,7 +81,7 @@ typedef struct /* Background copy manager vtbl and related data */ typedef struct { - const IBackgroundCopyManagerVtbl *lpVtbl; + IBackgroundCopyManager IBackgroundCopyManager_iface; /* Protects job list, job states, and jobEvent */ CRITICAL_SECTION cs; HANDLE jobEvent;

1 0

Alexandre Julliard : gdi32: Avoid binary ROPs when shrinking in DELETESCANS mode.
by Alexandre Julliard 03 Dec '12

03 Dec '12

Module: wine Branch: master Commit: db3a8d6c0cecfd049c959c75b595d861d292b40f URL: http://source.winehq.org/git/wine.git/?a=commit;h=db3a8d6c0cecfd049c959c75b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 3 17:35:56 2012 +0100 gdi32: Avoid binary ROPs when shrinking in DELETESCANS mode. --- dlls/gdi32/dibdrv/primitives.c | 190 ++++++++++++++++++++++++++++------------ 1 files changed, 132 insertions(+), 58 deletions(-) diff --git a/dlls/gdi32/dibdrv/primitives.c b/dlls/gdi32/dibdrv/primitives.c index 15b333b..d4c9fc3 100644 --- a/dlls/gdi32/dibdrv/primitives.c +++ b/dlls/gdi32/dibdrv/primitives.c @@ -5950,24 +5950,42 @@ static void shrink_row_32(const dib_info *dst_dib, const POINT *dst_start, DWORD *src_ptr = get_pixel_ptr_32( src_dib, src_start->x, src_start->y ); int err = params->err_start; int width; - struct rop_codes codes; - DWORD init_val = (mode == STRETCH_ANDSCANS) ? ~0u : 0u; - BOOL new_pix = TRUE; - rop_codes_from_stretch_mode( mode, &codes ); - for (width = params->length; width; width--) + if (mode == STRETCH_DELETESCANS) { - if (new_pix && !keep_dst) *dst_ptr = init_val; - do_rop_codes_32( dst_ptr, *src_ptr, &codes ); - new_pix = FALSE; - src_ptr += params->src_inc; - if (err > 0) + for (width = params->length; width; width--) { - dst_ptr += params->dst_inc; - new_pix = TRUE; - err += params->err_add_1; + *dst_ptr = *src_ptr; + src_ptr += params->src_inc; + if (err > 0) + { + dst_ptr += params->dst_inc; + err += params->err_add_1; + } + else err += params->err_add_2; + } + } + else + { + struct rop_codes codes; + DWORD init_val = (mode == STRETCH_ANDSCANS) ? ~0u : 0u; + BOOL new_pix = TRUE; + + rop_codes_from_stretch_mode( mode, &codes ); + for (width = params->length; width; width--) + { + if (new_pix && !keep_dst) *dst_ptr = init_val; + do_rop_codes_32( dst_ptr, *src_ptr, &codes ); + new_pix = FALSE; + src_ptr += params->src_inc; + if (err > 0) + { + dst_ptr += params->dst_inc; + new_pix = TRUE; + err += params->err_add_1; + } + else err += params->err_add_2; } - else err += params->err_add_2; } } @@ -5980,26 +5998,46 @@ static void shrink_row_24(const dib_info *dst_dib, const POINT *dst_start, BYTE *src_ptr = get_pixel_ptr_24( src_dib, src_start->x, src_start->y ); int err = params->err_start; int width; - struct rop_codes codes; - BYTE init_val = (mode == STRETCH_ANDSCANS) ? ~0u : 0u; - BOOL new_pix = TRUE; - rop_codes_from_stretch_mode( mode, &codes ); - for (width = params->length; width; width--) + if (mode == STRETCH_DELETESCANS) { - if (new_pix && !keep_dst) memset( dst_ptr, init_val, 3 ); - do_rop_codes_8( dst_ptr, *src_ptr, &codes ); - do_rop_codes_8( dst_ptr + 1, *(src_ptr + 1), &codes ); - do_rop_codes_8( dst_ptr + 2, *(src_ptr + 2), &codes ); - new_pix = FALSE; - src_ptr += 3 * params->src_inc; - if (err > 0) + for (width = params->length; width; width--) { - dst_ptr += 3 * params->dst_inc; - new_pix = TRUE; - err += params->err_add_1; + dst_ptr[0] = src_ptr[0]; + dst_ptr[1] = src_ptr[1]; + dst_ptr[2] = src_ptr[2]; + src_ptr += 3 * params->src_inc; + if (err > 0) + { + dst_ptr += 3 * params->dst_inc; + err += params->err_add_1; + } + else err += params->err_add_2; + } + } + else + { + struct rop_codes codes; + BYTE init_val = (mode == STRETCH_ANDSCANS) ? ~0u : 0u; + BOOL new_pix = TRUE; + + rop_codes_from_stretch_mode( mode, &codes ); + for (width = params->length; width; width--) + { + if (new_pix && !keep_dst) memset( dst_ptr, init_val, 3 ); + do_rop_codes_8( dst_ptr, *src_ptr, &codes ); + do_rop_codes_8( dst_ptr + 1, *(src_ptr + 1), &codes ); + do_rop_codes_8( dst_ptr + 2, *(src_ptr + 2), &codes ); + new_pix = FALSE; + src_ptr += 3 * params->src_inc; + if (err > 0) + { + dst_ptr += 3 * params->dst_inc; + new_pix = TRUE; + err += params->err_add_1; + } + else err += params->err_add_2; } - else err += params->err_add_2; } } @@ -6012,24 +6050,42 @@ static void shrink_row_16(const dib_info *dst_dib, const POINT *dst_start, WORD *src_ptr = get_pixel_ptr_16( src_dib, src_start->x, src_start->y ); int err = params->err_start; int width; - struct rop_codes codes; - WORD init_val = (mode == STRETCH_ANDSCANS) ? ~0u : 0u; - BOOL new_pix = TRUE; - rop_codes_from_stretch_mode( mode, &codes ); - for (width = params->length; width; width--) + if (mode == STRETCH_DELETESCANS) { - if (new_pix && !keep_dst) *dst_ptr = init_val; - do_rop_codes_16( dst_ptr, *src_ptr, &codes ); - new_pix = FALSE; - src_ptr += params->src_inc; - if (err > 0) + for (width = params->length; width; width--) { - dst_ptr += params->dst_inc; - new_pix = TRUE; - err += params->err_add_1; + *dst_ptr = *src_ptr; + src_ptr += params->src_inc; + if (err > 0) + { + dst_ptr += params->dst_inc; + err += params->err_add_1; + } + else err += params->err_add_2; + } + } + else + { + struct rop_codes codes; + WORD init_val = (mode == STRETCH_ANDSCANS) ? ~0u : 0u; + BOOL new_pix = TRUE; + + rop_codes_from_stretch_mode( mode, &codes ); + for (width = params->length; width; width--) + { + if (new_pix && !keep_dst) *dst_ptr = init_val; + do_rop_codes_16( dst_ptr, *src_ptr, &codes ); + new_pix = FALSE; + src_ptr += params->src_inc; + if (err > 0) + { + dst_ptr += params->dst_inc; + new_pix = TRUE; + err += params->err_add_1; + } + else err += params->err_add_2; } - else err += params->err_add_2; } } @@ -6042,24 +6098,42 @@ static void shrink_row_8(const dib_info *dst_dib, const POINT *dst_start, BYTE *src_ptr = get_pixel_ptr_8( src_dib, src_start->x, src_start->y ); int err = params->err_start; int width; - struct rop_codes codes; - BYTE init_val = (mode == STRETCH_ANDSCANS) ? ~0u : 0u; - BOOL new_pix = TRUE; - rop_codes_from_stretch_mode( mode, &codes ); - for (width = params->length; width; width--) + if (mode == STRETCH_DELETESCANS) { - if (new_pix && !keep_dst) *dst_ptr = init_val; - do_rop_codes_8( dst_ptr, *src_ptr, &codes ); - new_pix = FALSE; - src_ptr += params->src_inc; - if (err > 0) + for (width = params->length; width; width--) { - dst_ptr += params->dst_inc; - new_pix = TRUE; - err += params->err_add_1; + *dst_ptr = *src_ptr; + src_ptr += params->src_inc; + if (err > 0) + { + dst_ptr += params->dst_inc; + err += params->err_add_1; + } + else err += params->err_add_2; + } + } + else + { + struct rop_codes codes; + BYTE init_val = (mode == STRETCH_ANDSCANS) ? ~0u : 0u; + BOOL new_pix = TRUE; + + rop_codes_from_stretch_mode( mode, &codes ); + for (width = params->length; width; width--) + { + if (new_pix && !keep_dst) *dst_ptr = init_val; + do_rop_codes_8( dst_ptr, *src_ptr, &codes ); + new_pix = FALSE; + src_ptr += params->src_inc; + if (err > 0) + { + dst_ptr += params->dst_inc; + new_pix = TRUE; + err += params->err_add_1; + } + else err += params->err_add_2; } - else err += params->err_add_2; } }

1 0

Alexandre Julliard : gdi32: Don' t copy unnecessary rows when shrinking in DELETESCANS mode.
by Alexandre Julliard 03 Dec '12

03 Dec '12

Module: wine Branch: master Commit: 3a4864714dcf515ce1c3271280d68a93591eb3a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a4864714dcf515ce1c327128… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 3 17:48:16 2012 +0100 gdi32: Don't copy unnecessary rows when shrinking in DELETESCANS mode. --- dlls/gdi32/dibdrv/bitblt.c | 5 ++--- dlls/gdi32/dibdrv/primitives.c | 10 ++++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/dibdrv/bitblt.c b/dlls/gdi32/dibdrv/bitblt.c index e65dcbc..a9c32bf 100644 --- a/dlls/gdi32/dibdrv/bitblt.c +++ b/dlls/gdi32/dibdrv/bitblt.c @@ -1230,12 +1230,11 @@ DWORD stretch_bitmapinfo( const BITMAPINFO *src_info, void *src_bits, struct bit else { int merged_rows = 0; - int faster_mode = mode; while (v_params.length--) { - if (hstretch) faster_mode = merged_rows ? mode : STRETCH_DELETESCANS; - row_fn( &dst_dib, &dst_start, &src_dib, &src_start, &h_params, faster_mode, merged_rows != 0 ); + if (mode != STRETCH_DELETESCANS || !merged_rows) + row_fn( &dst_dib, &dst_start, &src_dib, &src_start, &h_params, mode, merged_rows != 0 ); merged_rows++; if (err > 0) diff --git a/dlls/gdi32/dibdrv/primitives.c b/dlls/gdi32/dibdrv/primitives.c index d4c9fc3..1569bc0 100644 --- a/dlls/gdi32/dibdrv/primitives.c +++ b/dlls/gdi32/dibdrv/primitives.c @@ -5698,7 +5698,7 @@ static void stretch_row_32(const dib_info *dst_dib, const POINT *dst_start, int err = params->err_start; int width; - if (mode == STRETCH_DELETESCANS) + if (mode == STRETCH_DELETESCANS || !keep_dst) { for (width = params->length; width; width--) { @@ -5741,7 +5741,7 @@ static void stretch_row_24(const dib_info *dst_dib, const POINT *dst_start, int err = params->err_start; int width; - if (mode == STRETCH_DELETESCANS) + if (mode == STRETCH_DELETESCANS || !keep_dst) { for (width = params->length; width; width--) { @@ -5788,7 +5788,7 @@ static void stretch_row_16(const dib_info *dst_dib, const POINT *dst_start, int err = params->err_start; int width; - if (mode == STRETCH_DELETESCANS) + if (mode == STRETCH_DELETESCANS || !keep_dst) { for (width = params->length; width; width--) { @@ -5831,7 +5831,7 @@ static void stretch_row_8(const dib_info *dst_dib, const POINT *dst_start, int err = params->err_start; int width; - if (mode == STRETCH_DELETESCANS) + if (mode == STRETCH_DELETESCANS || !keep_dst) { for (width = params->length; width; width--) { @@ -5876,6 +5876,7 @@ static void stretch_row_4(const dib_info *dst_dib, const POINT *dst_start, struct rop_codes codes; BYTE src_val; + if (!keep_dst) mode = STRETCH_DELETESCANS; rop_codes_from_stretch_mode( mode, &codes ); for (width = params->length; width; width--) { @@ -5911,6 +5912,7 @@ static void stretch_row_1(const dib_info *dst_dib, const POINT *dst_start, struct rop_codes codes; BYTE src_val; + if (!keep_dst) mode = STRETCH_DELETESCANS; rop_codes_from_stretch_mode( mode, &codes ); for (width = params->length; width; width--) {

1 0

Erich Hoover : advapi32: Return immediately for unsupported [Get|Set] NamedSecurityInfo objects.
by Alexandre Julliard 03 Dec '12

03 Dec '12

Module: wine Branch: master Commit: e3986462dfd807ff60265e79cd79017e1cee3800 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3986462dfd807ff60265e79c… Author: Erich Hoover <ehoover(a)mines.edu> Date: Sun Dec 2 15:08:21 2012 -0700 advapi32: Return immediately for unsupported [Get|Set]NamedSecurityInfo objects. --- dlls/advapi32/security.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 5a481ed..e000854 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -3928,6 +3928,11 @@ DWORD WINAPI SetNamedSecurityInfoW(LPWSTR pObjectName, TRACE( "%s %d %d %p %p %p %p\n", debugstr_w(pObjectName), ObjectType, SecurityInfo, psidOwner, psidGroup, pDacl, pSacl); + if (ObjectType != SE_FILE_OBJECT) + { + FIXME( "Object type %d is not currently supported.\n", ObjectType ); + return ERROR_SUCCESS; + } if (!pObjectName) return ERROR_INVALID_PARAMETER; if (!RtlDosPathNameToNtPathName_U( pObjectName, &nameW, NULL, NULL )) @@ -5465,6 +5470,16 @@ DWORD WINAPI GetNamedSecurityInfoW( LPWSTR name, SE_OBJECT_TYPE type, TRACE( "%s %d %d %p %p %p %p %p\n", debugstr_w(name), type, info, owner, group, dacl, sacl, descriptor ); + if (type != SE_FILE_OBJECT) + { + FIXME( "Object type %d is not currently supported.\n", type ); + if (owner) *owner = NULL; + if (group) *group = NULL; + if (dacl) *dacl = NULL; + if (sacl) *sacl = NULL; + if (descriptor) *descriptor = NULL; + return ERROR_SUCCESS; + } /* A NULL descriptor is allowed if any one of the other pointers is not NULL */ if (!name || !(owner||group||dacl||sacl||descriptor) ) return ERROR_INVALID_PARAMETER;

1 0

Erich Hoover : advapi32: Fix NamedSecurityInfo test crash on some systems.
by Alexandre Julliard 03 Dec '12

03 Dec '12

Module: wine Branch: master Commit: 22863acfcc8f52f2e96bc1088d303d5ac8137fc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22863acfcc8f52f2e96bc1088… Author: Erich Hoover <ehoover(a)mines.edu> Date: Sun Dec 2 15:55:21 2012 -0700 advapi32: Fix NamedSecurityInfo test crash on some systems. --- dlls/advapi32/tests/security.c | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 8c209bf..fbbbd17 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -3005,9 +3005,8 @@ static void test_SetEntriesInAclA(void) static void test_GetNamedSecurityInfoA(void) { - char b[sizeof(TOKEN_USER) + sizeof(SID) + sizeof(DWORD)*SID_MAX_SUB_AUTHORITIES]; - char admin_ptr[sizeof(SID)+sizeof(ULONG)*SID_MAX_SUB_AUTHORITIES], dacl[100]; - DWORD sid_size = sizeof(admin_ptr), l = sizeof(b); + char admin_ptr[sizeof(SID)+sizeof(ULONG)*SID_MAX_SUB_AUTHORITIES], dacl[100], *user; + DWORD sid_size = sizeof(admin_ptr), user_size; char invalid_path[] = "/an invalid file path"; PSID admin_sid = (PSID) admin_ptr, user_sid; char sd[SECURITY_DESCRIPTOR_MIN_LENGTH]; @@ -3041,9 +3040,14 @@ static void test_GetNamedSecurityInfoA(void) win_skip("Failed to get current user token\n"); return; } - GetTokenInformation(token, TokenUser, b, l, &l); + bret = GetTokenInformation(token, TokenUser, NULL, 0, &user_size); + ok(!bret && (GetLastError() == ERROR_INSUFFICIENT_BUFFER), + "GetTokenInformation(TokenUser) failed with error %d\n", GetLastError()); + user = HeapAlloc(GetProcessHeap(), 0, user_size); + bret = GetTokenInformation(token, TokenUser, user, user_size, &user_size); + ok(bret, "GetTokenInformation(TokenUser) failed with error %d\n", GetLastError()); CloseHandle( token ); - user_sid = ((TOKEN_USER *)b)->User.Sid; + user_sid = ((TOKEN_USER *)user)->User.Sid; bret = GetWindowsDirectoryA(windows_dir, MAX_PATH); ok(bret, "GetWindowsDirectory failed with error %d\n", GetLastError()); @@ -3055,6 +3059,7 @@ static void test_GetNamedSecurityInfoA(void) if (error != ERROR_SUCCESS && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)) { win_skip("GetNamedSecurityInfoA is not implemented\n"); + HeapFree(GetProcessHeap(), 0, user); return; } ok(!error, "GetNamedSecurityInfo failed with error %d\n", error); @@ -3082,6 +3087,7 @@ static void test_GetNamedSecurityInfoA(void) if(isNT4) { win_skip("NT4 does not support GetNamedSecutityInfo with a NULL descriptor\n"); + HeapFree(GetProcessHeap(), 0, user); return; } @@ -3113,6 +3119,7 @@ static void test_GetNamedSecurityInfoA(void) bret = InitializeAcl(pDacl, sizeof(dacl), ACL_REVISION); ok(bret, "Failed to initialize ACL.\n"); bret = pAddAccessAllowedAceEx(pDacl, ACL_REVISION, 0, GENERIC_ALL, user_sid); + HeapFree(GetProcessHeap(), 0, user); ok(bret, "Failed to add Current User to ACL.\n"); bret = pAddAccessAllowedAceEx(pDacl, ACL_REVISION, 0, GENERIC_ALL, admin_sid); ok(bret, "Failed to add Administrator Group to ACL.\n");

1 0