April 2012 - Wine-Commits - list.winehq.org

Nikolay Sivov : msxml3: Use lookup table for feature names.
by Alexandre Julliard April 19, 2012

April 19, 2012

Module: wine Branch: master Commit: 137a21d04c99dca4dc843ef1ef42c04aa0b01353 URL: http://source.winehq.org/git/wine.git/?a=commit;h=137a21d04c99dca4dc843ef1e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 18 22:39:38 2012 +0400 msxml3: Use lookup table for feature names. --- dlls/msxml3/saxreader.c | 153 +++++++++++++++++++++++++++++------------------ 1 files changed, 95 insertions(+), 58 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index d95550f..8205c99 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -52,6 +52,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); typedef enum { + FeatureUnknown = 0, ExhaustiveErrors = 1 << 1, ExternalGeneralEntities = 1 << 2, ExternalParameterEntities = 1 << 3, @@ -67,7 +68,77 @@ typedef enum UseInlineSchema = 1 << 13, UseSchemaLocation = 1 << 14, LexicalHandlerParEntities = 1 << 15 -} saxreader_features; +} saxreader_feature; + +/* feature names */ +static const WCHAR FeatureExternalGeneralEntitiesW[] = { + 'h','t','t','p',':','/','/','x','m','l','.','o','r','g','/','s','a','x','/', + 'f','e','a','t','u','r','e','s','/','e','x','t','e','r','n','a','l','-','g','e','n','e','r','a','l', + '-','e','n','t','i','t','i','e','s',0 +}; + +static const WCHAR FeatureExternalParameterEntitiesW[] = { + 'h','t','t','p',':','/','/','x','m','l','.','o','r','g','/','s','a','x','/','f','e','a','t','u','r','e','s', + '/','e','x','t','e','r','n','a','l','-','p','a','r','a','m','e','t','e','r','-','e','n','t','i','t','i','e','s',0 +}; + +static const WCHAR FeatureLexicalHandlerParEntitiesW[] = { + 'h','t','t','p',':','/','/','x','m','l','.','o','r','g','/','s','a','x','/','f','e','a','t','u','r','e','s', + '/','l','e','x','i','c','a','l','-','h','a','n','d','l','e','r','/','p','a','r','a','m','e','t','e','r','-','e','n','t','i','t','i','e','s',0 +}; + +static const WCHAR FeatureProhibitDTDW[] = { + 'p','r','o','h','i','b','i','t','-','d','t','d',0 +}; + +static const WCHAR FeatureNamespacesW[] = { + 'h','t','t','p',':','/','/','x','m','l','.','o','r','g','/','s','a','x','/','f','e','a','t','u','r','e','s', + '/','n','a','m','e','s','p','a','c','e','s',0 +}; + +static const WCHAR FeatureNamespacePrefixesW[] = { + 'h','t','t','p',':','/','/','x','m','l','.','o','r','g','/','s','a','x','/','f','e','a','t','u','r','e','s', + '/','n','a','m','e','s','p','a','c','e','-','p','r','e','f','i','x','e','s',0 +}; + +struct saxreader_feature_pair +{ + saxreader_feature feature; + const WCHAR *name; +}; + +static const struct saxreader_feature_pair saxreader_feature_map[] = { + { ExternalGeneralEntities, FeatureExternalGeneralEntitiesW }, + { ExternalParameterEntities, FeatureExternalParameterEntitiesW }, + { LexicalHandlerParEntities, FeatureLexicalHandlerParEntitiesW }, + { NamespacePrefixes, FeatureNamespacePrefixesW }, + { Namespaces, FeatureNamespacesW }, + { ProhibitDTD, FeatureProhibitDTDW } +}; + +static saxreader_feature get_saxreader_feature(const WCHAR *name) +{ + int min, max, n, c; + + min = 0; + max = sizeof(saxreader_feature_map)/sizeof(struct saxreader_feature_pair) - 1; + + while (min <= max) + { + n = (min+max)/2; + + c = strcmpW(saxreader_feature_map[n].name, name); + if (!c) + return saxreader_feature_map[n].feature; + + if (c > 0) + max = n-1; + else + min = n+1; + } + + return FeatureUnknown; +} struct bstrpool { @@ -109,7 +180,7 @@ typedef struct xmlSAXHandler sax; BOOL isParsing; struct bstrpool pool; - saxreader_features features; + saxreader_feature features; MSXML_VERSION version; } saxreader; @@ -215,38 +286,7 @@ static const WCHAR PropertyXMLDeclVersionW[] = { 'x','m','l','d','e','c','l','-','v','e','r','s','i','o','n',0 }; -/* feature names */ -static const WCHAR FeatureExternalGeneralEntitiesW[] = { - 'h','t','t','p',':','/','/','x','m','l','.','o','r','g','/','s','a','x','/', - 'f','e','a','t','u','r','e','s','/','e','x','t','e','r','n','a','l','-','g','e','n','e','r','a','l', - '-','e','n','t','i','t','i','e','s',0 -}; - -static const WCHAR FeatureExternalParameterEntitiesW[] = { - 'h','t','t','p',':','/','/','x','m','l','.','o','r','g','/','s','a','x','/','f','e','a','t','u','r','e','s', - '/','e','x','t','e','r','n','a','l','-','p','a','r','a','m','e','t','e','r','-','e','n','t','i','t','i','e','s',0 -}; - -static const WCHAR FeatureLexicalHandlerParEntitiesW[] = { - 'h','t','t','p',':','/','/','x','m','l','.','o','r','g','/','s','a','x','/','f','e','a','t','u','r','e','s', - '/','l','e','x','i','c','a','l','-','h','a','n','d','l','e','r','/','p','a','r','a','m','e','t','e','r','-','e','n','t','i','t','i','e','s',0 -}; - -static const WCHAR FeatureProhibitDTDW[] = { - 'p','r','o','h','i','b','i','t','-','d','t','d',0 -}; - -static const WCHAR FeatureNamespacesW[] = { - 'h','t','t','p',':','/','/','x','m','l','.','o','r','g','/','s','a','x','/','f','e','a','t','u','r','e','s', - '/','n','a','m','e','s','p','a','c','e','s',0 -}; - -static const WCHAR FeatureNamespacePrefixesW[] = { - 'h','t','t','p',':','/','/','x','m','l','.','o','r','g','/','s','a','x','/','f','e','a','t','u','r','e','s', - '/','n','a','m','e','s','p','a','c','e','-','p','r','e','f','i','x','e','s',0 -}; - -static inline HRESULT set_feature_value(saxreader *reader, saxreader_features feature, VARIANT_BOOL value) +static inline HRESULT set_feature_value(saxreader *reader, saxreader_feature feature, VARIANT_BOOL value) { if (value == VARIANT_TRUE) reader->features |= feature; @@ -256,7 +296,7 @@ static inline HRESULT set_feature_value(saxreader *reader, saxreader_features fe return S_OK; } -static inline HRESULT get_feature_value(const saxreader *reader, saxreader_features feature, VARIANT_BOOL *value) +static inline HRESULT get_feature_value(const saxreader *reader, saxreader_feature feature, VARIANT_BOOL *value) { *value = reader->features & feature ? VARIANT_TRUE : VARIANT_FALSE; return S_OK; @@ -2749,52 +2789,49 @@ static HRESULT WINAPI saxxmlreader_Invoke( /*** IVBSAXXMLReader methods ***/ static HRESULT WINAPI saxxmlreader_getFeature( IVBSAXXMLReader* iface, - const WCHAR *feature, + const WCHAR *feature_name, VARIANT_BOOL *value) { saxreader *This = impl_from_IVBSAXXMLReader( iface ); + saxreader_feature feature; - if (!strcmpW(FeatureNamespacesW, feature)) - return get_feature_value(This, Namespaces, value); + TRACE("(%p)->(%s %p)\n", This, debugstr_w(feature_name), value); - if (!strcmpW(FeatureNamespacePrefixesW, feature)) - return get_feature_value(This, NamespacePrefixes, value); + feature = get_saxreader_feature(feature_name); + if (feature == Namespaces || feature == NamespacePrefixes) + return get_feature_value(This, feature, value); - FIXME("(%p)->(%s %p) stub\n", This, debugstr_w(feature), value); + FIXME("(%p)->(%s %p) stub\n", This, debugstr_w(feature_name), value); return E_NOTIMPL; } static HRESULT WINAPI saxxmlreader_putFeature( IVBSAXXMLReader* iface, - const WCHAR *feature, + const WCHAR *feature_name, VARIANT_BOOL value) { saxreader *This = impl_from_IVBSAXXMLReader( iface ); + saxreader_feature feature; - TRACE("(%p)->(%s %x)\n", This, debugstr_w(feature), value); + TRACE("(%p)->(%s %x)\n", This, debugstr_w(feature_name), value); - if (!strcmpW(FeatureExternalGeneralEntitiesW, feature) && value == VARIANT_FALSE) - return set_feature_value(This, ExternalGeneralEntities, value); + feature = get_saxreader_feature(feature_name); - if (!strcmpW(FeatureExternalParameterEntitiesW, feature) && value == VARIANT_FALSE) - return set_feature_value(This, ExternalParameterEntities, value); - - if (!strcmpW(FeatureLexicalHandlerParEntitiesW, feature)) + /* accepted cases */ + if ((feature == ExternalGeneralEntities && value == VARIANT_FALSE) || + (feature == ExternalParameterEntities && value == VARIANT_FALSE) || + (feature == Namespaces && value == VARIANT_TRUE )) { - FIXME("(%p)->(%s %x) stub\n", This, debugstr_w(feature), value); - return set_feature_value(This, LexicalHandlerParEntities, value); + return set_feature_value(This, feature, value); } - if (!strcmpW(FeatureProhibitDTDW, feature)) + if (feature == LexicalHandlerParEntities || feature == ProhibitDTD) { - FIXME("(%p)->(%s %x) stub\n", This, debugstr_w(feature), value); - return set_feature_value(This, ProhibitDTD, value); + FIXME("(%p)->(%s %x) stub\n", This, debugstr_w(feature_name), value); + return set_feature_value(This, feature, value); } - if (!strcmpW(FeatureNamespacesW, feature) && value == VARIANT_TRUE) - return set_feature_value(This, Namespaces, value); - - FIXME("(%p)->(%s %x) stub\n", This, debugstr_w(feature), value); + FIXME("(%p)->(%s %x) stub\n", This, debugstr_w(feature_name), value); return E_NOTIMPL; }

