wine-commits December 2012

wine-commits@winehq.org

2 participants
549 discussions

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

04 Dec '12

Module: wine Branch: master Commit: 1d1aa7e8a14fe69aad145807d1f922b261a04b97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d1aa7e8a14fe69aad145807d… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Dec 3 10:27:56 2012 -0600 winealsa.drv: Improve IsFormatSupported handling. --- dlls/winealsa.drv/mmdevdrv.c | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 9275fbc..6d86f55 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1230,6 +1230,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) @@ -1587,6 +1593,15 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface, out = NULL; } + 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; + EnterCriticalSection(&This->lock); if((err = snd_pcm_hw_params_any(This->pcm_handle, This->hw_params)) < 0){ @@ -1664,6 +1679,19 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface, if(closest->wFormatTag == WAVE_FORMAT_EXTENSIBLE) ((WAVEFORMATEXTENSIBLE*)closest)->dwChannelMask = get_channel_mask(closest->nChannels); + 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)) + hr = S_FALSE; + + if(mode == AUDCLNT_SHAREMODE_EXCLUSIVE && + fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE){ + if(((WAVEFORMATEXTENSIBLE*)fmt)->dwChannelMask == 0 || + ((WAVEFORMATEXTENSIBLE*)fmt)->dwChannelMask & SPEAKER_RESERVED) + hr = S_FALSE; + } + exit: LeaveCriticalSection(&This->lock); HeapFree(GetProcessHeap(), 0, formats); @@ -1676,6 +1704,8 @@ exit: 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);

1 0

Henri Verbeet : d3d10core: Implement d3d10_device_GSGetConstantBuffers().
by Alexandre Julliard 04 Dec '12

04 Dec '12

