December 2012 - Wine-Commits

Henri Verbeet : d3dx9: Avoid LPD3DXANIMATIONSET.
by Alexandre Julliard Dec. 4, 2012

Dec. 4, 2012

Module: wine Branch: master Commit: 6b8dd67bef652ac4d2cf9c19dc22d6ab2e22eb65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b8dd67bef652ac4d2cf9c19d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 3 21:16:32 2012 +0100 d3dx9: Avoid LPD3DXANIMATIONSET. --- include/d3dx9anim.h | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/d3dx9anim.h b/include/d3dx9anim.h index 2cff387..5e9ef58 100644 --- a/include/d3dx9anim.h +++ b/include/d3dx9anim.h @@ -322,16 +322,16 @@ DECLARE_INTERFACE_(ID3DXAnimationController, IUnknown) STDMETHOD_(UINT, GetMaxNumEvents)(THIS) PURE; STDMETHOD(RegisterAnimationOutput)(THIS_ LPCSTR name, D3DXMATRIX *matrix, D3DXVECTOR3 *scale, D3DXQUATERNION *rotation, D3DXVECTOR3 *translation) PURE; - STDMETHOD(RegisterAnimationSet)(THIS_ LPD3DXANIMATIONSET anim_set) PURE; - STDMETHOD(UnregisterAnimationSet)(THIS_ LPD3DXANIMATIONSET anim_set) PURE; + STDMETHOD(RegisterAnimationSet)(THIS_ ID3DXAnimationSet *anim_set) PURE; + STDMETHOD(UnregisterAnimationSet)(THIS_ ID3DXAnimationSet *anim_set) PURE; STDMETHOD_(UINT, GetNumAnimationSets)(THIS) PURE; - STDMETHOD(GetAnimationSet)(THIS_ UINT index, LPD3DXANIMATIONSET *anim_set) PURE; - STDMETHOD(GetAnimationSetByName)(THIS_ LPCSTR name, LPD3DXANIMATIONSET *anim_set) PURE; + STDMETHOD(GetAnimationSet)(THIS_ UINT index, ID3DXAnimationSet **anim_set) PURE; + STDMETHOD(GetAnimationSetByName)(THIS_ const char *name, ID3DXAnimationSet **anim_set) PURE; STDMETHOD(AdvanceTime)(THIS_ double time_delta, ID3DXAnimationCallbackHandler **callback_handler) PURE; STDMETHOD(ResetTime)(THIS) PURE; STDMETHOD_(DOUBLE, GetTime)(THIS) PURE; - STDMETHOD(SetTrackAnimationSet)(THIS_ UINT track, LPD3DXANIMATIONSET anim_set) PURE; - STDMETHOD(GetTrackAnimationSet)(THIS_ UINT track, LPD3DXANIMATIONSET *anim_set) PURE; + STDMETHOD(SetTrackAnimationSet)(THIS_ UINT track, ID3DXAnimationSet *anim_set) PURE; + STDMETHOD(GetTrackAnimationSet)(THIS_ UINT track, ID3DXAnimationSet **anim_set) PURE; STDMETHOD(GetTrackPriority)(THIS_ UINT track, D3DXPRIORITY_TYPE *priority) PURE; STDMETHOD(SetTrackSpeed)(THIS_ UINT track, FLOAT speed) PURE; STDMETHOD(SetTrackWeight)(THIS_ UINT track, FLOAT weight) PURE;

1 0

Henri Verbeet : d3dx9: Avoid LPD3DXKEYFRAMEDANIMATIONSET.
by Alexandre Julliard Dec. 4, 2012

Dec. 4, 2012