1 0

Henri Verbeet : d3d8: Get rid of IDirect3DBaseTexture8Impl.
by Alexandre Julliard April 19, 2012

April 19, 2012

Module: wine Branch: master Commit: 83761d20a8654a616b557ecdb2869436beae7f95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83761d20a8654a616b557ecdb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 18 20:51:26 2012 +0200 d3d8: Get rid of IDirect3DBaseTexture8Impl. --- dlls/d3d8/buffer.c | 1 - dlls/d3d8/d3d8_private.h | 19 ++----------------- dlls/d3d8/device.c | 20 +++++++++++++------- dlls/d3d8/surface.c | 1 - dlls/d3d8/texture.c | 10 ++++++++++ 5 files changed, 25 insertions(+), 26 deletions(-) diff --git a/dlls/d3d8/buffer.c b/dlls/d3d8/buffer.c index 4ab6524..9ff787d 100644 --- a/dlls/d3d8/buffer.c +++ b/dlls/d3d8/buffer.c @@ -17,7 +17,6 @@ */ #include "config.h" -#include <assert.h> #include "d3d8_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d8); diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 49f2bdd..b963abe 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -23,6 +23,7 @@ #ifndef __WINE_D3D8_PRIVATE_H #define __WINE_D3D8_PRIVATE_H +#include <assert.h> #include <stdarg.h> #define NONAMELESSUNION @@ -293,21 +294,6 @@ HRESULT indexbuffer_init(IDirect3DIndexBuffer8Impl *buffer, IDirect3DDevice8Impl UINT size, DWORD usage, D3DFORMAT format, D3DPOOL pool) DECLSPEC_HIDDEN; IDirect3DIndexBuffer8Impl *unsafe_impl_from_IDirect3DIndexBuffer8(IDirect3DIndexBuffer8 *iface) DECLSPEC_HIDDEN; -/* --------------------- */ -/* IDirect3DBaseTexture8 */ -/* --------------------- */ - -/***************************************************************************** - * IDirect3DBaseTexture8 implementation structure - */ -struct IDirect3DBaseTexture8Impl -{ - /* IUnknown fields */ - const IDirect3DBaseTexture8Vtbl *lpVtbl; - LONG ref; - struct wined3d_texture *wined3d_texture; -}; - struct d3d8_texture { IDirect3DBaseTexture8 IDirect3DBaseTexture8_iface; @@ -318,12 +304,11 @@ struct d3d8_texture HRESULT cubetexture_init(struct d3d8_texture *texture, IDirect3DDevice8Impl *device, UINT edge_length, UINT levels, DWORD usage, D3DFORMAT format, D3DPOOL pool) DECLSPEC_HIDDEN; - HRESULT texture_init(struct d3d8_texture *texture, IDirect3DDevice8Impl *device, UINT width, UINT height, UINT levels, DWORD usage, D3DFORMAT format, D3DPOOL pool) DECLSPEC_HIDDEN; - HRESULT volumetexture_init(struct d3d8_texture *texture, IDirect3DDevice8Impl *device, UINT width, UINT height, UINT depth, UINT levels, DWORD usage, D3DFORMAT format, D3DPOOL pool) DECLSPEC_HIDDEN; +struct d3d8_texture *unsafe_impl_from_IDirect3DBaseTexture8(IDirect3DBaseTexture8 *iface) DECLSPEC_HIDDEN; struct d3d8_vertex_declaration { diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index d0c85ec..ea2ce17 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1032,14 +1032,17 @@ static HRESULT WINAPI IDirect3DDevice8Impl_UpdateTexture(IDirect3DDevice8 *iface IDirect3DBaseTexture8 *src_texture, IDirect3DBaseTexture8 *dst_texture) { IDirect3DDevice8Impl *This = impl_from_IDirect3DDevice8(iface); + struct d3d8_texture *src_impl, *dst_impl; HRESULT hr; TRACE("iface %p, src_texture %p, dst_texture %p.\n", iface, src_texture, dst_texture); + src_impl = unsafe_impl_from_IDirect3DBaseTexture8(src_texture); + dst_impl = unsafe_impl_from_IDirect3DBaseTexture8(dst_texture); + wined3d_mutex_lock(); hr = wined3d_device_update_texture(This->wined3d_device, - ((IDirect3DBaseTexture8Impl *)src_texture)->wined3d_texture, - ((IDirect3DBaseTexture8Impl *)dst_texture)->wined3d_texture); + src_impl->wined3d_texture, dst_impl->wined3d_texture); wined3d_mutex_unlock(); return hr; @@ -1732,17 +1735,20 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetTexture(IDirect3DDevice8 *iface, return D3D_OK; } -static HRESULT WINAPI IDirect3DDevice8Impl_SetTexture(IDirect3DDevice8 *iface, DWORD Stage, - IDirect3DBaseTexture8 *pTexture) +static HRESULT WINAPI IDirect3DDevice8Impl_SetTexture(IDirect3DDevice8 *iface, DWORD stage, + IDirect3DBaseTexture8 *texture) { IDirect3DDevice8Impl *This = impl_from_IDirect3DDevice8(iface); + struct d3d8_texture *texture_impl; HRESULT hr; - TRACE("iface %p, stage %u, texture %p.\n", iface, Stage, pTexture); + TRACE("iface %p, stage %u, texture %p.\n", iface, stage, texture); + + texture_impl = unsafe_impl_from_IDirect3DBaseTexture8(texture); wined3d_mutex_lock(); - hr = wined3d_device_set_texture(This->wined3d_device, Stage, - pTexture ? ((IDirect3DBaseTexture8Impl *)pTexture)->wined3d_texture : NULL); + hr = wined3d_device_set_texture(This->wined3d_device, stage, + texture_impl ? texture_impl->wined3d_texture : NULL); wined3d_mutex_unlock(); return hr; diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index 316e0b8..7b887e3 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -19,7 +19,6 @@ */ #include "config.h" -#include <assert.h> #include "d3d8_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d8); diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index 700ee37..2720fe2 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -1137,6 +1137,16 @@ static const IDirect3DVolumeTexture8Vtbl Direct3DVolumeTexture8_Vtbl = d3d8_texture_3d_AddDirtyBox }; +struct d3d8_texture *unsafe_impl_from_IDirect3DBaseTexture8(IDirect3DBaseTexture8 *iface) +{ + if (!iface) + return NULL; + assert(iface->lpVtbl == (const IDirect3DBaseTexture8Vtbl *)&Direct3DTexture8_Vtbl + || iface->lpVtbl == (const IDirect3DBaseTexture8Vtbl *)&Direct3DCubeTexture8_Vtbl + || iface->lpVtbl == (const IDirect3DBaseTexture8Vtbl *)&Direct3DVolumeTexture8_Vtbl); + return CONTAINING_RECORD(iface, struct d3d8_texture, IDirect3DBaseTexture8_iface); +} + static void STDMETHODCALLTYPE d3d8_texture_wined3d_object_destroyed(void *parent) { HeapFree(GetProcessHeap(), 0, parent);

