wine-commits March 2012

wine-commits@winehq.org

3 participants
710 discussions

Henri Verbeet : d3d8: Don' t return a pointer to the implementation in IDirect3DCubeTexture8Impl_QueryInterface ().
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: 635ab65651484760f9b55fef3dc2049c76e4b14f URL: http://source.winehq.org/git/wine.git/?a=commit;h=635ab65651484760f9b55fef3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Mar 25 20:56:30 2012 +0200 d3d8: Don't return a pointer to the implementation in IDirect3DCubeTexture8Impl_QueryInterface(). --- dlls/d3d8/cubetexture.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/d3d8/cubetexture.c b/dlls/d3d8/cubetexture.c index f092f35..c28eeb6 100644 --- a/dlls/d3d8/cubetexture.c +++ b/dlls/d3d8/cubetexture.c @@ -31,20 +31,20 @@ static inline IDirect3DCubeTexture8Impl *impl_from_IDirect3DCubeTexture8(IDirect static HRESULT WINAPI IDirect3DCubeTexture8Impl_QueryInterface(IDirect3DCubeTexture8 *iface, REFIID riid, void **ppobj) { - IDirect3DCubeTexture8Impl *This = impl_from_IDirect3DCubeTexture8(iface); - TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj); - if (IsEqualGUID(riid, &IID_IUnknown) - || IsEqualGUID(riid, &IID_IDirect3DResource8) - || IsEqualGUID(riid, &IID_IDirect3DBaseTexture8) - || IsEqualGUID(riid, &IID_IDirect3DCubeTexture8)) { + if (IsEqualGUID(riid, &IID_IDirect3DCubeTexture8) + || IsEqualGUID(riid, &IID_IDirect3DBaseTexture8) + || IsEqualGUID(riid, &IID_IDirect3DResource8) + || IsEqualGUID(riid, &IID_IUnknown)) + { IUnknown_AddRef(iface); - *ppobj = This; + *ppobj = iface; return S_OK; } - WARN("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ppobj); + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + *ppobj = NULL; return E_NOINTERFACE; }

1 0

Henri Verbeet : d3d8: Don' t return a pointer to the implementation in IDirect3DDevice8Impl_QueryInterface ().
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: 925a791dff8aadcee354839e96891d284904ffb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=925a791dff8aadcee354839e9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Mar 25 20:56:29 2012 +0200 d3d8: Don't return a pointer to the implementation in IDirect3DDevice8Impl_QueryInterface(). --- dlls/d3d8/device.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index b528e2c..c6ce5b5 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -262,19 +262,19 @@ static inline IDirect3DDevice8Impl *impl_from_IDirect3DDevice8(IDirect3DDevice8 static HRESULT WINAPI IDirect3DDevice8Impl_QueryInterface(IDirect3DDevice8 *iface, REFIID riid, void **ppobj) { - IDirect3DDevice8Impl *This = impl_from_IDirect3DDevice8(iface); - TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj); - if (IsEqualGUID(riid, &IID_IUnknown) - || IsEqualGUID(riid, &IID_IDirect3DDevice8)) { + if (IsEqualGUID(riid, &IID_IDirect3DDevice8) + || IsEqualGUID(riid, &IID_IUnknown)) + { IUnknown_AddRef(iface); - *ppobj = This; + *ppobj = iface; return S_OK; } - WARN("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ppobj); + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + *ppobj = NULL; return E_NOINTERFACE; }

1 0

Henri Verbeet : d3d8: Don' t return a pointer to the implementation in IDirect3D8Impl_QueryInterface() .
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: ffcfdff2dee55d8265158570dee4e3dee0a802e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffcfdff2dee55d8265158570d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Mar 25 20:56:28 2012 +0200 d3d8: Don't return a pointer to the implementation in IDirect3D8Impl_QueryInterface(). --- dlls/d3d8/directx.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index 70b0c78..1debd8f 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -44,18 +44,18 @@ static inline IDirect3D8Impl *impl_from_IDirect3D8(IDirect3D8 *iface) static HRESULT WINAPI IDirect3D8Impl_QueryInterface(LPDIRECT3D8 iface, REFIID riid,LPVOID *ppobj) { - IDirect3D8Impl *This = impl_from_IDirect3D8(iface); - TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj); - if (IsEqualGUID(riid, &IID_IUnknown) - || IsEqualGUID(riid, &IID_IDirect3D8)) { + if (IsEqualGUID(riid, &IID_IDirect3D8) + || IsEqualGUID(riid, &IID_IUnknown)) + { IUnknown_AddRef(iface); - *ppobj = This; + *ppobj = iface; return S_OK; } - WARN("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid),ppobj); + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + *ppobj = NULL; return E_NOINTERFACE; }