Module: wine Branch: master Commit: 4791dfe3a307bbb85baf32c273571556514066bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=4791dfe3a307bbb85baf32c27… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 3 21:16:31 2012 +0100 d3dx9: Avoid LPD3DXKEYFRAMEDANIMATIONSET. --- include/d3dx9anim.h | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/include/d3dx9anim.h b/include/d3dx9anim.h index 6806622..2cff387 100644 --- a/include/d3dx9anim.h +++ b/include/d3dx9anim.h @@ -391,7 +391,9 @@ LPD3DXFRAME WINAPI D3DXFrameFind(CONST D3DXFRAME*, LPCSTR); HRESULT WINAPI D3DXFrameRegisterNamedMatrices(D3DXFRAME *frame_root, ID3DXAnimationController *animation_controller); UINT WINAPI D3DXFrameNumNamedMatrices(CONST D3DXFRAME *frame_root); HRESULT WINAPI D3DXFrameCalculateBoundingSphere(CONST D3DXFRAME*, LPD3DXVECTOR3, FLOAT*); -HRESULT WINAPI D3DXCreateKeyframedAnimationSet(LPCSTR, DOUBLE, D3DXPLAYBACK_TYPE, UINT, UINT, CONST D3DXKEY_CALLBACK*, LPD3DXKEYFRAMEDANIMATIONSET*); +HRESULT WINAPI D3DXCreateKeyframedAnimationSet(const char *name, double ticks_per_second, + D3DXPLAYBACK_TYPE playback_type, UINT animation_count, UINT callback_key_count, + const D3DXKEY_CALLBACK *callback_keys, ID3DXKeyframedAnimationSet **animation_set); HRESULT WINAPI D3DXCreateCompressedAnimationSet(const char *name, double ticks_per_second, D3DXPLAYBACK_TYPE playback_type, ID3DXBuffer *compressed_data, UINT callback_key_count, const D3DXKEY_CALLBACK *callback_keys, ID3DXCompressedAnimationSet **animation_set);

1 0

Andrew Eikum : winecoreaudio.drv: Convert some OSStatus errors to HRESULT.
by Alexandre Julliard Dec. 4, 2012

Dec. 4, 2012