1 0

Andrew Eikum : dmime: Don' t try to create a standard audio path if the client didn't ask for one.
by Alexandre Julliard April 19, 2012

April 19, 2012

Module: wine Branch: master Commit: 629e857c2ee0e8816a11ee4ab446c13798362f33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=629e857c2ee0e8816a11ee4ab… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Apr 18 10:14:01 2012 -0500 dmime: Don't try to create a standard audio path if the client didn't ask for one. --- dlls/dmime/performance.c | 5 +++-- dlls/dmime/tests/performance.c | 14 ++++++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index bc44fa5..0f76e36 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -945,7 +945,8 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_InitAudio(IDirectMusicPerform This->pParams.dwFeatures = dwFlags; This->pParams.clsidDefaultSynth = CLSID_DirectMusicSynthSink; } - hr = IDirectMusicPerformance8_CreateStandardAudioPath(iface, dwDefaultPathType, dwPChannelCount, FALSE, &This->pDefaultPath); + if(dwDefaultPathType != 0) + hr = IDirectMusicPerformance8_CreateStandardAudioPath(iface, dwDefaultPathType, dwPChannelCount, FALSE, &This->pDefaultPath); PostMessageToProcessMsgThread(This, PROCESSMSG_START); @@ -1096,7 +1097,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_CreateStandardAudioPath(IDire *ppNewPath = pPath; - TRACE(" returning IDirectMusicPerformance interface at %p.\n", *ppNewPath); + TRACE(" returning IDirectMusicAudioPath interface at %p.\n", *ppNewPath); return IDirectMusicAudioPath_Activate(*ppNewPath, fActivate); } diff --git a/dlls/dmime/tests/performance.c b/dlls/dmime/tests/performance.c index 684642b..d0d5079 100644 --- a/dlls/dmime/tests/performance.c +++ b/dlls/dmime/tests/performance.c @@ -82,6 +82,20 @@ static HRESULT test_InitAudio(void) IDirectMusicPerformance8_Release(idmusicperformance); + hr = CoCreateInstance(&CLSID_DirectMusicPerformance, NULL, + CLSCTX_INPROC_SERVER, &IID_IDirectMusicPerformance8, + (void**)&idmusicperformance); + ok(hr == S_OK, "CoCreateInstance failed: %08x\n", hr); + + hr = IDirectMusicPerformance8_InitAudio(idmusicperformance, NULL, NULL, + NULL, 0, 64, 0, NULL); + ok(hr == S_OK, "InitAudio failed: %08x\n", hr); + + hr = IDirectMusicPerformance8_CloseDown(idmusicperformance); + ok(hr == S_OK, "CloseDown failed: %08x\n", hr); + + IDirectMusicPerformance8_Release(idmusicperformance); + return S_OK; }