1 0

Henri Verbeet : d3d8: Don' t return a pointer to the implementation in IDirect3DSurface8Impl_QueryInterface ().
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: 30c3e84ee5691315e50790337ed80941cb6aea3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=30c3e84ee5691315e50790337… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Mar 25 20:56:27 2012 +0200 d3d8: Don't return a pointer to the implementation in IDirect3DSurface8Impl_QueryInterface(). --- dlls/d3d8/surface.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index 87c072a..fc212ea 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -33,19 +33,19 @@ static inline IDirect3DSurface8Impl *impl_from_IDirect3DSurface8(IDirect3DSurfac static HRESULT WINAPI IDirect3DSurface8Impl_QueryInterface(IDirect3DSurface8 *iface, REFIID riid, void **ppobj) { - IDirect3DSurface8Impl *This = impl_from_IDirect3DSurface8(iface); - TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj); - if (IsEqualGUID(riid, &IID_IUnknown) - || IsEqualGUID(riid, &IID_IDirect3DResource8) - || IsEqualGUID(riid, &IID_IDirect3DSurface8)) { + if (IsEqualGUID(riid, &IID_IDirect3DSurface8) + || IsEqualGUID(riid, &IID_IDirect3DResource8) + || IsEqualGUID(riid, &IID_IUnknown)) + { IUnknown_AddRef(iface); - *ppobj = This; + *ppobj = iface; return S_OK; } - WARN("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ppobj); + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + *ppobj = NULL; return E_NOINTERFACE; }

1 0

Józef Kucia : dinput8/tests: Use CLSCTX_INPROC_SERVER instead of a magic number.
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: 42235c3cc9dc34bce5e54fbbef0a7a379baf8890 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42235c3cc9dc34bce5e54fbbe… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Sun Mar 25 15:48:37 2012 +0200 dinput8/tests: Use CLSCTX_INPROC_SERVER instead of a magic number. --- dlls/dinput8/tests/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c index 7fbdfaa..2deb348 100644 --- a/dlls/dinput8/tests/device.c +++ b/dlls/dinput8/tests/device.c @@ -271,7 +271,7 @@ static void test_action_mapping(void) DIACTIONFORMAT af; struct enum_data data = {pDI, &af, NULL, NULL, NULL, 0}; - hr = CoCreateInstance(&CLSID_DirectInput8, 0, 1, &IID_IDirectInput8A, (LPVOID*)&pDI); + hr = CoCreateInstance(&CLSID_DirectInput8, 0, CLSCTX_INPROC_SERVER, &IID_IDirectInput8A, (LPVOID*)&pDI); if (hr == DIERR_OLDDIRECTINPUTVERSION || hr == DIERR_BETADIRECTINPUTVERSION || hr == REGDB_E_CLASSNOTREG)

1 0

