May 2011 - Wine-commits - list.winehq.org

Andrew Eikum : winealsa.drv: Implement volume control interfaces.
by Alexandre Julliard 09 May '11

09 May '11

Module: wine Branch: master Commit: ae9338c136f1df582912e107716511c4bf93a7eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae9338c136f1df582912e1077… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri May 6 10:34:22 2011 -0500 winealsa.drv: Implement volume control interfaces. --- dlls/winealsa.drv/mmdevdrv.c | 483 +++++++++++++++++++++++++++++++++++++++--- 1 files changed, 456 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ae9338c136f1df582912e…

1 0

Andrew Eikum : wineoss.drv: Move IAudioClock closer to its related interfaces.
by Alexandre Julliard 09 May '11

09 May '11

Module: wine Branch: master Commit: 836c5fa5bced39376f44feab74ddeaf03924ec1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=836c5fa5bced39376f44feab7… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri May 6 10:34:25 2011 -0500 wineoss.drv: Move IAudioClock closer to its related interfaces. --- dlls/wineoss.drv/mmdevdrv.c | 292 +++++++++++++++++++++--------------------- 1 files changed, 146 insertions(+), 146 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index ff21cd6..8b2c005 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1667,6 +1667,152 @@ static const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl = AudioCaptureClient_GetNextPacketSize }; +static HRESULT WINAPI AudioClock_QueryInterface(IAudioClock *iface, + REFIID riid, void **ppv) +{ + ACImpl *This = impl_from_IAudioClock(iface); + + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); + + if(!ppv) + return E_POINTER; + *ppv = NULL; + + if(IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IAudioClock)) + *ppv = iface; + else if(IsEqualIID(riid, &IID_IAudioClock2)) + *ppv = &This->IAudioClock2_iface; + if(*ppv){ + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; + } + + WARN("Unknown interface %s\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI AudioClock_AddRef(IAudioClock *iface) +{ + ACImpl *This = impl_from_IAudioClock(iface); + return IAudioClient_AddRef(&This->IAudioClient_iface); +} + +static ULONG WINAPI AudioClock_Release(IAudioClock *iface) +{ + ACImpl *This = impl_from_IAudioClock(iface); + return IAudioClient_Release(&This->IAudioClient_iface); +} + +static HRESULT WINAPI AudioClock_GetFrequency(IAudioClock *iface, UINT64 *freq) +{ + ACImpl *This = impl_from_IAudioClock(iface); + + TRACE("(%p)->(%p)\n", This, freq); + + *freq = This->fmt->nSamplesPerSec; + + return S_OK; +} + +static HRESULT WINAPI AudioClock_GetPosition(IAudioClock *iface, UINT64 *pos, + UINT64 *qpctime) +{ + ACImpl *This = impl_from_IAudioClock(iface); + UINT32 pad; + HRESULT hr; + + TRACE("(%p)->(%p, %p)\n", This, pos, qpctime); + + if(!pos) + return E_POINTER; + + EnterCriticalSection(&This->lock); + + hr = IAudioClient_GetCurrentPadding(&This->IAudioClient_iface, &pad); + if(FAILED(hr)){ + LeaveCriticalSection(&This->lock); + return hr; + } + + if(This->dataflow == eRender) + *pos = This->written_frames - pad; + else if(This->dataflow == eCapture) + *pos = This->written_frames + pad; + + LeaveCriticalSection(&This->lock); + + if(qpctime){ + LARGE_INTEGER stamp, freq; + QueryPerformanceCounter(&stamp); + QueryPerformanceFrequency(&freq); + *qpctime = (stamp.QuadPart * (INT64)10000000) / freq.QuadPart; + } + + return S_OK; +} + +static HRESULT WINAPI AudioClock_GetCharacteristics(IAudioClock *iface, + DWORD *chars) +{ + ACImpl *This = impl_from_IAudioClock(iface); + + TRACE("(%p)->(%p)\n", This, chars); + + if(!chars) + return E_POINTER; + + *chars = AUDIOCLOCK_CHARACTERISTIC_FIXED_FREQ; + + return S_OK; +} + +static const IAudioClockVtbl AudioClock_Vtbl = +{ + AudioClock_QueryInterface, + AudioClock_AddRef, + AudioClock_Release, + AudioClock_GetFrequency, + AudioClock_GetPosition, + AudioClock_GetCharacteristics +}; + +static HRESULT WINAPI AudioClock2_QueryInterface(IAudioClock2 *iface, + REFIID riid, void **ppv) +{ + ACImpl *This = impl_from_IAudioClock2(iface); + return IAudioClock_QueryInterface(&This->IAudioClock_iface, riid, ppv); +} + +static ULONG WINAPI AudioClock2_AddRef(IAudioClock2 *iface) +{ + ACImpl *This = impl_from_IAudioClock2(iface); + return IAudioClient_AddRef(&This->IAudioClient_iface); +} + +static ULONG WINAPI AudioClock2_Release(IAudioClock2 *iface) +{ + ACImpl *This = impl_from_IAudioClock2(iface); + return IAudioClient_Release(&This->IAudioClient_iface); +} + +static HRESULT WINAPI AudioClock2_GetDevicePosition(IAudioClock2 *iface, + UINT64 *pos, UINT64 *qpctime) +{ + ACImpl *This = impl_from_IAudioClock2(iface); + + FIXME("(%p)->(%p, %p)\n", This, pos, qpctime); + + return E_NOTIMPL; +} + +static const IAudioClock2Vtbl AudioClock2_Vtbl = +{ + AudioClock2_QueryInterface, + AudioClock2_AddRef, + AudioClock2_Release, + AudioClock2_GetDevicePosition +}; + static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client) { AudioSessionWrapper *ret; @@ -2009,149 +2155,3 @@ static const ISimpleAudioVolumeVtbl SimpleAudioVolume_Vtbl = SimpleAudioVolume_SetMute, SimpleAudioVolume_GetMute }; - -static HRESULT WINAPI AudioClock_QueryInterface(IAudioClock *iface, - REFIID riid, void **ppv) -{ - ACImpl *This = impl_from_IAudioClock(iface); - - TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); - - if(!ppv) - return E_POINTER; - *ppv = NULL; - - if(IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IAudioClock)) - *ppv = iface; - else if(IsEqualIID(riid, &IID_IAudioClock2)) - *ppv = &This->IAudioClock2_iface; - if(*ppv){ - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; - } - - WARN("Unknown interface %s\n", debugstr_guid(riid)); - return E_NOINTERFACE; -} - -static ULONG WINAPI AudioClock_AddRef(IAudioClock *iface) -{ - ACImpl *This = impl_from_IAudioClock(iface); - return IAudioClient_AddRef(&This->IAudioClient_iface); -} - -static ULONG WINAPI AudioClock_Release(IAudioClock *iface) -{ - ACImpl *This = impl_from_IAudioClock(iface); - return IAudioClient_Release(&This->IAudioClient_iface); -} - -static HRESULT WINAPI AudioClock_GetFrequency(IAudioClock *iface, UINT64 *freq) -{ - ACImpl *This = impl_from_IAudioClock(iface); - - TRACE("(%p)->(%p)\n", This, freq); - - *freq = This->fmt->nSamplesPerSec; - - return S_OK; -} - -static HRESULT WINAPI AudioClock_GetPosition(IAudioClock *iface, UINT64 *pos, - UINT64 *qpctime) -{ - ACImpl *This = impl_from_IAudioClock(iface); - UINT32 pad; - HRESULT hr; - - TRACE("(%p)->(%p, %p)\n", This, pos, qpctime); - - if(!pos) - return E_POINTER; - - EnterCriticalSection(&This->lock); - - hr = IAudioClient_GetCurrentPadding(&This->IAudioClient_iface, &pad); - if(FAILED(hr)){ - LeaveCriticalSection(&This->lock); - return hr; - } - - if(This->dataflow == eRender) - *pos = This->written_frames - pad; - else if(This->dataflow == eCapture) - *pos = This->written_frames + pad; - - LeaveCriticalSection(&This->lock); - - if(qpctime){ - LARGE_INTEGER stamp, freq; - QueryPerformanceCounter(&stamp); - QueryPerformanceFrequency(&freq); - *qpctime = (stamp.QuadPart * (INT64)10000000) / freq.QuadPart; - } - - return S_OK; -} - -static HRESULT WINAPI AudioClock_GetCharacteristics(IAudioClock *iface, - DWORD *chars) -{ - ACImpl *This = impl_from_IAudioClock(iface); - - TRACE("(%p)->(%p)\n", This, chars); - - if(!chars) - return E_POINTER; - - *chars = AUDIOCLOCK_CHARACTERISTIC_FIXED_FREQ; - - return S_OK; -} - -static const IAudioClockVtbl AudioClock_Vtbl = -{ - AudioClock_QueryInterface, - AudioClock_AddRef, - AudioClock_Release, - AudioClock_GetFrequency, - AudioClock_GetPosition, - AudioClock_GetCharacteristics -}; - -static HRESULT WINAPI AudioClock2_QueryInterface(IAudioClock2 *iface, - REFIID riid, void **ppv) -{ - ACImpl *This = impl_from_IAudioClock2(iface); - return IAudioClock_QueryInterface(&This->IAudioClock_iface, riid, ppv); -} - -static ULONG WINAPI AudioClock2_AddRef(IAudioClock2 *iface) -{ - ACImpl *This = impl_from_IAudioClock2(iface); - return IAudioClient_AddRef(&This->IAudioClient_iface); -} - -static ULONG WINAPI AudioClock2_Release(IAudioClock2 *iface) -{ - ACImpl *This = impl_from_IAudioClock2(iface); - return IAudioClient_Release(&This->IAudioClient_iface); -} - -static HRESULT WINAPI AudioClock2_GetDevicePosition(IAudioClock2 *iface, - UINT64 *pos, UINT64 *qpctime) -{ - ACImpl *This = impl_from_IAudioClock2(iface); - - FIXME("(%p)->(%p, %p)\n", This, pos, qpctime); - - return E_NOTIMPL; -} - -static const IAudioClock2Vtbl AudioClock2_Vtbl = -{ - AudioClock2_QueryInterface, - AudioClock2_AddRef, - AudioClock2_Release, - AudioClock2_GetDevicePosition -};

1 0

Andrew Eikum : wineoss.drv: Implement volume control interfaces.
by Alexandre Julliard 09 May '11

09 May '11

Module: wine Branch: master Commit: 733ed828bec3d5b70d989b65a3c2d7ad2fd08ddd URL: http://source.winehq.org/git/wine.git/?a=commit;h=733ed828bec3d5b70d989b65a… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri May 6 10:34:27 2011 -0500 wineoss.drv: Implement volume control interfaces. --- dlls/wineoss.drv/mmdevdrv.c | 576 ++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 547 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=733ed828bec3d5b70d989…

1 0

Marcus Meissner : oleaut32: Fixed offset calculation (Coverity).
by Alexandre Julliard 09 May '11

09 May '11

Module: wine Branch: master Commit: 37046546af67012680548e674213e477ae0e3917 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37046546af67012680548e674… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri May 6 16:28:45 2011 +0200 oleaut32: Fixed offset calculation (Coverity). --- dlls/oleaut32/typelib2.c | 28 ++++++++++++++-------------- tools/widl/write_msft.c | 20 ++++++++++---------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index f87ed9f..e9c7613 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -173,7 +173,7 @@ typedef struct tagICreateTypeLib2Impl MSFT_Header typelib_header; INT helpStringDll; MSFT_pSeg typelib_segdir[MSFT_SEG_MAX]; - char *typelib_segment_data[MSFT_SEG_MAX]; + unsigned char *typelib_segment_data[MSFT_SEG_MAX]; int typelib_segment_block_length[MSFT_SEG_MAX]; int typelib_guids; /* Number of defined typelib guids */ @@ -520,7 +520,7 @@ static int ctl2_encode_string( * Converts string stored in typelib data to unicode. */ static void ctl2_decode_string( - char *data, /* [I] String to be decoded */ + unsigned char *data,/* [I] String to be decoded */ WCHAR **string) /* [O] Decoded string */ { int i, length; @@ -569,7 +569,7 @@ static int ctl2_alloc_segment( } while ((This->typelib_segdir[segment].length + size) > This->typelib_segment_block_length[segment]) { - char *block; + unsigned char *block; block_size = This->typelib_segment_block_length[segment]; block = heap_realloc(This->typelib_segment_data[segment], block_size << 1); @@ -580,7 +580,7 @@ static int ctl2_alloc_segment( ICreateTypeInfo2Impl *typeinfo; for (typeinfo = This->typeinfos; typeinfo; typeinfo = typeinfo->next_typeinfo) { - typeinfo->typeinfo = (void *)&block[((char *)typeinfo->typeinfo) - This->typelib_segment_data[segment]]; + typeinfo->typeinfo = (void *)&block[((unsigned char *)typeinfo->typeinfo) - This->typelib_segment_data[segment]]; } } @@ -745,14 +745,14 @@ static int ctl2_alloc_string( { int length; int offset; - char *string_space; + unsigned char *string_space; char *encoded_string; length = ctl2_encode_string(This, string, &encoded_string); for (offset = 0; offset < This->typelib_segdir[MSFT_SEG_STRING].length; - offset += ((((This->typelib_segment_data[MSFT_SEG_STRING][offset + 1] << 8) & 0xff) - | (This->typelib_segment_data[MSFT_SEG_STRING][offset + 0] & 0xff)) + 5) & ~3) { + offset += (((This->typelib_segment_data[MSFT_SEG_STRING][offset + 1] << 8) | + This->typelib_segment_data[MSFT_SEG_STRING][offset + 0]) + 5) & ~3) { if (!memcmp(encoded_string, This->typelib_segment_data[MSFT_SEG_STRING] + offset, length)) return offset; } @@ -832,8 +832,8 @@ static int ctl2_alloc_importfile( encoded_string[0] |= 1; for (offset = 0; offset < This->typelib_segdir[MSFT_SEG_IMPORTFILES].length; - offset += ((((((This->typelib_segment_data[MSFT_SEG_IMPORTFILES][offset + 0xd] << 8) & 0xff00) - | (This->typelib_segment_data[MSFT_SEG_IMPORTFILES][offset + 0xc] & 0xff)) >> 2) + 5) & 0xfffc) + 0xc) { + offset += (((((This->typelib_segment_data[MSFT_SEG_IMPORTFILES][offset + 0xd] << 8) | + This->typelib_segment_data[MSFT_SEG_IMPORTFILES][offset + 0xc]) >> 2) + 5) & 0xfffc) + 0xc) { if (!memcmp(encoded_string, This->typelib_segment_data[MSFT_SEG_IMPORTFILES] + offset + 0xc, length)) return offset; } @@ -1009,7 +1009,7 @@ static HRESULT ctl2_decode_variant( int data_offs, /* [I] Offset within the data array, or the encoded value itself */ VARIANT *value) /* [O] Decoded value */ { - char *encoded_data; + unsigned char *encoded_data; VARTYPE type; if (data_offs & 0x80000000) { @@ -2338,7 +2338,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetFuncAndParamNames( ICreateTypeInfo2Impl *This = (ICreateTypeInfo2Impl *)iface; CyclicList *iter, *iter2; int offset, len, i; - char *namedata; + unsigned char *namedata; TRACE("(%p %d %p %d)\n", This, index, names, cNames); @@ -2358,7 +2358,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetFuncAndParamNames( return TYPE_E_ELEMENTNOTFOUND; TRACE("function name %s\n", debugstr_w(names[0])); - len = ctl2_encode_name(This->typelib, names[0], &namedata); + len = ctl2_encode_name(This->typelib, names[0], (char**)&namedata); for(iter2=This->typedata->next->next; iter2!=This->typedata->next; iter2=iter2->next) { int cmp = memcmp(namedata, This->typelib->typelib_segment_data[MSFT_SEG_NAME]+iter2->name+8, len); @@ -2409,7 +2409,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetVarName( ICreateTypeInfo2Impl *This = (ICreateTypeInfo2Impl *)iface; CyclicList *iter; int offset, i; - char *namedata; + unsigned char *namedata; TRACE("(%p,%d,%s)\n", This, index, debugstr_w(szName)); @@ -3619,7 +3619,7 @@ static HRESULT WINAPI ITypeInfo2_fnGetRefTypeInfo( impfile = (MSFT_ImpFile*)&This->typelib->typelib_segment_data[MSFT_SEG_IMPORTFILES][impinfo->oImpFile]; guid = (MSFT_GuidEntry*)&This->typelib->typelib_segment_data[MSFT_SEG_GUID][impinfo->oGuid]; - ctl2_decode_string(impfile->filename, &filename); + ctl2_decode_string((unsigned char*)impfile->filename, &filename); hres = LoadTypeLib(filename, &tl); if(FAILED(hres)) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index f11de5c..33b99e7 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -84,7 +84,7 @@ typedef struct _msft_typelib_t typelib_t *typelib; MSFT_Header typelib_header; MSFT_pSeg typelib_segdir[MSFT_SEG_MAX]; - char *typelib_segment_data[MSFT_SEG_MAX]; + unsigned char *typelib_segment_data[MSFT_SEG_MAX]; int typelib_segment_block_length[MSFT_SEG_MAX]; INT typelib_typeinfo_offsets[0x200]; /* Hope that's enough. */ @@ -399,7 +399,7 @@ static int ctl2_alloc_segment( } while ((typelib->typelib_segdir[segment].length + size) > typelib->typelib_segment_block_length[segment]) { - char *block; + unsigned char *block; block_size = typelib->typelib_segment_block_length[segment]; block = xrealloc(typelib->typelib_segment_data[segment], block_size << 1); @@ -409,7 +409,7 @@ static int ctl2_alloc_segment( msft_typeinfo_t *typeinfo; for (typeinfo = typelib->typeinfos; typeinfo; typeinfo = typeinfo->next_typeinfo) { - typeinfo->typeinfo = (void *)&block[((char *)typeinfo->typeinfo) - typelib->typelib_segment_data[segment]]; + typeinfo->typeinfo = (void *)&block[((unsigned char *)typeinfo->typeinfo) - typelib->typelib_segment_data[segment]]; } } @@ -570,14 +570,14 @@ static int ctl2_alloc_string( { int length; int offset; - char *string_space; + unsigned char *string_space; char *encoded_string; length = ctl2_encode_string(string, &encoded_string); for (offset = 0; offset < typelib->typelib_segdir[MSFT_SEG_STRING].length; - offset += ((((typelib->typelib_segment_data[MSFT_SEG_STRING][offset + 1] << 8) & 0xff) - | (typelib->typelib_segment_data[MSFT_SEG_STRING][offset + 0] & 0xff)) + 5) & ~3) { + offset += (((typelib->typelib_segment_data[MSFT_SEG_STRING][offset + 1] << 8) | + typelib->typelib_segment_data[MSFT_SEG_STRING][offset + 0]) + 5) & ~3) { if (!memcmp(encoded_string, typelib->typelib_segment_data[MSFT_SEG_STRING] + offset, length)) return offset; } @@ -653,8 +653,8 @@ static int alloc_importfile( encoded_string[0] |= 1; for (offset = 0; offset < typelib->typelib_segdir[MSFT_SEG_IMPORTFILES].length; - offset += ((((typelib->typelib_segment_data[MSFT_SEG_IMPORTFILES][offset + 0xd] << 8) & 0xff) - | (typelib->typelib_segment_data[MSFT_SEG_IMPORTFILES][offset + 0xc] & 0xff)) >> 2) + 0xc) { + offset += (((typelib->typelib_segment_data[MSFT_SEG_IMPORTFILES][offset + 0xd] << 8) | + typelib->typelib_segment_data[MSFT_SEG_IMPORTFILES][offset + 0xc]) >> 2) + 0xc) { if (!memcmp(encoded_string, typelib->typelib_segment_data[MSFT_SEG_IMPORTFILES] + offset + 0xc, length)) return offset; } @@ -1267,7 +1267,7 @@ static HRESULT add_func_desc(msft_typeinfo_t* typeinfo, var_t *func, int index) int decoded_size, extra_attr = 0; int num_params = 0, num_optional = 0, num_defaults = 0; var_t *arg; - char *namedata; + unsigned char *namedata; const attr_t *attr; unsigned int funcflags = 0, callconv = 4 /* CC_STDCALL */; unsigned int funckind, invokekind = 1 /* INVOKE_FUNC */; @@ -1611,7 +1611,7 @@ static HRESULT add_var_desc(msft_typeinfo_t *typeinfo, UINT index, var_t* var) int alignment; int varflags = 0; const attr_t *attr; - char *namedata; + unsigned char *namedata; int var_num = (typeinfo->typeinfo->cElement >> 16) & 0xffff; chat("add_var_desc(%d, %s)\n", index, var->name);

1 0

Austin English : kernel32/tests: Fix typo in test failure message.
by Alexandre Julliard 09 May '11

09 May '11

Module: wine Branch: master Commit: 689840babbfa64ee39c413e0e0274a943dfd41b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=689840babbfa64ee39c413e0e… Author: Austin English <austinenglish(a)gmail.com> Date: Fri May 6 14:10:29 2011 -0500 kernel32/tests: Fix typo in test failure message. --- dlls/kernel32/tests/thread.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 373eea7..e35e0e4 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -955,7 +955,7 @@ static void test_SetThreadContext(void) prevcount, GetLastError() ); WaitForSingleObject( thread, INFINITE ); - ok( test_value == 10, "test_value %d instead of 20\n", test_value ); + ok( test_value == 10, "test_value %d\n", test_value ); ctx.ContextFlags = CONTEXT_FULL; SetLastError(0xdeadbeef);

1 0

Thomas Mullaly : urlmon: Stop binding with E_ABORT if the client returns that from OnStartBinding.
by Alexandre Julliard 09 May '11

09 May '11

Module: wine Branch: master Commit: dad5913823b8d3c951093529e4122bf49b471da9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dad5913823b8d3c951093529e… Author: Thomas Mullaly <tmullaly(a)codeweavers.com> Date: Sun May 1 23:29:53 2011 -0400 urlmon: Stop binding with E_ABORT if the client returns that from OnStartBinding. --- dlls/urlmon/binding.c | 2 +- dlls/urlmon/tests/url.c | 122 +++++++++++++++++++++++++++++++--------------- 2 files changed, 83 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dad5913823b8d3c951093…

1 0

Karsten Elfenbein : wininet: Follow 307 temporary redirect.
by Alexandre Julliard 09 May '11

09 May '11

Module: wine Branch: master Commit: 5b173cb405a5859976022482cb62a769f92dfef8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b173cb405a5859976022482c… Author: Karsten Elfenbein <kelfe(a)gmx.de> Date: Sun May 8 12:29:06 2011 +0200 wininet: Follow 307 temporary redirect. --- dlls/wininet/http.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index d925975..b246d67 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4415,6 +4415,7 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, dwBufferSize=sizeof(szNewLocation); if ((dwStatusCode == HTTP_STATUS_REDIRECT || dwStatusCode == HTTP_STATUS_MOVED || + dwStatusCode == HTTP_STATUS_REDIRECT_KEEP_VERB || dwStatusCode == HTTP_STATUS_REDIRECT_METHOD) && HTTP_HttpQueryInfoW(request,HTTP_QUERY_LOCATION,szNewLocation,&dwBufferSize,NULL) == ERROR_SUCCESS) { @@ -4574,7 +4575,10 @@ static DWORD HTTP_HttpEndRequestW(http_request_t *request, DWORD dwFlags, DWORD_ { DWORD dwCode,dwCodeLength = sizeof(DWORD); if (HTTP_HttpQueryInfoW(request, HTTP_QUERY_FLAG_NUMBER|HTTP_QUERY_STATUS_CODE, &dwCode, &dwCodeLength, NULL) == ERROR_SUCCESS - && (dwCode == 302 || dwCode == 301 || dwCode == 303)) + && (dwCode == HTTP_STATUS_REDIRECT || + dwCode == HTTP_STATUS_MOVED || + dwCode == HTTP_STATUS_REDIRECT_METHOD || + dwCode == HTTP_STATUS_REDIRECT_KEEP_VERB)) { WCHAR *new_url, szNewLocation[INTERNET_MAX_URL_LENGTH]; dwBufferSize=sizeof(szNewLocation);

1 0

Karsten Elfenbein : winhttp: Follow 307 temporary redirect.
by Alexandre Julliard 09 May '11

09 May '11

Module: wine Branch: master Commit: 5f12a6423c7701adfab46a843e2093c1eff2ff53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f12a6423c7701adfab46a843… Author: Karsten Elfenbein <kelfe(a)gmx.de> Date: Sun May 8 12:29:40 2011 +0200 winhttp: Follow 307 temporary redirect. --- dlls/winhttp/request.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 2c3d534..8a21ab5 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1835,7 +1835,7 @@ static BOOL receive_response( request_t *request, BOOL async ) if (!(request->hdr.disable_flags & WINHTTP_DISABLE_COOKIES)) record_cookies( request ); - if (status == 301 || status == 302) + if (status == HTTP_STATUS_MOVED || status == HTTP_STATUS_REDIRECT || status == HTTP_STATUS_REDIRECT_KEEP_VERB) { if (request->hdr.disable_flags & WINHTTP_DISABLE_REDIRECTS) break;

1 0

Nikolay Sivov : comctl32/listview: Make edit box handle available from LVN_ENDLABELEDIT notification.
by Alexandre Julliard 09 May '11

09 May '11

Module: wine Branch: master Commit: 34d86a2d17464d1e98f92a58491c00e100c005e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34d86a2d17464d1e98f92a584… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 8 19:02:36 2011 +0400 comctl32/listview: Make edit box handle available from LVN_ENDLABELEDIT notification. --- dlls/comctl32/listview.c | 27 ++++++++++++------------- dlls/comctl32/tests/listview.c | 41 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 52 insertions(+), 16 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 9f8b2a9..6f7d7f3 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -5662,7 +5662,7 @@ static BOOL LISTVIEW_EndEditLabelT(LISTVIEW_INFO *infoPtr, BOOL storeText, BOOL WCHAR szDispText[DISP_TEXT_SIZE] = { 0 }; NMLVDISPINFOW dispInfo; INT editedItem = infoPtr->nEditLabelItem; - BOOL bSame; + BOOL same; WCHAR *pszText = NULL; BOOL res; @@ -5682,9 +5682,6 @@ static BOOL LISTVIEW_EndEditLabelT(LISTVIEW_INFO *infoPtr, BOOL storeText, BOOL TRACE("(pszText=%s, isW=%d)\n", debugtext_t(pszText, isW), isW); - infoPtr->nEditLabelItem = -1; - infoPtr->hwndEdit = 0; - ZeroMemory(&dispInfo, sizeof(dispInfo)); dispInfo.item.mask = LVIF_PARAM | LVIF_STATE | LVIF_TEXT; dispInfo.item.iItem = editedItem; @@ -5699,32 +5696,34 @@ static BOOL LISTVIEW_EndEditLabelT(LISTVIEW_INFO *infoPtr, BOOL storeText, BOOL } if (isW) - bSame = (lstrcmpW(dispInfo.item.pszText, pszText) == 0); + same = (lstrcmpW(dispInfo.item.pszText, pszText) == 0); else { LPWSTR tmp = textdupTtoW(pszText, FALSE); - bSame = (lstrcmpW(dispInfo.item.pszText, tmp) == 0); + same = (lstrcmpW(dispInfo.item.pszText, tmp) == 0); textfreeT(tmp, FALSE); } /* add the text from the edit in */ dispInfo.item.mask |= LVIF_TEXT; - dispInfo.item.pszText = bSame ? NULL : pszText; - dispInfo.item.cchTextMax = bSame ? 0 : textlenT(pszText, isW); + dispInfo.item.pszText = same ? NULL : pszText; + dispInfo.item.cchTextMax = textlenT(dispInfo.item.pszText, isW); /* Do we need to update the Item Text */ - if (!notify_dispinfoT(infoPtr, LVN_ENDLABELEDITW, &dispInfo, isW)) - { - res = FALSE; - goto cleanup; - } + res = notify_dispinfoT(infoPtr, LVN_ENDLABELEDITW, &dispInfo, isW); + + infoPtr->nEditLabelItem = -1; + infoPtr->hwndEdit = 0; + + if (!res) goto cleanup; + if (!IsWindow(hwndSelf)) { res = FALSE; goto cleanup; } if (!pszText) return TRUE; - if (bSame) + if (same) { res = TRUE; goto cleanup; diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index e9fa684..3bf3dcb 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -61,6 +61,8 @@ static BOOL g_is_below_5; static LVITEMA g_itema; /* alter notification code A->W */ static BOOL g_disp_A_to_W; +/* dispinfo data sent with LVN_LVN_ENDLABELEDIT */ +static NMLVDISPINFO g_editbox_disp_info; static HWND subclass_editbox(HWND hwndListview); @@ -358,9 +360,17 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP } case LVN_ENDLABELEDIT: { + HWND edit; + /* always accept new item text */ NMLVDISPINFO *di = (NMLVDISPINFO*)lParam; + g_editbox_disp_info = *di; trace("LVN_ENDLABELEDIT: text=%s\n", di->item.pszText); + + /* edit control still available from this notification */ + edit = (HWND)SendMessageA(((NMHDR*)lParam)->hwndFrom, LVM_GETEDITCONTROL, 0, 0); + ok(IsWindow(edit), "expected valid edit control handle\n"); + return TRUE; } case LVN_BEGINSCROLL: @@ -3611,6 +3621,7 @@ static void test_editbox(void) { static CHAR testitemA[] = "testitem"; static CHAR testitem1A[] = "testitem_quitelongname"; + static CHAR testitem2A[] = "testITEM_quitelongname"; static CHAR buffer[25]; HWND hwnd, hwndedit, hwndedit2, header; LVITEMA item; @@ -3707,8 +3718,11 @@ static void test_editbox(void) /* modify edit and notify control that it lost focus */ r = SendMessage(hwndedit, WM_SETTEXT, 0, (LPARAM)testitem1A); expect(TRUE, r); + g_editbox_disp_info.item.pszText = NULL; r = SendMessage(hwnd, WM_COMMAND, MAKEWPARAM(0, EN_KILLFOCUS), (LPARAM)hwndedit); expect(0, r); + ok(g_editbox_disp_info.item.pszText != NULL, "expected notification with not null text\n"); + memset(&item, 0, sizeof(item)); item.pszText = buffer; item.cchTextMax = sizeof(buffer); @@ -3718,6 +3732,29 @@ static void test_editbox(void) expect(lstrlen(item.pszText), r); ok(strcmp(buffer, testitem1A) == 0, "Expected item text to change\n"); ok(!IsWindow(hwndedit), "Expected Edit window to be freed\n"); + + /* change item name to differ in casing only */ + SetFocus(hwnd); + hwndedit = (HWND)SendMessage(hwnd, LVM_EDITLABEL, 0, 0); + ok(IsWindow(hwndedit), "Expected Edit window to be created\n"); + /* modify edit and notify control that it lost focus */ + r = SendMessage(hwndedit, WM_SETTEXT, 0, (LPARAM)testitem2A); + expect(TRUE, r); + g_editbox_disp_info.item.pszText = NULL; + r = SendMessage(hwnd, WM_COMMAND, MAKEWPARAM(0, EN_KILLFOCUS), (LPARAM)hwndedit); + expect(0, r); + ok(g_editbox_disp_info.item.pszText != NULL, "got %p\n", g_editbox_disp_info.item.pszText); + + memset(&item, 0, sizeof(item)); + item.pszText = buffer; + item.cchTextMax = sizeof(buffer); + item.iItem = 0; + item.iSubItem = 0; + r = SendMessage(hwnd, LVM_GETITEMTEXTA, 0, (LPARAM)&item); + expect(lstrlen(item.pszText), r); + ok(strcmp(buffer, testitem2A) == 0, "got %s, expected %s\n", buffer, testitem2A); + ok(!IsWindow(hwndedit), "Expected Edit window to be freed\n"); + /* end edit without saving */ SetFocus(hwnd); hwndedit = (HWND)SendMessage(hwnd, LVM_EDITLABEL, 0, 0); @@ -3742,7 +3779,7 @@ static void test_editbox(void) item.iSubItem = 0; r = SendMessage(hwnd, LVM_GETITEMTEXTA, 0, (LPARAM)&item); expect(lstrlen(item.pszText), r); - ok(strcmp(buffer, testitem1A) == 0, "Expected item text to change\n"); + ok(strcmp(buffer, testitem2A) == 0, "Expected item text to change\n"); /* LVM_EDITLABEL with -1 destroys current edit */ hwndedit = (HWND)SendMessage(hwnd, LVM_GETEDITCONTROL, 0, 0); @@ -3786,7 +3823,7 @@ static void test_editbox(void) ok_sequence(sequences, EDITBOX_SEQ_INDEX, editbox_create_pos, "edit box create - sizing", FALSE); - /* WM_COMMAND with EN_KILLFOCUS isn't forwared to parent */ + /* WM_COMMAND with EN_KILLFOCUS isn't forwarded to parent */ SetFocus(hwnd); hwndedit = (HWND)SendMessage(hwnd, LVM_EDITLABEL, 0, 0); ok(IsWindow(hwndedit), "Expected Edit window to be created\n");

1 0

Nikolay Sivov : msxml3: Basic support for startElement()/endElement().
by Alexandre Julliard 09 May '11

09 May '11

Module: wine Branch: master Commit: b63778656e345d364a61b9321be0485e70ac41c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b63778656e345d364a61b9321… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 7 18:34:37 2011 +0400 msxml3: Basic support for startElement()/endElement(). --- dlls/msxml3/mxwriter.c | 32 +++++++++++++++++++++++++--- dlls/msxml3/tests/saxreader.c | 45 ++++++++++++++++++++++++++++++----------- 2 files changed, 61 insertions(+), 16 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index d2ff775..141f58d 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -541,9 +541,22 @@ static HRESULT WINAPI mxwriter_saxcontent_startElement( ISAXAttributes *attr) { mxwriter *This = impl_from_ISAXContentHandler( iface ); - FIXME("(%p)->(%s %s %s %p)\n", This, debugstr_wn(namespaceUri, nnamespaceUri), + xmlChar *s; + + TRACE("(%p)->(%s %s %s %p)\n", This, debugstr_wn(namespaceUri, nnamespaceUri), debugstr_wn(local_name, nlocal_name), debugstr_wn(QName, nQName), attr); - return E_NOTIMPL; + + if (!namespaceUri || !local_name || !QName) return E_INVALIDARG; + + if (attr) FIXME("attributes not handled\n"); + + xmlOutputBufferWriteString(This->buffer, "<"); + s = xmlchar_from_wchar(QName); + xmlOutputBufferWriteString(This->buffer, (char*)s); + heap_free(s); + xmlOutputBufferWriteString(This->buffer, ">"); + + return S_OK; } static HRESULT WINAPI mxwriter_saxcontent_endElement( @@ -556,9 +569,20 @@ static HRESULT WINAPI mxwriter_saxcontent_endElement( int nQName) { mxwriter *This = impl_from_ISAXContentHandler( iface ); - FIXME("(%p)->(%s %s %s)\n", This, debugstr_wn(namespaceUri, nnamespaceUri), + xmlChar *s; + + TRACE("(%p)->(%s %s %s)\n", This, debugstr_wn(namespaceUri, nnamespaceUri), debugstr_wn(local_name, nlocal_name), debugstr_wn(QName, nQName)); - return E_NOTIMPL; + + if (!namespaceUri || !local_name || !QName) return E_INVALIDARG; + + xmlOutputBufferWriteString(This->buffer, "</"); + s = xmlchar_from_wchar(QName); + xmlOutputBufferWriteString(This->buffer, (char*)s); + heap_free(s); + xmlOutputBufferWriteString(This->buffer, ">"); + + return S_OK; } static HRESULT WINAPI mxwriter_saxcontent_characters( diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 46e8004..2bdb8b5 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -980,56 +980,66 @@ static void test_mxwriter_startendelement(void) /* qualified name without defined namespace */ hr = ISAXContentHandler_startElement(content, NULL, 0, NULL, 0, _bstr_("a:b"), 3, NULL); - todo_wine ok(hr == E_INVALIDARG, "got %08x\n", hr); + ok(hr == E_INVALIDARG, "got %08x\n", hr); hr = ISAXContentHandler_startElement(content, NULL, 0, _bstr_("b"), 1, _bstr_("a:b"), 3, NULL); - todo_wine ok(hr == E_INVALIDARG, "got %08x\n", hr); + ok(hr == E_INVALIDARG, "got %08x\n", hr); /* only local name is an error too */ hr = ISAXContentHandler_startElement(content, NULL, 0, _bstr_("b"), 1, NULL, 0, NULL); - todo_wine ok(hr == E_INVALIDARG, "got %08x\n", hr); + ok(hr == E_INVALIDARG, "got %08x\n", hr); /* only local name is an error too */ hr = ISAXContentHandler_startElement(content, _bstr_(""), 0, _bstr_("b"), 1, NULL, 0, NULL); - todo_wine ok(hr == E_INVALIDARG, "got %08x\n", hr); + ok(hr == E_INVALIDARG, "got %08x\n", hr); /* all string pointers should be not null */ hr = ISAXContentHandler_startElement(content, _bstr_(""), 0, _bstr_("b"), 1, _bstr_(""), 0, NULL); - todo_wine ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "got %08x\n", hr); V_VT(&dest) = VT_EMPTY; hr = IMXWriter_get_output(writer, &dest); ok(hr == S_OK, "got %08x\n", hr); ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); - todo_wine ok(!lstrcmpW(_bstr_("<>"), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + ok(!lstrcmpW(_bstr_("<>"), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); VariantClear(&dest); hr = ISAXContentHandler_startElement(content, _bstr_(""), 0, _bstr_(""), 0, _bstr_("b"), 1, NULL); - todo_wine ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "got %08x\n", hr); V_VT(&dest) = VT_EMPTY; hr = IMXWriter_get_output(writer, &dest); ok(hr == S_OK, "got %08x\n", hr); ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); - todo_wine ok(!lstrcmpW(_bstr_("<>"), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + ok(!lstrcmpW(_bstr_("<>"), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); VariantClear(&dest); + hr = ISAXContentHandler_endElement(content, NULL, 0, NULL, 0, _bstr_("a:b"), 3); + ok(hr == E_INVALIDARG, "got %08x\n", hr); + + hr = ISAXContentHandler_endElement(content, NULL, 0, _bstr_("b"), 1, _bstr_("a:b"), 3); + ok(hr == E_INVALIDARG, "got %08x\n", hr); + + /* only local name is an error too */ + hr = ISAXContentHandler_endElement(content, NULL, 0, _bstr_("b"), 1, NULL, 0); + ok(hr == E_INVALIDARG, "got %08x\n", hr); + hr = ISAXContentHandler_endElement(content, _bstr_(""), 0, _bstr_(""), 0, _bstr_("b"), 1); - todo_wine ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "got %08x\n", hr); V_VT(&dest) = VT_EMPTY; hr = IMXWriter_get_output(writer, &dest); ok(hr == S_OK, "got %08x\n", hr); ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); - todo_wine ok(!lstrcmpW(_bstr_("<>"), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + ok(!lstrcmpW(_bstr_("<>"), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); VariantClear(&dest); /* some with namespace URI */ hr = ISAXContentHandler_startElement(content, _bstr_(winehqA), sizeof(winehqA), _bstr_(""), 0, _bstr_("nspace:c"), 8, NULL); - todo_wine ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "got %08x\n", hr); hr = ISAXContentHandler_endElement(content, _bstr_(winehqA), sizeof(winehqA), _bstr_(""), 0, _bstr_("nspace:c"), 8); - todo_wine ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "got %08x\n", hr); V_VT(&dest) = VT_EMPTY; hr = IMXWriter_get_output(writer, &dest); @@ -1038,6 +1048,17 @@ static void test_mxwriter_startendelement(void) todo_wine ok(!lstrcmpW(_bstr_("<><nspace:c/>"), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); VariantClear(&dest); + /* try to end element that wasn't open */ + hr = ISAXContentHandler_endElement(content, _bstr_(""), 0, _bstr_(""), 0, _bstr_("a"), 1); + ok(hr == S_OK, "got %08x\n", hr); + + V_VT(&dest) = VT_EMPTY; + hr = IMXWriter_get_output(writer, &dest); + ok(hr == S_OK, "got %08x\n", hr); + ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); + todo_wine ok(!lstrcmpW(_bstr_("<><nspace:c/></a>"), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + VariantClear(&dest); + hr = ISAXContentHandler_endDocument(content); todo_wine ok(hr == S_OK, "got %08x\n", hr);

1 0