Module: wine Branch: master Commit: d906c94382b9ace2c1206b6b3c2e63b2fb29a70c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d906c94382b9ace2c1206b6b3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 3 21:16:34 2012 +0100 d3d10core: Implement d3d10_device_GSGetConstantBuffers(). --- dlls/d3d10core/device.c | 21 ++++++++++++++++++++- dlls/wined3d/device.c | 13 +++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 4 files changed, 35 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index fbebf9e..438beb0 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -669,8 +669,27 @@ static void STDMETHODCALLTYPE d3d10_device_IAGetIndexBuffer(ID3D10Device *iface, static void STDMETHODCALLTYPE d3d10_device_GSGetConstantBuffers(ID3D10Device *iface, UINT start_slot, UINT buffer_count, ID3D10Buffer **buffers) { - FIXME("iface %p, start_slot %u, buffer_count %u, buffers %p stub!\n", + struct d3d10_device *device = impl_from_ID3D10Device(iface); + unsigned int i; + + TRACE("iface %p, start_slot %u, buffer_count %u, buffers %p.\n", iface, start_slot, buffer_count, buffers); + + for (i = 0; i < buffer_count; ++i) + { + struct wined3d_buffer *wined3d_buffer; + struct d3d10_buffer *buffer_impl; + + if (!(wined3d_buffer = wined3d_device_get_gs_cb(device->wined3d_device, start_slot + i))) + { + buffers[i] = NULL; + continue; + } + + buffer_impl = wined3d_buffer_get_parent(wined3d_buffer); + buffers[i] = &buffer_impl->ID3D10Buffer_iface; + ID3D10Buffer_AddRef(buffers[i]); + } } static void STDMETHODCALLTYPE d3d10_device_GSGetShader(ID3D10Device *iface, ID3D10GeometryShader **shader) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6ea2f85..c293636 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3168,6 +3168,19 @@ void CDECL wined3d_device_set_gs_cb(struct wined3d_device *device, UINT idx, str } } +struct wined3d_buffer * CDECL wined3d_device_get_gs_cb(const struct wined3d_device *device, UINT idx) +{ + TRACE("device %p, idx %u.\n", device, idx); + + if (idx >= MAX_CONSTANT_BUFFERS) + { + WARN("Invalid constant buffer index %u.\n", idx); + return NULL; + } + + return device->stateBlock->state.gs_cb[idx]; +} + /* Context activation is done by the caller. */ /* Do not call while under the GL lock. */ #define copy_and_next(dest, src, size) memcpy(dest, src, size); dest += (size) diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index d08c33f..c97e7af 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -66,6 +66,7 @@ @ cdecl wined3d_device_get_front_buffer_data(ptr long ptr) @ cdecl wined3d_device_get_gamma_ramp(ptr long ptr) @ cdecl wined3d_device_get_geometry_shader(ptr) +@ cdecl wined3d_device_get_gs_cb(ptr long) @ cdecl wined3d_device_get_index_buffer(ptr ptr) @ cdecl wined3d_device_get_light(ptr long ptr) @ cdecl wined3d_device_get_light_enable(ptr long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 206c8ef..82287df 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2127,6 +2127,7 @@ HRESULT __cdecl wined3d_device_get_front_buffer_data(const struct wined3d_device void __cdecl wined3d_device_get_gamma_ramp(const struct wined3d_device *device, UINT swapchain_idx, struct wined3d_gamma_ramp *ramp); struct wined3d_shader * __cdecl wined3d_device_get_geometry_shader(const struct wined3d_device *device); +struct wined3d_buffer * __cdecl wined3d_device_get_gs_cb(const struct wined3d_device *device, UINT idx); struct wined3d_buffer * __cdecl wined3d_device_get_index_buffer(const struct wined3d_device *device, enum wined3d_format_id *format); HRESULT __cdecl wined3d_device_get_light(const struct wined3d_device *device,

1 0

Henri Verbeet : d3d10core: Implement d3d10_device_GSSetConstantBuffers().
by Alexandre Julliard 04 Dec '12

04 Dec '12

Module: wine Branch: master Commit: feda45279ee8bf77ac3440a77117474eec512711 URL: http://source.winehq.org/git/wine.git/?a=commit;h=feda45279ee8bf77ac3440a77… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 3 21:16:33 2012 +0100 d3d10core: Implement d3d10_device_GSSetConstantBuffers(). --- dlls/d3d10core/device.c | 13 ++++++++++++- dlls/wined3d/device.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/wined3d/stateblock.c | 9 +++++++++ dlls/wined3d/wined3d.spec | 1 + dlls/wined3d/wined3d_private.h | 1 + include/wine/wined3d.h | 1 + 6 files changed, 63 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 25439b0..fbebf9e 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -271,8 +271,19 @@ static void STDMETHODCALLTYPE d3d10_device_DrawInstanced(ID3D10Device *iface, static void STDMETHODCALLTYPE d3d10_device_GSSetConstantBuffers(ID3D10Device *iface, UINT start_slot, UINT buffer_count, ID3D10Buffer *const *buffers) { - FIXME("iface %p, start_slot %u, buffer_count %u, buffers %p stub!\n", + struct d3d10_device *device = impl_from_ID3D10Device(iface); + unsigned int i; + + TRACE("iface %p, start_slot %u, buffer_count %u, buffers %p.\n", iface, start_slot, buffer_count, buffers); + + for (i = 0; i < buffer_count; ++i) + { + struct d3d10_buffer *buffer = unsafe_impl_from_ID3D10Buffer(buffers[i]); + + wined3d_device_set_gs_cb(device->wined3d_device, start_slot + i, + buffer ? buffer->wined3d_buffer : NULL); + } } static void STDMETHODCALLTYPE d3d10_device_GSSetShader(ID3D10Device *iface, ID3D10GeometryShader *shader) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 57e1de9..6ea2f85 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3129,6 +3129,45 @@ struct wined3d_shader * CDECL wined3d_device_get_geometry_shader(const struct wi return device->stateBlock->state.geometry_shader; } +void CDECL wined3d_device_set_gs_cb(struct wined3d_device *device, UINT idx, struct wined3d_buffer *buffer) +{ + struct wined3d_buffer *prev; + + TRACE("device %p, idx %u, buffer %p.\n", device, idx, buffer); + + if (idx >= MAX_CONSTANT_BUFFERS) + { + WARN("Invalid constant buffer index %u.\n", idx); + return; + } + + prev = device->updateStateBlock->state.gs_cb[idx]; + device->updateStateBlock->state.gs_cb[idx] = buffer; + + if (device->isRecordingState) + { + if (buffer) + wined3d_buffer_incref(buffer); + if (prev) + wined3d_buffer_decref(prev); + return; + } + + if (prev != buffer) + { + if (buffer) + { + InterlockedIncrement(&buffer->resource.bind_count); + wined3d_buffer_incref(buffer); + } + if (prev) + { + InterlockedDecrement(&prev->resource.bind_count); + wined3d_buffer_decref(prev); + } + } +} + /* Context activation is done by the caller. */ /* Do not call while under the GL lock. */ #define copy_and_next(dest, src, size) memcpy(dest, src, size); dest += (size) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 11d8fa8..6499877 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -536,6 +536,15 @@ void stateblock_unbind_resources(struct wined3d_stateblock *stateblock) wined3d_shader_decref(shader); } + for (i = 0; i < MAX_CONSTANT_BUFFERS; ++i) + { + if ((buffer = state->gs_cb[i])) + { + state->gs_cb[i] = NULL; + wined3d_buffer_decref(buffer); + } + } + if ((shader = state->pixel_shader)) { state->pixel_shader = NULL; diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index b7b04df..d08c33f 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -116,6 +116,7 @@ @ cdecl wined3d_device_set_dialog_box_mode(ptr long) @ cdecl wined3d_device_set_gamma_ramp(ptr long long ptr) @ cdecl wined3d_device_set_geometry_shader(ptr ptr) +@ cdecl wined3d_device_set_gs_cb(ptr long ptr) @ cdecl wined3d_device_set_index_buffer(ptr ptr long) @ cdecl wined3d_device_set_light(ptr long ptr) @ cdecl wined3d_device_set_light_enable(ptr long long) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ddf1fa2..4d7d456 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2306,6 +2306,7 @@ struct wined3d_state float *vs_consts_f; struct wined3d_shader *geometry_shader; + struct wined3d_buffer *gs_cb[MAX_CONSTANT_BUFFERS]; struct wined3d_shader *pixel_shader; BOOL ps_consts_b[MAX_CONST_B]; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 7b1e043..206c8ef 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2206,6 +2206,7 @@ HRESULT __cdecl wined3d_device_set_dialog_box_mode(struct wined3d_device *device void __cdecl wined3d_device_set_gamma_ramp(const struct wined3d_device *device, UINT swapchain_idx, DWORD flags, const struct wined3d_gamma_ramp *ramp); void __cdecl wined3d_device_set_geometry_shader(struct wined3d_device *device, struct wined3d_shader *shader); +void __cdecl wined3d_device_set_gs_cb(struct wined3d_device *device, UINT idx, struct wined3d_buffer *buffer); void __cdecl wined3d_device_set_index_buffer(struct wined3d_device *device, struct wined3d_buffer *index_buffer, enum wined3d_format_id format_id); HRESULT __cdecl wined3d_device_set_light(struct wined3d_device *device,

1 0

Henri Verbeet : d3dx9: Avoid LPD3DXANIMATIONSET.
by Alexandre Julliard 04 Dec '12

04 Dec '12

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 04 Dec '12

04 Dec '12

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

Henri Verbeet : d3dx9: Avoid LPD3DXANIMATIONCALLBACKHANDLER.
by Alexandre Julliard 04 Dec '12

04 Dec '12

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

Jacek Caban : wininet: Fixed NULL cookie data pointer handling in InternetGetCookieA.
by Alexandre Julliard 03 Dec '12

03 Dec '12

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

Aurimas Fišeras : comdlg32: Move and resize controls of the Find dialog to better fit translations.
by Alexandre Julliard 03 Dec '12

03 Dec '12

Module: wine Branch: master Commit: ed42609f54252fa510eaf3d356823917e83459e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed42609f54252fa510eaf3d35… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Sun Dec 2 21:31:15 2012 +0200 comdlg32: Move and resize controls of the Find dialog to better fit translations. --- dlls/comdlg32/comdlg32.rc | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/comdlg32/comdlg32.rc b/dlls/comdlg32/comdlg32.rc index 7040fcc..7658e81 100644 --- a/dlls/comdlg32/comdlg32.rc +++ b/dlls/comdlg32/comdlg32.rc @@ -312,11 +312,11 @@ FONT 8, "MS Shell Dlg" { LTEXT "Fi&nd What:", -1, 4, 8, 52, 8 EDITTEXT edt1, 57, 7, 148, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - CHECKBOX "Match &Whole Word Only", chx1, 4, 26, 120, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "Match &Case", chx2, 4, 42, 120, 12, BS_AUTOCHECKBOX | WS_TABSTOP - GROUPBOX "Direction", grp1, 127, 26, 78, 28 - CONTROL "&Up", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 131, 38, 35, 12 - CONTROL "&Down", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 163, 38, 35, 12 + CHECKBOX "Match &Whole Word Only", chx1, 4, 26, 140, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "Match &Case", chx2, 4, 42, 140, 12, BS_AUTOCHECKBOX | WS_TABSTOP + GROUPBOX "Direction", grp1, 147, 21, 58, 38 + CONTROL "&Up", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 151, 30, 48, 12 + CONTROL "&Down", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 151, 44, 48, 12 DEFPUSHBUTTON "&Find Next", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "Cancel", IDCANCEL , 212, 24, 60, 14, WS_GROUP | WS_TABSTOP

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

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2012