Lucas Zawacki : dinput: Correct wrong loop delimiter in diactionformat_priority.
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: 146176cc3802e837cad011aaf7e0414cad57694c URL: http://source.winehq.org/git/wine.git/?a=commit;h=146176cc3802e837cad011aaf… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Sat Mar 24 18:47:47 2012 -0300 dinput: Correct wrong loop delimiter in diactionformat_priority. --- dlls/dinput/dinput_main.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 6350a18..46b7e08 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -308,32 +308,32 @@ void _copy_diactionformatWtoA(LPDIACTIONFORMATA to, LPDIACTIONFORMATW from) } } -/* _diactionformat_priority +/* diactionformat_priority * * Given a DIACTIONFORMAT structure and a DI genre, returns the enumeration * priority. Joysticks should pass the game genre, and mouse or keyboard their * respective DI*_MASK */ -static DWORD _diactionformat_priorityA(LPDIACTIONFORMATA lpdiaf, DWORD genre) +static DWORD diactionformat_priorityA(LPDIACTIONFORMATA lpdiaf, DWORD genre) { int i; DWORD priorityFlags = 0; /* If there's at least one action for the device it's priority 1 */ - for(i=0; i < lpdiaf->dwActionSize; i++) + for(i=0; i < lpdiaf->dwNumActions; i++) if ((lpdiaf->rgoAction[i].dwSemantic & genre) == genre) priorityFlags |= DIEDBS_MAPPEDPRI1; return priorityFlags; } -static DWORD _diactionformat_priorityW(LPDIACTIONFORMATW lpdiaf, DWORD genre) +static DWORD diactionformat_priorityW(LPDIACTIONFORMATW lpdiaf, DWORD genre) { int i; DWORD priorityFlags = 0; /* If there's at least one action for the device it's priority 1 */ - for(i=0; i < lpdiaf->dwActionSize; i++) + for(i=0; i < lpdiaf->dwNumActions; i++) if ((lpdiaf->rgoAction[i].dwSemantic & genre) == genre) priorityFlags |= DIEDBS_MAPPEDPRI1; @@ -913,7 +913,7 @@ static HRESULT WINAPI IDirectInput8AImpl_EnumDevicesBySemantics( { TRACE(" - checking device %u ('%s')\n", i, dinput_devices[i]->name); - callbackFlags = _diactionformat_priorityA(lpdiActionFormat, lpdiActionFormat->dwGenre); + callbackFlags = diactionformat_priorityA(lpdiActionFormat, lpdiActionFormat->dwGenre); /* Default behavior is to enumerate attached game controllers */ enumSuccess = dinput_devices[i]->enum_deviceA(DI8DEVCLASS_GAMECTRL, DIEDFL_ATTACHEDONLY | dwFlags, &didevi, This->dwVersion, j); if (enumSuccess) @@ -931,7 +931,7 @@ static HRESULT WINAPI IDirectInput8AImpl_EnumDevicesBySemantics( /* Enumerate keyboard and mouse */ for(i=0; i < sizeof(guids)/sizeof(guids[0]); i++) { - callbackFlags = _diactionformat_priorityA(lpdiActionFormat, actionMasks[i]); + callbackFlags = diactionformat_priorityA(lpdiActionFormat, actionMasks[i]); IDirectInput_CreateDevice(iface, guids[i], &lpdid, NULL); IDirectInputDevice_GetDeviceInfo(lpdid, &didevi); @@ -973,7 +973,7 @@ static HRESULT WINAPI IDirectInput8WImpl_EnumDevicesBySemantics( { TRACE(" - checking device %u ('%s')\n", i, dinput_devices[i]->name); - callbackFlags = _diactionformat_priorityW(lpdiActionFormat, lpdiActionFormat->dwGenre); + callbackFlags = diactionformat_priorityW(lpdiActionFormat, lpdiActionFormat->dwGenre); /* Default behavior is to enumerate attached game controllers */ enumSuccess = dinput_devices[i]->enum_deviceW(DI8DEVCLASS_GAMECTRL, DIEDFL_ATTACHEDONLY | dwFlags, &didevi, This->dwVersion, j); if (enumSuccess) @@ -991,7 +991,7 @@ static HRESULT WINAPI IDirectInput8WImpl_EnumDevicesBySemantics( /* Enumerate keyboard and mouse */ for(i=0; i < sizeof(guids)/sizeof(guids[0]); i++) { - callbackFlags = _diactionformat_priorityW(lpdiActionFormat, actionMasks[i]); + callbackFlags = diactionformat_priorityW(lpdiActionFormat, actionMasks[i]); IDirectInput_CreateDevice(iface, guids[i], &lpdid, NULL); IDirectInputDevice_GetDeviceInfo(lpdid, &didevi);

1 0