Module: wine Branch: master Commit: e84f05bcbcbf2092b8c09f6440cc951b66285af1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e84f05bcbcbf2092b8c09f644… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Dec 3 10:28:02 2012 -0600 winecoreaudio.drv: Convert some OSStatus errors to HRESULT. --- dlls/winecoreaudio.drv/mmdevdrv.c | 45 ++++++++++++++++++++++++------------ 1 files changed, 30 insertions(+), 15 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index da0123b..06f46f7 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -55,6 +55,7 @@ #include <libkern/OSAtomic.h> #include <CoreAudio/CoreAudio.h> #include <AudioToolbox/AudioQueue.h> +#include <AudioToolbox/AudioFormat.h> WINE_DEFAULT_DEBUG_CHANNEL(coreaudio); @@ -281,6 +282,19 @@ int WINAPI AUDDRV_GetPriority(void) return Priority_Neutral; } +static HRESULT osstatus_to_hresult(OSStatus sc) +{ + switch(sc){ + case kAudioFormatUnsupportedDataFormatError: + case kAudioFormatUnknownFormatError: + case kAudioDeviceUnsupportedFormatError: + return AUDCLNT_E_UNSUPPORTED_FORMAT; + case kAudioHardwareBadDeviceError: + return AUDCLNT_E_DEVICE_INVALIDATED; + } + return E_FAIL; +} + static void set_device_guid(EDataFlow flow, HKEY drv_key, const WCHAR *key_name, GUID *guid) { @@ -390,7 +404,7 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, NULL, &devsize); if(sc != noErr){ WARN("Getting _Devices property size failed: %lx\n", sc); - return E_FAIL; + return osstatus_to_hresult(sc); } devices = HeapAlloc(GetProcessHeap(), 0, devsize); @@ -402,7 +416,7 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, if(sc != noErr){ WARN("Getting _Devices property failed: %lx\n", sc); HeapFree(GetProcessHeap(), 0, devices); - return E_FAIL; + return osstatus_to_hresult(sc); } ndevices = devsize / sizeof(AudioDeviceID); @@ -959,7 +973,7 @@ static HRESULT ca_setup_aqueue(AudioDeviceID did, EDataFlow flow, sc = AudioObjectGetPropertyData(did, &addr, 0, NULL, &size, &uid); if(sc != noErr){ WARN("Unable to get _DeviceUID property: %lx\n", sc); - return E_FAIL; + return osstatus_to_hresult(sc); } hr = ca_get_audiodesc(&desc, fmt); @@ -981,14 +995,15 @@ static HRESULT ca_setup_aqueue(AudioDeviceID did, EDataFlow flow, if(sc != noErr){ WARN("Unable to create AudioQueue: %lx\n", sc); CFRelease(uid); - return E_FAIL; + return osstatus_to_hresult(sc); } sc = AudioQueueSetProperty(*aqueue, kAudioQueueProperty_CurrentDevice, &uid, sizeof(uid)); if(sc != noErr){ + WARN("Unable to change AQueue device: %lx\n", sc); CFRelease(uid); - return E_FAIL; + return osstatus_to_hresult(sc); } CFRelease(uid); @@ -1183,7 +1198,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, This->fmt = NULL; OSSpinLockUnlock(&This->lock); WARN("Couldn't allocate buffer: %lx\n", sc); - return E_FAIL; + return osstatus_to_hresult(sc); } buf->buf->mUserData = buf; @@ -1280,7 +1295,7 @@ static HRESULT ca_get_max_stream_latency(ACImpl *This, UInt32 *max) &size); if(sc != noErr){ WARN("Unable to get size for _Streams property: %lx\n", sc); - return E_FAIL; + return osstatus_to_hresult(sc); } ids = HeapAlloc(GetProcessHeap(), 0, size); @@ -1291,7 +1306,7 @@ static HRESULT ca_get_max_stream_latency(ACImpl *This, UInt32 *max) if(sc != noErr){ WARN("Unable to get _Streams property: %lx\n", sc); HeapFree(GetProcessHeap(), 0, ids); - return E_FAIL; + return osstatus_to_hresult(sc); } nstreams = size / sizeof(AudioStreamID); @@ -1349,7 +1364,7 @@ static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient *iface, if(sc != noErr){ WARN("Couldn't get _Latency property: %lx\n", sc); OSSpinLockUnlock(&This->lock); - return E_FAIL; + return osstatus_to_hresult(sc); } hr = ca_get_max_stream_latency(This, &stream_latency); @@ -1486,7 +1501,7 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, if(sc != noErr){ CoTaskMemFree(fmt); WARN("Unable to get size for _StreamConfiguration property: %lx\n", sc); - return E_FAIL; + return osstatus_to_hresult(sc); } buffers = HeapAlloc(GetProcessHeap(), 0, size); @@ -1501,7 +1516,7 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, CoTaskMemFree(fmt); HeapFree(GetProcessHeap(), 0, buffers); WARN("Unable to get _StreamConfiguration property: %lx\n", sc); - return E_FAIL; + return osstatus_to_hresult(sc); } fmt->Format.nChannels = 0; @@ -1518,7 +1533,7 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, if(sc != noErr){ CoTaskMemFree(fmt); WARN("Unable to get _NominalSampleRate property: %lx\n", sc); - return E_FAIL; + return osstatus_to_hresult(sc); } fmt->Format.nSamplesPerSec = rate; @@ -1609,7 +1624,7 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient *iface) if(sc != noErr){ OSSpinLockUnlock(&This->lock); WARN("Unable to start audio queue: %lx\n", sc); - return E_FAIL; + return osstatus_to_hresult(sc); } This->playing = StatePlaying; @@ -1672,7 +1687,7 @@ static HRESULT WINAPI AudioClient_Stop(IAudioClient *iface) if(sc != noErr){ OSSpinLockUnlock(&This->lock); WARN("Unable to pause audio queue: %lx\n", sc); - return E_FAIL; + return osstatus_to_hresult(sc); } This->playing = StateStopped; @@ -1724,7 +1739,7 @@ static HRESULT WINAPI AudioClient_Reset(IAudioClient *iface) if(sc != noErr){ OSSpinLockUnlock(&This->lock); WARN("Unable to reset audio queue: %lx\n", sc); - return E_FAIL; + return osstatus_to_hresult(sc); } /* AQReset is synchronous */

1 0

André Hentschel : psapi/tests: Fix test on win8.
by Alexandre Julliard Dec. 4, 2012

Dec. 4, 2012

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

Henri Verbeet : d3dx9: Avoid LPD3DXANIMATIONCALLBACKHANDLER.
by Alexandre Julliard Dec. 4, 2012

Dec. 4, 2012