1 0

Nikolay Sivov : msxml3: Fix handling of feature values.
by Alexandre Julliard April 19, 2012

April 19, 2012

Module: wine Branch: master Commit: 54df4811c61cfd22787f46ea7ea2d6f555e74ade URL: http://source.winehq.org/git/wine.git/?a=commit;h=54df4811c61cfd22787f46ea7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 19 10:53:15 2012 +0400 msxml3: Fix handling of feature values. --- dlls/msxml3/saxreader.c | 6 ++++++ dlls/msxml3/tests/saxreader.c | 7 +------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index e9ab841..936f583 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -288,6 +288,12 @@ static const WCHAR PropertyXMLDeclVersionW[] = { static inline HRESULT set_feature_value(saxreader *reader, saxreader_feature feature, VARIANT_BOOL value) { + /* handling of non-VARIANT_* values is version dependent */ + if ((reader->version < MSXML4) && (value != VARIANT_TRUE)) + value = VARIANT_FALSE; + if ((reader->version >= MSXML4) && (value != VARIANT_FALSE)) + value = VARIANT_TRUE; + if (value == VARIANT_TRUE) reader->features |= feature; else diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 0c107af..5c768f4 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -2198,12 +2198,7 @@ static void test_saxreader_features(void) value = 0xd; hr = ISAXXMLReader_getFeature(reader, _bstr_(*name), &value); EXPECT_HR(hr, S_OK); - if (IsEqualGUID(entry->guid, &CLSID_SAXXMLReader40) || - IsEqualGUID(entry->guid, &CLSID_SAXXMLReader60)) - todo_wine - ok(entry->value2 == value, "%s: got wrong value %x, expected %x\n", entry->clsid, value, entry->value2); - else - ok(entry->value2 == value, "%s: got wrong value %x, expected %x\n", entry->clsid, value, entry->value2); + ok(entry->value2 == value, "%s: got wrong value %x, expected %x\n", entry->clsid, value, entry->value2); hr = ISAXXMLReader_putFeature(reader, _bstr_(*name), VARIANT_FALSE); EXPECT_HR(hr, S_OK);