Michael Stefaniuc : d3d10core: Standardize COM aggregation for d3d10_device .
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: b01ce6b633dfaad9227b7fc4e707ffff1a01b953 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b01ce6b633dfaad9227b7fc4e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Mar 22 17:18:47 2012 +0100 d3d10core: Standardize COM aggregation for d3d10_device. --- dlls/d3d10core/d3d10core_main.c | 2 +- dlls/d3d10core/d3d10core_private.h | 4 +- dlls/d3d10core/device.c | 65 ++++++++++++++++-------------------- 3 files changed, 32 insertions(+), 39 deletions(-) diff --git a/dlls/d3d10core/d3d10core_main.c b/dlls/d3d10core/d3d10core_main.c index 9d0c5d7..e977afa 100644 --- a/dlls/d3d10core/d3d10core_main.c +++ b/dlls/d3d10core/d3d10core_main.c @@ -82,7 +82,7 @@ static HRESULT WINAPI layer_create(enum dxgi_device_layer_id id, void **layer_ba object = *layer_base; d3d10_device_init(object, device_object); - *device_layer = &object->inner_unknown_vtbl; + *device_layer = &object->IUnknown_inner; TRACE("Created d3d10 device at %p\n", object); diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 21e2e95..d99a337 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -69,10 +69,10 @@ HRESULT parse_dxbc(const char *data, SIZE_T data_size, /* IDirect3D10Device */ struct d3d10_device { + IUnknown IUnknown_inner; ID3D10Device ID3D10Device_iface; - const struct IUnknownVtbl *inner_unknown_vtbl; IWineDXGIDeviceParent IWineDXGIDeviceParent_iface; - IUnknown *outer_unknown; + IUnknown *outer_unk; LONG refcount; struct wined3d_device_parent device_parent; diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 7ca4409..cf21bba 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -26,41 +26,36 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d10core); /* Inner IUnknown methods */ -static inline struct d3d10_device *d3d10_device_from_inner_unknown(IUnknown *iface) +static inline struct d3d10_device *impl_from_IUnknown(IUnknown *iface) { - return (struct d3d10_device *)((char*)iface - FIELD_OFFSET(struct d3d10_device, inner_unknown_vtbl)); + return CONTAINING_RECORD(iface, struct d3d10_device, IUnknown_inner); } -static HRESULT STDMETHODCALLTYPE d3d10_device_inner_QueryInterface(IUnknown *iface, REFIID riid, void **object) +static HRESULT STDMETHODCALLTYPE d3d10_device_inner_QueryInterface(IUnknown *iface, REFIID riid, + void **ppv) { - struct d3d10_device *This = d3d10_device_from_inner_unknown(iface); + struct d3d10_device *This = impl_from_IUnknown(iface); - TRACE("iface %p, riid %s, object %p\n", iface, debugstr_guid(riid), object); + TRACE("iface %p, riid %s, ppv %p\n", iface, debugstr_guid(riid), ppv); - if (IsEqualGUID(riid, &IID_IUnknown) - || IsEqualGUID(riid, &IID_ID3D10Device)) + if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_ID3D10Device)) + *ppv = &This->ID3D10Device_iface; + else if (IsEqualGUID(riid, &IID_IWineDXGIDeviceParent)) + *ppv = &This->IWineDXGIDeviceParent_iface; + else { - ID3D10Device_AddRef(&This->ID3D10Device_iface); - *object = This; - return S_OK; + WARN("%s not implemented, returning E_NOINTERFACE\n", debugstr_guid(riid)); + *ppv = NULL; + return E_NOINTERFACE; } - if (IsEqualGUID(riid, &IID_IWineDXGIDeviceParent)) - { - IWineDXGIDeviceParent_AddRef(&This->IWineDXGIDeviceParent_iface); - *object = &This->IWineDXGIDeviceParent_iface; - return S_OK; - } - - WARN("%s not implemented, returning E_NOINTERFACE\n", debugstr_guid(riid)); - - *object = NULL; - return E_NOINTERFACE; + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; } static ULONG STDMETHODCALLTYPE d3d10_device_inner_AddRef(IUnknown *iface) { - struct d3d10_device *This = d3d10_device_from_inner_unknown(iface); + struct d3d10_device *This = impl_from_IUnknown(iface); ULONG refcount = InterlockedIncrement(&This->refcount); TRACE("%p increasing refcount to %u\n", This, refcount); @@ -70,7 +65,7 @@ static ULONG STDMETHODCALLTYPE d3d10_device_inner_AddRef(IUnknown *iface) static ULONG STDMETHODCALLTYPE d3d10_device_inner_Release(IUnknown *iface) { - struct d3d10_device *This = d3d10_device_from_inner_unknown(iface); + struct d3d10_device *This = impl_from_IUnknown(iface); ULONG refcount = InterlockedDecrement(&This->refcount); TRACE("%p decreasing refcount to %u\n", This, refcount); @@ -92,25 +87,22 @@ static inline struct d3d10_device *impl_from_ID3D10Device(ID3D10Device *iface) } static HRESULT STDMETHODCALLTYPE d3d10_device_QueryInterface(ID3D10Device *iface, REFIID riid, - void **object) + void **ppv) { struct d3d10_device *This = impl_from_ID3D10Device(iface); - TRACE("Forwarding to outer IUnknown\n"); - return IUnknown_QueryInterface(This->outer_unknown, riid, object); + return IUnknown_QueryInterface(This->outer_unk, riid, ppv); } static ULONG STDMETHODCALLTYPE d3d10_device_AddRef(ID3D10Device *iface) { struct d3d10_device *This = impl_from_ID3D10Device(iface); - TRACE("Forwarding to outer IUnknown\n"); - return IUnknown_AddRef(This->outer_unknown); + return IUnknown_AddRef(This->outer_unk); } static ULONG STDMETHODCALLTYPE d3d10_device_Release(ID3D10Device *iface) { struct d3d10_device *This = impl_from_ID3D10Device(iface); - TRACE("Forwarding to outer IUnknown\n"); - return IUnknown_Release(This->outer_unknown); + return IUnknown_Release(This->outer_unk); } /* ID3D10Device methods */ @@ -1306,22 +1298,22 @@ static inline struct d3d10_device *device_from_dxgi_device_parent(IWineDXGIDevic } static HRESULT STDMETHODCALLTYPE dxgi_device_parent_QueryInterface(IWineDXGIDeviceParent *iface, - REFIID riid, void **object) + REFIID riid, void **ppv) { struct d3d10_device *device = device_from_dxgi_device_parent(iface); - return d3d10_device_QueryInterface(&device->ID3D10Device_iface, riid, object); + return IUnknown_QueryInterface(device->outer_unk, riid, ppv); } static ULONG STDMETHODCALLTYPE dxgi_device_parent_AddRef(IWineDXGIDeviceParent *iface) { struct d3d10_device *device = device_from_dxgi_device_parent(iface); - return d3d10_device_AddRef(&device->ID3D10Device_iface); + return IUnknown_AddRef(device->outer_unk); } static ULONG STDMETHODCALLTYPE dxgi_device_parent_Release(IWineDXGIDeviceParent *iface) { struct d3d10_device *device = device_from_dxgi_device_parent(iface); - return d3d10_device_Release(&device->ID3D10Device_iface); + return IUnknown_Release(device->outer_unk); } static struct wined3d_device_parent * STDMETHODCALLTYPE dxgi_device_parent_get_wined3d_device_parent( @@ -1554,9 +1546,10 @@ static const struct wined3d_device_parent_ops d3d10_wined3d_device_parent_ops = void d3d10_device_init(struct d3d10_device *device, void *outer_unknown) { device->ID3D10Device_iface.lpVtbl = &d3d10_device_vtbl; - device->inner_unknown_vtbl = &d3d10_device_inner_unknown_vtbl; + device->IUnknown_inner.lpVtbl = &d3d10_device_inner_unknown_vtbl; device->IWineDXGIDeviceParent_iface.lpVtbl = &d3d10_dxgi_device_parent_vtbl; device->device_parent.ops = &d3d10_wined3d_device_parent_ops; device->refcount = 1; - device->outer_unknown = outer_unknown; + /* COM aggregation always takes place */ + device->outer_unk = outer_unknown; }

1 0

Hans Leidekker : msi: Mask off modifiers before setting the UILevel property.
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: 280af52666f66fc8185f9c482d254783550e87b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=280af52666f66fc8185f9c482… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Mar 22 11:02:54 2012 +0100 msi: Mask off modifiers before setting the UILevel property. Spotted by Aric Stewart. --- dlls/msi/package.c | 6 +++--- dlls/msi/tests/package.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 3 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 25d00b4..43c6ff9 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1154,9 +1154,9 @@ void msi_adjust_privilege_properties( MSIPACKAGE *package ) MSIPACKAGE *MSI_CreatePackage( MSIDATABASE *db, LPCWSTR base_url ) { - static const WCHAR szpi[] = {'%','i',0}; + static const WCHAR fmtW[] = {'%','u',0}; MSIPACKAGE *package; - WCHAR uilevel[10]; + WCHAR uilevel[11]; UINT r; TRACE("%p\n", db); @@ -1181,7 +1181,7 @@ MSIPACKAGE *MSI_CreatePackage( MSIDATABASE *db, LPCWSTR base_url ) set_installed_prop( package ); set_installer_properties( package ); - sprintfW(uilevel,szpi,gUILevel); + sprintfW( uilevel, fmtW, gUILevel & INSTALLUILEVEL_MASK ); msi_set_property(package->db, szUILevel, uilevel); r = msi_load_summary_properties( package ); diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 9808dfa..5a2ce9e 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -10031,6 +10031,7 @@ static void test_installprops(void) UINT r; REGSAM access = KEY_ALL_ACCESS; SYSTEM_INFO si; + INSTALLUILEVEL uilevel; if (is_wow64) access |= KEY_WOW64_64KEY; @@ -10039,6 +10040,8 @@ static void test_installprops(void) lstrcat(path, "\\"); lstrcat(path, msifile); + uilevel = MsiSetInternalUI(INSTALLUILEVEL_BASIC|INSTALLUILEVEL_SOURCERESONLY, NULL); + hdb = create_package_db(); ok( hdb, "failed to create database\n"); @@ -10046,6 +10049,7 @@ static void test_installprops(void) if (r == ERROR_INSTALL_PACKAGE_REJECTED) { skip("Not enough rights to perform tests\n"); + MsiSetInternalUI(uilevel, NULL); DeleteFile(msifile); return; } @@ -10053,6 +10057,21 @@ static void test_installprops(void) MsiCloseHandle(hdb); + buf[0] = 0; + size = MAX_PATH; + r = MsiGetProperty(hpkg, "UILevel", buf, &size); + ok( r == ERROR_SUCCESS, "failed to get property: %d\n", r); + ok( !lstrcmp(buf, "3"), "Expected \"3\", got \"%s\"\n", buf); + + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + + buf[0] = 0; + size = MAX_PATH; + r = MsiGetProperty(hpkg, "UILevel", buf, &size); + ok( r == ERROR_SUCCESS, "failed to get property: %d\n", r); + ok( !lstrcmp(buf, "3"), "Expected \"3\", got \"%s\"\n", buf); + + buf[0] = 0; size = MAX_PATH; r = MsiGetProperty(hpkg, "DATABASE", buf, &size); ok( r == ERROR_SUCCESS, "failed to get property: %d\n", r); @@ -10071,6 +10090,7 @@ static void test_installprops(void) RegQueryValueEx(hkey2, "RegisteredOwner", NULL, &type, (LPBYTE)path, &size); } + buf[0] = 0; size = MAX_PATH; r = MsiGetProperty(hpkg, "USERNAME", buf, &size); ok( r == ERROR_SUCCESS, "failed to get property: %d\n", r); @@ -10088,37 +10108,44 @@ static void test_installprops(void) if (*path) { + buf[0] = 0; size = MAX_PATH; r = MsiGetProperty(hpkg, "COMPANYNAME", buf, &size); ok( r == ERROR_SUCCESS, "failed to get property: %d\n", r); ok( !lstrcmp(buf, path), "Expected %s, got %s\n", path, buf); } + buf[0] = 0; size = MAX_PATH; r = MsiGetProperty(hpkg, "VersionDatabase", buf, &size); ok( r == ERROR_SUCCESS, "failed to get property: %d\n", r); trace("VersionDatabase = %s\n", buf); + buf[0] = 0; size = MAX_PATH; r = MsiGetProperty(hpkg, "VersionMsi", buf, &size); ok( r == ERROR_SUCCESS, "failed to get property: %d\n", r); trace("VersionMsi = %s\n", buf); + buf[0] = 0; size = MAX_PATH; r = MsiGetProperty(hpkg, "Date", buf, &size); ok( r == ERROR_SUCCESS, "failed to get property: %d\n", r); trace("Date = %s\n", buf); + buf[0] = 0; size = MAX_PATH; r = MsiGetProperty(hpkg, "Time", buf, &size); ok( r == ERROR_SUCCESS, "failed to get property: %d\n", r); trace("Time = %s\n", buf); + buf[0] = 0; size = MAX_PATH; r = MsiGetProperty(hpkg, "PackageCode", buf, &size); ok( r == ERROR_SUCCESS, "failed to get property: %d\n", r); trace("PackageCode = %s\n", buf); + buf[0] = 0; size = MAX_PATH; r = MsiGetProperty(hpkg, "ComputerName", buf, &size); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS got %d\n", r); @@ -10127,18 +10154,21 @@ static void test_installprops(void) langid = GetUserDefaultLangID(); sprintf(path, "%d", langid); + buf[0] = 0; size = MAX_PATH; r = MsiGetProperty(hpkg, "UserLanguageID", buf, &size); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS got %d\n", r); ok( !lstrcmpA(buf, path), "Expected \"%s\", got \"%s\"\n", path, buf); res = GetSystemMetrics(SM_CXSCREEN); + buf[0] = 0; size = MAX_PATH; r = MsiGetProperty(hpkg, "ScreenX", buf, &size); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS got %d\n", r); ok(atol(buf) == res, "Expected %d, got %ld\n", res, atol(buf)); res = GetSystemMetrics(SM_CYSCREEN); + buf[0] = 0; size = MAX_PATH; r = MsiGetProperty(hpkg, "ScreenY", buf, &size); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS got %d\n", r); @@ -10350,6 +10380,7 @@ static void test_installprops(void) CloseHandle(hkey2); MsiCloseHandle(hpkg); DeleteFile(msifile); + MsiSetInternalUI(uilevel, NULL); } static void test_launchconditions(void)