Module: wine Branch: master Commit: 1fb2d2c6a0781b22d25331ceb30b1e9e33eacd97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fb2d2c6a0781b22d25331ceb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 3 21:16:30 2012 +0100 d3dx9: Avoid LPD3DXANIMATIONCALLBACKHANDLER. --- include/d3dx9anim.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/d3dx9anim.h b/include/d3dx9anim.h index f70faac..6806622 100644 --- a/include/d3dx9anim.h +++ b/include/d3dx9anim.h @@ -327,7 +327,7 @@ DECLARE_INTERFACE_(ID3DXAnimationController, IUnknown) STDMETHOD_(UINT, GetNumAnimationSets)(THIS) PURE; STDMETHOD(GetAnimationSet)(THIS_ UINT index, LPD3DXANIMATIONSET *anim_set) PURE; STDMETHOD(GetAnimationSetByName)(THIS_ LPCSTR name, LPD3DXANIMATIONSET *anim_set) PURE; - STDMETHOD(AdvanceTime)(THIS_ DOUBLE time_delta, LPD3DXANIMATIONCALLBACKHANDLER *callback_handler) PURE; + STDMETHOD(AdvanceTime)(THIS_ double time_delta, ID3DXAnimationCallbackHandler **callback_handler) PURE; STDMETHOD(ResetTime)(THIS) PURE; STDMETHOD_(DOUBLE, GetTime)(THIS) PURE; STDMETHOD(SetTrackAnimationSet)(THIS_ UINT track, LPD3DXANIMATIONSET anim_set) PURE;

1 0

André Hentschel : winemaker: Output UTF-8 Makefiles.
by Alexandre Julliard Dec. 4, 2012

Dec. 4, 2012

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

Alexandre Julliard : gdi32: Avoid binary ROPs when shrinking in DELETESCANS mode.
by Alexandre Julliard Dec. 3, 2012

Dec. 3, 2012

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

Erich Hoover : advapi32: Fix NamedSecurityInfo test crash on some systems.
by Alexandre Julliard Dec. 3, 2012

Dec. 3, 2012

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

Jacek Caban : wininet: Fixed NULL cookie data pointer handling in InternetGetCookieA.
by Alexandre Julliard Dec. 3, 2012

Dec. 3, 2012