1 0

Henri Verbeet : d3d8: Properly retrieve an interface pointer in d3d8_texture_3d_GetVolumeLevel() .
by Alexandre Julliard April 19, 2012

April 19, 2012

Module: wine Branch: master Commit: 93fea77af31a39b45f714054fa262cd36bb689e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93fea77af31a39b45f714054f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 18 20:51:22 2012 +0200 d3d8: Properly retrieve an interface pointer in d3d8_texture_3d_GetVolumeLevel(). --- dlls/d3d8/volumetexture.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/volumetexture.c b/dlls/d3d8/volumetexture.c index caa311c..05ff065 100644 --- a/dlls/d3d8/volumetexture.c +++ b/dlls/d3d8/volumetexture.c @@ -276,6 +276,7 @@ static HRESULT WINAPI d3d8_texture_3d_GetVolumeLevel(IDirect3DVolumeTexture8 *if { struct d3d8_texture *texture = impl_from_IDirect3DVolumeTexture8(iface); struct wined3d_resource *sub_resource; + IDirect3DVolume8Impl *volume_impl; TRACE("iface %p, level %u, volume %p.\n", iface, level, volume); @@ -286,7 +287,8 @@ static HRESULT WINAPI d3d8_texture_3d_GetVolumeLevel(IDirect3DVolumeTexture8 *if return D3DERR_INVALIDCALL; } - *volume = wined3d_resource_get_parent(sub_resource); + volume_impl = wined3d_resource_get_parent(sub_resource); + *volume = &volume_impl->IDirect3DVolume8_iface; IDirect3DVolume8_AddRef(*volume); wined3d_mutex_unlock();

1 0

Henri Verbeet : d3d8: Properly retrieve an interface pointer in d3d8_texture_3d_UnlockBox().
by Alexandre Julliard April 19, 2012

April 19, 2012

Module: wine Branch: master Commit: 620b5e0bcff54a1ee1f36df01685ed2e3087fd7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=620b5e0bcff54a1ee1f36df01… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 18 20:51:24 2012 +0200 d3d8: Properly retrieve an interface pointer in d3d8_texture_3d_UnlockBox(). --- dlls/d3d8/volumetexture.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/volumetexture.c b/dlls/d3d8/volumetexture.c index 1ce2b90..2f5093a 100644 --- a/dlls/d3d8/volumetexture.c +++ b/dlls/d3d8/volumetexture.c @@ -323,6 +323,7 @@ static HRESULT WINAPI d3d8_texture_3d_UnlockBox(IDirect3DVolumeTexture8 *iface, { struct d3d8_texture *texture = impl_from_IDirect3DVolumeTexture8(iface); struct wined3d_resource *sub_resource; + IDirect3DVolume8Impl *volume_impl; HRESULT hr; TRACE("iface %p, level %u.\n", iface, level); @@ -331,7 +332,10 @@ static HRESULT WINAPI d3d8_texture_3d_UnlockBox(IDirect3DVolumeTexture8 *iface, if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, level))) hr = D3DERR_INVALIDCALL; else - hr = IDirect3DVolume8_UnlockBox((IDirect3DVolume8 *)wined3d_resource_get_parent(sub_resource)); + { + volume_impl = wined3d_resource_get_parent(sub_resource); + hr = IDirect3DVolume8_UnlockBox(&volume_impl->IDirect3DVolume8_iface); + } wined3d_mutex_unlock(); return hr;

1 0

André Hentschel : winedbg: Disassemble more Thumb instructions.
by Alexandre Julliard April 19, 2012

April 19, 2012

Module: wine Branch: master Commit: 11384aa5ad43df8a8bb3c1b42f3e89dd14231e9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=11384aa5ad43df8a8bb3c1b42… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Apr 18 23:05:27 2012 +0200 winedbg: Disassemble more Thumb instructions. --- programs/winedbg/be_arm.c | 63 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 62 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index 670fd8a..db7931d 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -70,6 +70,11 @@ static char const tbl_hiops_t[][4] = { "add", "cmp", "mov", "bx" }; +static char const tbl_aluops_t[][4] = { + "and", "eor", "lsl", "lsr", "asr", "adc", "sbc", "ror", "tst", "neg", "cmp", "cmn", "orr", + "mul", "bic", "mvn" +}; + static char const tbl_immops_t[][4] = { "mov", "cmp", "add", "sub" }; @@ -335,6 +340,17 @@ static WORD thumb_disasm_hireg(WORD inst, ADDRESS64 *addr) return 0; } +static WORD thumb_disasm_aluop(WORD inst, ADDRESS64 *addr) +{ + short dst = inst & 0x07; + short src = (inst >> 3) & 0x07; + short op = (inst >> 6) & 0x0f; + + dbg_printf("\n\t%s\t%s, %s", tbl_aluops_t[op], tbl_regs[dst], tbl_regs[src]); + + return 0; +} + static WORD thumb_disasm_blocktrans(WORD inst, ADDRESS64 *addr) { short lrpc = (inst >> 8) & 0x01; @@ -371,7 +387,14 @@ static WORD thumb_disasm_longbl(WORD inst, ADDRESS64 *addr) if (!((inst2 & 0xf800) == 0xf800)) return inst; offset += (inst2 & 0x07ff) << 1; - dbg_printf("\tbl\t%08x", offset); + dbg_printf("\n\tbl\t%08x", offset); + return 0; +} + +static WORD thumb_disasm_condbranch(WORD inst, ADDRESS64 *addr) +{ + WORD offset = inst & 0x00ff; + dbg_printf("\n\tb%s\t%04x", tbl_cond[(inst >> 8) & 0x0f], offset); return 0; } @@ -402,6 +425,16 @@ static WORD thumb_disasm_ldrsprel(WORD inst, ADDRESS64 *addr) return 0; } +static WORD thumb_disasm_addsprel(WORD inst, ADDRESS64 *addr) +{ + WORD offset = (inst & 0x7f) << 2; + if ((inst >> 7) & 0x01) + dbg_printf("\n\tsub\tsp, sp, #%u", offset); + else + dbg_printf("\n\tadd\tsp, sp, #%u", offset); + return 0; +} + static WORD thumb_disasm_ldrimm(WORD inst, ADDRESS64 *addr) { WORD offset = (inst & 0x07c0) >> 6; @@ -417,6 +450,28 @@ static WORD thumb_disasm_immop(WORD inst, ADDRESS64 *addr) return 0; } +static WORD thumb_disasm_addsub(WORD inst, ADDRESS64 *addr) +{ + WORD op = (inst >> 9) & 0x01; + WORD immediate = (inst >> 10) & 0x01; + + dbg_printf("\n\t%s\t%s, %s, ", op ? "sub" : "add", + tbl_regs[inst & 0x07], tbl_regs[(inst >> 3) & 0x07]); + if (immediate) + dbg_printf("#%d", (inst >> 6) & 0x07); + else + dbg_printf("%s", tbl_regs[(inst >> 6) & 0x07]); + return 0; +} + +static WORD thumb_disasm_movshift(WORD inst, ADDRESS64 *addr) +{ + WORD op = (inst >> 11) & 0x03; + dbg_printf("\n\t%s\t%s, %s, #%u", tbl_shifts[op], + tbl_regs[inst & 0x07], tbl_regs[(inst >> 3) & 0x07], (inst >> 6) & 0x1f); + return 0; +} + struct inst_arm { UINT mask; @@ -447,14 +502,20 @@ struct inst_thumb16 static const struct inst_thumb16 tbl_thumb16[] = { { 0xfc00, 0x4400, thumb_disasm_hireg }, + { 0xfc00, 0x4000, thumb_disasm_aluop }, { 0xf600, 0xb400, thumb_disasm_blocktrans }, { 0xf800, 0xf000, thumb_disasm_longbl }, + { 0xf000, 0xd000, thumb_disasm_condbranch }, { 0xf800, 0x4800, thumb_disasm_ldrpcrel }, { 0xf000, 0x9000, thumb_disasm_ldrsprel }, + { 0xff00, 0xb000, thumb_disasm_addsprel }, { 0xe000, 0x6000, thumb_disasm_ldrimm }, { 0xe000, 0x2000, thumb_disasm_immop }, + { 0xf000, 0xd000, thumb_disasm_condbranch }, { 0xff00, 0xdf00, thumb_disasm_swi }, { 0xff00, 0xbf00, thumb_disasm_nop }, + { 0xfc00, 0x1c00, thumb_disasm_addsub }, + { 0xe000, 0x0000, thumb_disasm_movshift }, { 0x0000, 0x0000, NULL } };

1 0

André Hentschel : winedev: Remove outdated section.
by Alexandre Julliard April 19, 2012

April 19, 2012

Module: docs Branch: master Commit: b4630a0dcdeb68bf109076717b6ee873537f01e8 URL: http://source.winehq.org/git/docs.git/?a=commit;h=b4630a0dcdeb68bf109076717… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Apr 15 20:11:34 2012 +0200 winedev: Remove outdated section. --- en/winedev-debugging.sgml | 22 ---------------------- 1 files changed, 0 insertions(+), 22 deletions(-) diff --git a/en/winedev-debugging.sgml b/en/winedev-debugging.sgml index 7c34e5d..6a7d58c 100644 --- a/en/winedev-debugging.sgml +++ b/en/winedev-debugging.sgml @@ -364,28 +364,6 @@ WINEDEBUG=trace+reg,warn-file </itemizedlist> </sect1> - <sect1 id="dbg-compiling"> - <title>Compiling Out Debugging Messages</title> - - <para> - To compile out the debugging messages, provide - <command>configure</command> with the following options: - </para> - <screen> - --disable-debug -- turns off TRACE, WARN, and FIXME (and DUMP). - --disable-trace -- turns off TRACE only. - </screen> - <para> - This will result in an executable that, when stripped, is - about 15%-20% smaller. Note, however, that you will not be - able to effectively debug Wine without these messages. - </para> - <para> - This feature has not been extensively tested--it may subtly - break some things. - </para> - </sect1> - <sect1 id="dbg-notes"> <title>A Few Notes on Style</title>

1 0

Łukasz Wojniłowicz : Polish translation for release 1.5.2
by Jeremy Newman April 18, 2012

April 18, 2012

Module: website Branch: master Commit: 1d5939896f00a810c965eed1e46794ed81b10025 URL: http://source.winehq.org/git/website.git/?a=commit;h=1d5939896f00a810c965ee… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sun Apr 15 18:05:10 2012 +0200 Polish translation for release 1.5.2 --- news/pl/2012041301.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/pl/2012041301.xml b/news/pl/2012041301.xml new file mode 100644 index 0000000..7faad57 --- /dev/null +++ b/news/pl/2012041301.xml @@ -0,0 +1,17 @@ +<news> +<date>Kwiecień 13, 2012</date> +<title>Wydano Wine 1.5.2</title> +<body> + Wydanie rozwojowe Wine 1.5.2 jest już dostępne. + <a href="{$root}/announce/1.5.2">Co nowego</a> w tym wydaniu: +<ul> + <li>Ulepszono schemat nazewnictwa dla urządzeń dźwiękowych.</li> + <li>Lepsze wsparcie dla znajdywania czcionek systemowych dla Mac OS X.</li> + <li>Początki wsparcia kodowania obrazów przy pomocy JPEG.</li> + <li>Kilka poprawek do drukowania.</li> + <li>Ulepszenia dla pamięci podręcznej adresów URL.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.2.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Rico Schüller : d3dx9/tests: Add tests for ID3DXBaseEffect::G/SetValue().
by Alexandre Julliard April 18, 2012

April 18, 2012

Module: wine Branch: master Commit: b09d195bf3c1bd4fef208411ffdbd31b4f1031c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b09d195bf3c1bd4fef208411f… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Apr 18 09:33:45 2012 +0200 d3dx9/tests: Add tests for ID3DXBaseEffect::G/SetValue(). --- dlls/d3dx9_36/tests/effect.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index fda0319..eb52f7e 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -1695,6 +1695,8 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) * effect->lpVtbl->SetMatrixArray(effect, parameter, NULL, res_desc->Elements ? res_desc->Elements : 1); * effect->lpVtbl->SetMatrixTranspose(effect, parameter, NULL); * effect->lpVtbl->SetMatrixTransposeArray(effect, parameter, NULL, res_desc->Elements ? res_desc->Elements : 1); + * effect->lpVtbl->GetValue(effect, parameter, NULL, res_desc->Bytes); + * effect->lpVtbl->SetValue(effect, parameter, NULL, res_desc->Bytes); */ hr = effect->lpVtbl->SetBool(effect, NULL, bvalue); ok(hr == D3DERR_INVALIDCALL, "%u - %s: SetBool failed, got %#x, expected %#x\n", @@ -1836,6 +1838,22 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) ok(hr == D3DERR_INVALIDCALL, "%u - %s: GetMatrixTransposeArray failed, got %#x, expected %#x\n", i, res_full_name, hr, D3DERR_INVALIDCALL); + hr = effect->lpVtbl->SetValue(effect, NULL, input_value, res_desc->Bytes); + ok(hr == D3DERR_INVALIDCALL, "%u - %s: SetValue failed, got %#x, expected %#x\n", + i, res_full_name, hr, D3DERR_INVALIDCALL); + + hr = effect->lpVtbl->SetValue(effect, parameter, input_value, res_desc->Bytes - 1); + ok(hr == D3DERR_INVALIDCALL, "%u - %s: SetValue failed, got %#x, expected %#x\n", + i, res_full_name, hr, D3DERR_INVALIDCALL); + + hr = effect->lpVtbl->GetValue(effect, NULL, input_value, res_desc->Bytes); + ok(hr == D3DERR_INVALIDCALL, "%u - %s: GetValue failed, got %#x, expected %#x\n", + i, res_full_name, hr, D3DERR_INVALIDCALL); + + hr = effect->lpVtbl->GetValue(effect, parameter, input_value, res_desc->Bytes - 1); + ok(hr == D3DERR_INVALIDCALL, "%u - %s: GetValue failed, got %#x, expected %#x\n", + i, res_full_name, hr, D3DERR_INVALIDCALL); + test_effect_parameter_value_GetTestGroup(&res[k], effect, &blob[res_value_offset], parameter, i); /* SetBool */

1 0