1 0

Hans Leidekker : msi: Get the UI level from the global variable instead of the property.
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: 9b2b760ea91708e021c4c78d378258267ee53289 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b2b760ea91708e021c4c78d3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Mar 22 11:02:06 2012 +0100 msi: Get the UI level from the global variable instead of the property. --- dlls/msi/action.c | 3 +-- dlls/msi/dialog.c | 3 +-- dlls/msi/media.c | 5 ++--- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 16e2186..8abf456 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -480,8 +480,7 @@ UINT msi_set_sourcedir_props(MSIPACKAGE *package, BOOL replace) static BOOL needs_ui_sequence(MSIPACKAGE *package) { - INT level = msi_get_property_int(package->db, szUILevel, 0); - return (level & INSTALLUILEVEL_MASK) >= INSTALLUILEVEL_REDUCED; + return (gUILevel & INSTALLUILEVEL_MASK) >= INSTALLUILEVEL_REDUCED; } UINT msi_set_context(MSIPACKAGE *package) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 4e908ff..04a4a6b 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -3978,8 +3978,7 @@ UINT msi_spawn_error_dialog( MSIPACKAGE *package, LPWSTR error_dialog, LPWSTR er 'M','S','I','E','r','r','o','r','D','i','a','l','o','g','R','e','s','u','l','t',0 }; - if ( (msi_get_property_int( package->db, szUILevel, 0 ) & INSTALLUILEVEL_MASK) == INSTALLUILEVEL_NONE ) - return ERROR_SUCCESS; + if ((gUILevel & INSTALLUILEVEL_MASK) == INSTALLUILEVEL_NONE) return ERROR_SUCCESS; if ( !error_dialog ) { diff --git a/dlls/msi/media.c b/dlls/msi/media.c index 0199178..dd5ecd6 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -77,9 +77,8 @@ static UINT msi_change_media(MSIPACKAGE *package, MSIMEDIAINFO *mi) static const WCHAR error_prop[] = {'E','r','r','o','r','D','i','a','l','o','g',0}; - if ((msi_get_property_int(package->db, szUILevel, 0) & INSTALLUILEVEL_MASK) == - INSTALLUILEVEL_NONE && !gUIHandlerA && !gUIHandlerW && !gUIHandlerRecord) - return ERROR_SUCCESS; + if ((gUILevel & INSTALLUILEVEL_MASK) == INSTALLUILEVEL_NONE && + !gUIHandlerA && !gUIHandlerW && !gUIHandlerRecord) return ERROR_SUCCESS; error = msi_build_error_string(package, 1302, 1, mi->disk_prompt); error_dialog = msi_dup_property(package->db, error_prop);

1 0

Vincent Povirk : gdiplus: Store copies of remap tables in ImageAttributes objects.
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: 673377a7b9979ec73b4c7d5ddf6dd3284d5b5b39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=673377a7b9979ec73b4c7d5dd… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Mar 21 15:29:25 2012 -0500 gdiplus: Store copies of remap tables in ImageAttributes objects. --- dlls/gdiplus/gdiplus_private.h | 2 +- dlls/gdiplus/imageattributes.c | 23 ++++++++++++++++++++++- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 24df3dd..3b82b08 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -326,7 +326,7 @@ struct color_matrix{ struct color_remap_table{ BOOL enabled; INT mapsize; - GDIPCONST ColorMap *colormap; + ColorMap *colormap; }; struct GpImageAttributes{ diff --git a/dlls/gdiplus/imageattributes.c b/dlls/gdiplus/imageattributes.c index c157af3..bd5c082 100644 --- a/dlls/gdiplus/imageattributes.c +++ b/dlls/gdiplus/imageattributes.c @@ -62,11 +62,16 @@ GpStatus WINGDIPAPI GdipCreateImageAttributes(GpImageAttributes **imageattr) GpStatus WINGDIPAPI GdipDisposeImageAttributes(GpImageAttributes *imageattr) { + int i; + TRACE("(%p)\n", imageattr); if(!imageattr) return InvalidParameter; + for (i=0; i<ColorAdjustTypeCount; i++) + GdipFree(imageattr->colorremaptables[i].colormap); + GdipFree(imageattr); return Ok; @@ -205,6 +210,8 @@ GpStatus WINGDIPAPI GdipSetImageAttributesRemapTable(GpImageAttributes *imageAtt ColorAdjustType type, BOOL enableFlag, UINT mapSize, GDIPCONST ColorMap *map) { + ColorMap *new_map; + TRACE("(%p,%u,%i,%u,%p)\n", imageAttr, type, enableFlag, mapSize, map); if(!imageAttr || type >= ColorAdjustTypeCount) @@ -215,8 +222,22 @@ GpStatus WINGDIPAPI GdipSetImageAttributesRemapTable(GpImageAttributes *imageAtt if(!map || !mapSize) return InvalidParameter; + new_map = GdipAlloc(sizeof(*map) * mapSize); + + if (!new_map) + return OutOfMemory; + + memcpy(new_map, map, sizeof(*map) * mapSize); + + GdipFree(imageAttr->colorremaptables[type].colormap); + imageAttr->colorremaptables[type].mapsize = mapSize; - imageAttr->colorremaptables[type].colormap = map; + imageAttr->colorremaptables[type].colormap = new_map; + } + else + { + GdipFree(imageAttr->colorremaptables[type].colormap); + imageAttr->colorremaptables[type].colormap = NULL; } imageAttr->colorremaptables[type].enabled = enableFlag;

1 0

← Newer
1
...
23
24
25
26
27
28
29
...
71
Older →

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 March 2012