Module: wine Branch: master Commit: 21e7e28d6458b8303097a985f29adcf90fa612f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21e7e28d6458b8303097a985f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 3 15:01:08 2012 +0100 wininet: Fixed NULL cookie data pointer handling in InternetGetCookieA. --- dlls/wininet/cookie.c | 13 ++++++++----- dlls/wininet/tests/internet.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 5 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index 0a65e4c..42c7525 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -657,12 +657,12 @@ BOOL WINAPI InternetGetCookieW(LPCWSTR lpszUrl, LPCWSTR lpszCookieName, BOOL WINAPI InternetGetCookieA(LPCSTR lpszUrl, LPCSTR lpszCookieName, LPSTR lpCookieData, LPDWORD lpdwSize) { + WCHAR *url, *name; DWORD len; - LPWSTR szCookieData = NULL, url, name; BOOL r; - TRACE("(%s,%s,%p)\n", debugstr_a(lpszUrl), debugstr_a(lpszCookieName), - lpCookieData); + TRACE("(%s %s %p %p(%u))\n", debugstr_a(lpszUrl), debugstr_a(lpszCookieName), + lpCookieData, lpdwSize, lpdwSize ? *lpdwSize : 0); url = heap_strdupAtoW(lpszUrl); name = heap_strdupAtoW(lpszCookieName); @@ -670,6 +670,8 @@ BOOL WINAPI InternetGetCookieA(LPCSTR lpszUrl, LPCSTR lpszCookieName, r = InternetGetCookieW( url, name, NULL, &len ); if( r ) { + WCHAR *szCookieData; + szCookieData = heap_alloc(len * sizeof(WCHAR)); if( !szCookieData ) { @@ -680,10 +682,11 @@ BOOL WINAPI InternetGetCookieA(LPCSTR lpszUrl, LPCSTR lpszCookieName, r = InternetGetCookieW( url, name, szCookieData, &len ); *lpdwSize = WideCharToMultiByte( CP_ACP, 0, szCookieData, len, - lpCookieData, *lpdwSize, NULL, NULL ); + lpCookieData, lpCookieData ? *lpdwSize : 0, NULL, NULL ); + + heap_free( szCookieData ); } } - heap_free( szCookieData ); heap_free( name ); heap_free( url ); return r; diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index cf1fc4e..1b4ee46 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -370,6 +370,10 @@ static void test_complicated_cookie(void) CHAR buffer[1024]; CHAR user[256]; + WCHAR wbuf[1024]; + + static const WCHAR testing_example_comW[] = + {'h','t','t','p',':','/','/','t','e','s','t','i','n','g','.','e','x','a','m','p','l','e','.','c','o','m',0}; ret = InternetSetCookie("http://www.example.com/bar",NULL,"A=B; domain=.example.com"); ok(ret == TRUE,"InternetSetCookie failed\n"); @@ -391,8 +395,16 @@ static void test_complicated_cookie(void) ok(ret == TRUE,"InternetSetCookie failed\n"); len = 1024; + ret = InternetGetCookie("http://testing.example.com", NULL, NULL, &len); + ok(ret == TRUE,"InternetGetCookie failed\n"); + ok(len == 19, "len = %u\n", len); + + len = 1024; + memset(buffer, 0xac, sizeof(buffer)); ret = InternetGetCookie("http://testing.example.com", NULL, buffer, &len); ok(ret == TRUE,"InternetGetCookie failed\n"); + ok(len == 19, "len = %u\n", len); + ok(strlen(buffer) == 18, "strlen(buffer) = %u\n", lstrlenA(buffer)); ok(strstr(buffer,"A=B")!=NULL,"A=B missing\n"); ok(strstr(buffer,"C=D")!=NULL,"C=D missing\n"); ok(strstr(buffer,"E=F")!=NULL,"E=F missing\n"); @@ -403,6 +415,18 @@ static void test_complicated_cookie(void) ok(strstr(buffer,"O=P")==NULL,"O=P present\n"); len = 1024; + ret = InternetGetCookieW(testing_example_comW, NULL, NULL, &len); + ok(ret == TRUE,"InternetGetCookieW failed\n"); + ok(len == 38, "len = %u\n", len); + + len = 1024; + memset(wbuf, 0xac, sizeof(wbuf)); + ret = InternetGetCookieW(testing_example_comW, NULL, wbuf, &len); + ok(ret == TRUE,"InternetGetCookieW failed\n"); + ok(len == 19, "len = %u\n", len); + ok(lstrlenW(wbuf) == 18, "strlenW(wbuf) = %u\n", lstrlenW(wbuf)); + + len = 1024; ret = InternetGetCookie("http://testing.example.com/foobar", NULL, buffer, &len); ok(ret == TRUE,"InternetGetCookie failed\n"); ok(strstr(buffer,"A=B")!=NULL,"A=B missing\n"); @@ -465,6 +489,7 @@ static void test_complicated_cookie(void) len = 1024; ret = InternetGetCookie("http://testing.example.com/bar/foo", NULL, buffer, &len); ok(ret == TRUE,"InternetGetCookie failed\n"); + ok(len == 24, "len = %u\n", 24); ok(strstr(buffer,"A=B")!=NULL,"A=B missing\n"); ok(strstr(buffer,"C=D")!=NULL,"C=D missing\n"); ok(strstr(buffer,"E=F")!=NULL,"E=F missing\n"); @@ -474,6 +499,12 @@ static void test_complicated_cookie(void) ok(strstr(buffer,"M=N")==NULL,"M=N present\n"); ok(strstr(buffer,"O=P")==NULL,"O=P present\n"); + /* Cookie name argument is not implemented */ + len = 1024; + ret = InternetGetCookie("http://testing.example.com/bar/foo", "A", buffer, &len); + ok(ret == TRUE,"InternetGetCookie failed\n"); + ok(len == 24, "len = %u\n", 24); + /* test persistent cookies */ ret = InternetSetCookie("http://testing.example.com", NULL, "A=B; expires=Fri, 01-Jan-2038 00:00:00 GMT"); ok(ret, "InternetSetCookie failed with error %d\n", GetLastError());

1 0

Erich Hoover : advapi32: Return immediately for unsupported [Get|Set] NamedSecurityInfo objects.
by Alexandre Julliard Dec. 3, 2012

Dec. 3, 2012

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