wine-commits June 2013

wine-commits@winehq.org

2 participants
411 discussions

Henri Verbeet : wined3d: Pass a wined3d_resource_desc structure to device_parent_create_texture_surface ().
by Alexandre Julliard 04 Jun '13

04 Jun '13

Module: wine Branch: master Commit: a4d2660c9b1e24898c81944f9c59078943b563a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4d2660c9b1e24898c81944f9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 4 09:57:07 2013 +0200 wined3d: Pass a wined3d_resource_desc structure to device_parent_create_texture_surface(). --- dlls/d3d10core/device.c | 14 +++++++------- dlls/d3d8/device.c | 17 ++++++++--------- dlls/d3d9/device.c | 16 ++++++++-------- dlls/ddraw/ddraw.c | 13 ++++++------- dlls/wined3d/texture.c | 22 ++++++++++++---------- include/wine/wined3d.h | 3 +-- 6 files changed, 42 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a4d2660c9b1e24898c819…

1 0

Henri Verbeet : wined3d: Properly set resource dimensions in wined3d_texture_init().
by Alexandre Julliard 04 Jun '13

04 Jun '13

Module: wine Branch: master Commit: 1276a3db041786d47f99c5c651b053d4cdbb8354 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1276a3db041786d47f99c5c65… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 4 09:57:06 2013 +0200 wined3d: Properly set resource dimensions in wined3d_texture_init(). --- dlls/wined3d/texture.c | 24 +++++++++--------------- 1 files changed, 9 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index a211976..2cf125f 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -28,13 +28,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_texture); static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struct wined3d_texture_ops *texture_ops, UINT layer_count, UINT level_count, enum wined3d_resource_type resource_type, struct wined3d_device *device, - DWORD usage, const struct wined3d_format *format, enum wined3d_pool pool, void *parent, - const struct wined3d_parent_ops *parent_ops, const struct wined3d_resource_ops *resource_ops) + DWORD usage, const struct wined3d_format *format, enum wined3d_pool pool, UINT width, UINT height, UINT depth, + void *parent, const struct wined3d_parent_ops *parent_ops, const struct wined3d_resource_ops *resource_ops) { HRESULT hr; hr = resource_init(&texture->resource, device, resource_type, format, - WINED3D_MULTISAMPLE_NONE, 0, usage, pool, 0, 0, 0, 0, + WINED3D_MULTISAMPLE_NONE, 0, usage, pool, width, height, depth, 0, parent, parent_ops, resource_ops); if (FAILED(hr)) { @@ -822,10 +822,8 @@ static HRESULT cubetexture_init(struct wined3d_texture *texture, UINT edge_lengt } } - hr = wined3d_texture_init(texture, &texture2d_ops, 6, levels, - WINED3D_RTYPE_CUBE_TEXTURE, device, usage, format, pool, - parent, parent_ops, &texture2d_resource_ops); - if (FAILED(hr)) + if (FAILED(hr = wined3d_texture_init(texture, &texture2d_ops, 6, levels, WINED3D_RTYPE_CUBE_TEXTURE, device, + usage, format, pool, edge_length, edge_length, 1, parent, parent_ops, &texture2d_resource_ops))) { WARN("Failed to initialize texture, returning %#x\n", hr); return hr; @@ -948,10 +946,8 @@ static HRESULT texture_init(struct wined3d_texture *texture, UINT width, UINT he TRACE("Calculated levels = %u.\n", levels); } - hr = wined3d_texture_init(texture, &texture2d_ops, 1, levels, - WINED3D_RTYPE_TEXTURE, device, usage, format, pool, - parent, parent_ops, &texture2d_resource_ops); - if (FAILED(hr)) + if (FAILED(hr = wined3d_texture_init(texture, &texture2d_ops, 1, levels, WINED3D_RTYPE_TEXTURE, device, + usage, format, pool, width, height, 1, parent, parent_ops, &texture2d_resource_ops))) { WARN("Failed to initialize texture, returning %#x.\n", hr); return hr; @@ -1221,10 +1217,8 @@ static HRESULT volumetexture_init(struct wined3d_texture *texture, UINT width, U } } - hr = wined3d_texture_init(texture, &texture3d_ops, 1, levels, - WINED3D_RTYPE_VOLUME_TEXTURE, device, usage, format, pool, - parent, parent_ops, &texture3d_resource_ops); - if (FAILED(hr)) + if (FAILED(hr = wined3d_texture_init(texture, &texture3d_ops, 1, levels, WINED3D_RTYPE_VOLUME_TEXTURE, device, + usage, format, pool, width, height, depth, parent, parent_ops, &texture3d_resource_ops))) { WARN("Failed to initialize texture, returning %#x.\n", hr); return hr;

1 0

Christian Costa : strmbase: Display iface in traces and new ref in AddRef and Release for IEnumPins.
by Alexandre Julliard 04 Jun '13

04 Jun '13

Module: wine Branch: master Commit: 163943058c39e9b63f25066acbe7c5299069ac60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=163943058c39e9b63f25066ac… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Jun 4 09:33:57 2013 +0200 strmbase: Display iface in traces and new ref in AddRef and Release for IEnumPins. --- dlls/strmbase/enumpins.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/strmbase/enumpins.c b/dlls/strmbase/enumpins.c index eab4d5b..6993bae 100644 --- a/dlls/strmbase/enumpins.c +++ b/dlls/strmbase/enumpins.c @@ -76,7 +76,7 @@ HRESULT WINAPI EnumPins_Construct(BaseFilter *base, BaseFilter_GetPin receive_p static HRESULT WINAPI IEnumPinsImpl_QueryInterface(IEnumPins * iface, REFIID riid, LPVOID * ppv) { - TRACE("(%s, %p)\n", debugstr_guid(riid), ppv); + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); *ppv = NULL; @@ -99,28 +99,27 @@ static HRESULT WINAPI IEnumPinsImpl_QueryInterface(IEnumPins * iface, REFIID rii static ULONG WINAPI IEnumPinsImpl_AddRef(IEnumPins * iface) { IEnumPinsImpl *This = impl_from_IEnumPins(iface); - ULONG refCount = InterlockedIncrement(&This->refCount); + ULONG ref = InterlockedIncrement(&This->refCount); - TRACE("(%p)->() AddRef from %d\n", This, refCount - 1); + TRACE("(%p)->(): new ref = %u\n", iface, ref); - return refCount; + return ref; } static ULONG WINAPI IEnumPinsImpl_Release(IEnumPins * iface) { IEnumPinsImpl *This = impl_from_IEnumPins(iface); - ULONG refCount = InterlockedDecrement(&This->refCount); + ULONG ref = InterlockedDecrement(&This->refCount); - TRACE("(%p)->() Release from %d\n", This, refCount + 1); + TRACE("(%p)->(): new ref = %u\n", iface, ref); - if (!refCount) + if (!ref) { IBaseFilter_Release(&This->base->IBaseFilter_iface); CoTaskMemFree(This); - return 0; } - else - return refCount; + + return ref; } static HRESULT WINAPI IEnumPinsImpl_Next(IEnumPins * iface, ULONG cPins, IPin ** ppPins, ULONG * pcFetched) @@ -129,7 +128,7 @@ static HRESULT WINAPI IEnumPinsImpl_Next(IEnumPins * iface, ULONG cPins, IPin ** HRESULT hr = S_OK; ULONG i = 0; - TRACE("(%u, %p, %p)\n", cPins, ppPins, pcFetched); + TRACE("(%p)->(%u, %p, %p)\n", iface, cPins, ppPins, pcFetched); if (!ppPins) return E_POINTER; @@ -168,7 +167,7 @@ static HRESULT WINAPI IEnumPinsImpl_Skip(IEnumPins * iface, ULONG cPins) { IEnumPinsImpl *This = impl_from_IEnumPins(iface); - TRACE("(%u)\n", cPins); + TRACE("(%p)->(%u)\n", iface, cPins); if (This->Version != This->receive_version(This->base)) return VFW_E_ENUM_OUT_OF_SYNC; @@ -184,7 +183,8 @@ static HRESULT WINAPI IEnumPinsImpl_Reset(IEnumPins * iface) { IEnumPinsImpl *This = impl_from_IEnumPins(iface); - TRACE("IEnumPinsImpl::Reset()\n"); + TRACE("(%p)->()\n", iface); + This->Version = This->receive_version(This->base); This->uIndex = 0; @@ -196,7 +196,7 @@ static HRESULT WINAPI IEnumPinsImpl_Clone(IEnumPins * iface, IEnumPins ** ppEnum HRESULT hr; IEnumPinsImpl *This = impl_from_IEnumPins(iface); - TRACE("(%p)\n", ppEnum); + TRACE("(%p)->(%p)\n", iface, ppEnum); hr = EnumPins_Construct(This->base, This->receive_pin, This->receive_pincount, This->receive_version, ppEnum); if (FAILED(hr))

1 0

Christian Costa : d3dx9_36: Remove 'relay' in traces for functions that do not forward to another ones.
by Alexandre Julliard 04 Jun '13

04 Jun '13

Module: wine Branch: master Commit: 550415ec78c66de5a6d0f799571456f4eadac803 URL: http://source.winehq.org/git/wine.git/?a=commit;h=550415ec78c66de5a6d0f7995… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Jun 4 09:32:08 2013 +0200 d3dx9_36: Remove 'relay' in traces for functions that do not forward to another ones. --- dlls/d3dx9_36/line.c | 2 +- dlls/d3dx9_36/sprite.c | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/line.c b/dlls/d3dx9_36/line.c index 1ec643a..e305eb9 100644 --- a/dlls/d3dx9_36/line.c +++ b/dlls/d3dx9_36/line.c @@ -85,7 +85,7 @@ static HRESULT WINAPI ID3DXLineImpl_GetDevice(struct ID3DXLine *iface, struct ID { ID3DXLineImpl *This = impl_from_ID3DXLine(iface); - TRACE ("(%p)->(%p): relay\n", This, device); + TRACE ("(%p)->(%p)\n", This, device); if (device == NULL) return D3DERR_INVALIDCALL; diff --git a/dlls/d3dx9_36/sprite.c b/dlls/d3dx9_36/sprite.c index 658b6ea..1f7defb 100644 --- a/dlls/d3dx9_36/sprite.c +++ b/dlls/d3dx9_36/sprite.c @@ -123,7 +123,7 @@ static HRESULT WINAPI ID3DXSpriteImpl_GetDevice(struct ID3DXSprite *iface, struc { ID3DXSpriteImpl *This = impl_from_ID3DXSprite(iface); - TRACE("(%p)->(%p): relay\n", This, device); + TRACE("(%p)->(%p)\n", This, device); if(device==NULL) return D3DERR_INVALIDCALL; *device=This->device; @@ -258,7 +258,8 @@ static HRESULT WINAPI ID3DXSpriteImpl_Begin(ID3DXSprite *iface, DWORD flags) { ID3DXSpriteImpl *This = impl_from_ID3DXSprite(iface); HRESULT hr; - TRACE("(%p): relay\n", This); + + TRACE("(%p)->(%#x)\n", This, flags); if(flags>D3DXSPRITE_FLAGLIMIT || This->ready) return D3DERR_INVALIDCALL; @@ -384,7 +385,8 @@ static HRESULT WINAPI ID3DXSpriteImpl_Flush(ID3DXSprite *iface) ID3DXSpriteImpl *This = impl_from_ID3DXSprite(iface); SPRITEVERTEX *vertices; int i, count=0, start; - TRACE("(%p)->(): relay\n", This); + + TRACE("(%p)->()\n", This); if(!This->ready) return D3DERR_INVALIDCALL; if(!This->sprite_count) return D3D_OK; @@ -456,7 +458,7 @@ static HRESULT WINAPI ID3DXSpriteImpl_End(ID3DXSprite *iface) { ID3DXSpriteImpl *This = impl_from_ID3DXSprite(iface); - TRACE("(%p)->(): relay\n", This); + TRACE("(%p)->()\n", This); if(!This->ready) return D3DERR_INVALIDCALL; @@ -534,7 +536,7 @@ HRESULT WINAPI D3DXCreateSprite(struct IDirect3DDevice9 *device, struct ID3DXSpr ID3DXSpriteImpl *object; D3DCAPS9 caps; - TRACE("(%p, %p): relay\n", device, sprite); + TRACE("(%p, %p)\n", device, sprite); if(device==NULL || sprite==NULL) return D3DERR_INVALIDCALL;

1 0

Christian Costa : d3dx9_36: Define D3DXSPRITE_xxx flags in hex for better readability.
by Alexandre Julliard 04 Jun '13

04 Jun '13

Module: wine Branch: master Commit: 785921ff4965d9004512dc9b53bcc5c31994e24d URL: http://source.winehq.org/git/wine.git/?a=commit;h=785921ff4965d9004512dc9b5… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Jun 4 09:32:00 2013 +0200 d3dx9_36: Define D3DXSPRITE_xxx flags in hex for better readability. --- include/d3dx9core.h | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/d3dx9core.h b/include/d3dx9core.h index 252d5db..b6226d6 100644 --- a/include/d3dx9core.h +++ b/include/d3dx9core.h @@ -28,15 +28,15 @@ implementing all dlls from d3dx9_24 to d3dx9_36 */ #define D3DX_VERSION 0x0902 #define D3DX_SDK_VERSION 36 -#define D3DXSPRITE_DONOTSAVESTATE 1 -#define D3DXSPRITE_DONOTMODIFY_RENDERSTATE 2 -#define D3DXSPRITE_OBJECTSPACE 4 -#define D3DXSPRITE_BILLBOARD 8 -#define D3DXSPRITE_ALPHABLEND 16 -#define D3DXSPRITE_SORT_TEXTURE 32 -#define D3DXSPRITE_SORT_DEPTH_FRONTTOBACK 64 -#define D3DXSPRITE_SORT_DEPTH_BACKTOFRONT 128 -#define D3DXSPRITE_DO_NOT_ADDREF_TEXTURE 256 +#define D3DXSPRITE_DONOTSAVESTATE 0x00000001 +#define D3DXSPRITE_DONOTMODIFY_RENDERSTATE 0x00000002 +#define D3DXSPRITE_OBJECTSPACE 0x00000004 +#define D3DXSPRITE_BILLBOARD 0x00000008 +#define D3DXSPRITE_ALPHABLEND 0x00000010 +#define D3DXSPRITE_SORT_TEXTURE 0x00000020 +#define D3DXSPRITE_SORT_DEPTH_FRONTTOBACK 0x00000040 +#define D3DXSPRITE_SORT_DEPTH_BACKTOFRONT 0x00000080 +#define D3DXSPRITE_DO_NOT_ADDREF_TEXTURE 0x00000100 /********************************************** ******************** GUIDs *******************

1 0

Christian Costa : d3dx9_36: Fix typo.
by Alexandre Julliard 04 Jun '13

04 Jun '13

Module: wine Branch: master Commit: 539d28a11289ca4c9db6fe080497803a8776b771 URL: http://source.winehq.org/git/wine.git/?a=commit;h=539d28a11289ca4c9db6fe080… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Jun 4 09:31:52 2013 +0200 d3dx9_36: Fix typo. --- dlls/d3dx9_36/effect.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index be80ede..1924c07 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -5631,7 +5631,7 @@ static HRESULT d3dx9_parse_effect(struct ID3DXBaseEffectImpl *base, const char * hr = d3dx9_parse_resource(base, data, &ptr); if (hr != D3D_OK) { - WARN("Failed to parse data\n"); + WARN("Failed to parse resource\n"); goto err_out; } }

1 0

Dmitry Timoshkov : shlwapi: Correct .spec parameter types for Assoc* APIs.
by Alexandre Julliard 04 Jun '13

04 Jun '13

Module: wine Branch: master Commit: f49de6aa087e63d20ae061775bedafe56f45ebc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f49de6aa087e63d20ae061775… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jun 4 15:11:06 2013 +0900 shlwapi: Correct .spec parameter types for Assoc* APIs. --- dlls/shlwapi/shlwapi.spec | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index aad095e..b7aac08 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -548,13 +548,13 @@ @ stdcall AssocCreate(int128 ptr ptr) @ stdcall AssocGetPerceivedType(wstr ptr ptr ptr) -@ stdcall AssocIsDangerous(long) -@ stdcall AssocQueryKeyA(long long str ptr ptr) -@ stdcall AssocQueryKeyW(long long wstr ptr ptr) -@ stdcall AssocQueryStringA(long long ptr ptr ptr ptr) -@ stdcall AssocQueryStringByKeyA(long long ptr ptr ptr ptr) -@ stdcall AssocQueryStringByKeyW(long long ptr ptr ptr ptr) -@ stdcall AssocQueryStringW(long long ptr ptr ptr ptr) +@ stdcall AssocIsDangerous(wstr) +@ stdcall AssocQueryKeyA(long long str str ptr) +@ stdcall AssocQueryKeyW(long long wstr wstr ptr) +@ stdcall AssocQueryStringA(long long str str ptr ptr) +@ stdcall AssocQueryStringByKeyA(long long ptr str ptr ptr) +@ stdcall AssocQueryStringByKeyW(long long ptr wstr ptr ptr) +@ stdcall AssocQueryStringW(long long wstr wstr ptr ptr) @ stdcall ChrCmpIA(long long) @ stdcall ChrCmpIW(long long) @ stdcall ColorAdjustLuma(long long long)

1 0

Austin English : bugzilla: Change no bugs found message
by Jeremy Newman 04 Jun '13

04 Jun '13

Module: bugzilla Branch: master Commit: 4f21a1d141b2530791bc6504974ba9016ec677bc URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=4f21a1d141b2530791bc6… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Jun 3 14:16:50 2013 -0700 bugzilla: Change no bugs found message http://bugs.winehq.org/show_bug.cgi?id=33708 -- -Austin >From 7d265e5623b70bbe3ac1463c2dcebfbd4d7f97d6 Mon Sep 17 00:00:00 2001 From: Austin English <austinenglish(a)gmail.com> Date: Mon, 3 Jun 2013 14:15:48 -0700 Subject: [PATCH] Change no bugs found message --- template/en/default/global/variables.none.tmpl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/template/en/default/global/variables.none.tmpl b/template/en/default/global/variables.none.tmpl index faf1a54..d04440e 100644 --- a/template/en/default/global/variables.none.tmpl +++ b/template/en/default/global/variables.none.tmpl @@ -36,7 +36,7 @@ "ABug" => "A Bug", "bugs" => "bugs", "Bugs" => "Bugs", - "zeroSearchResults" => "Zarro Boogs found", + "zeroSearchResults" => "No bugs found", "Bugzilla" => "Bugzilla" } %]

1 0

Alistair Leslie-Hughes : ole32/tests: Check function pointer.
by Alexandre Julliard 03 Jun '13

03 Jun '13

Module: wine Branch: master Commit: f0806fd68c9f11f20175dae1ca82ba09d514845c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0806fd68c9f11f20175dae1c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Jun 2 20:25:15 2013 +1000 ole32/tests: Check function pointer. --- dlls/ole32/tests/compobj.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index d0adf79..f2cdf6d 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -431,6 +431,12 @@ static void test_CoGetClassObject(void) CloseHandle(info.wait); CloseHandle(info.stop); + if (!pRegOverridePredefKey) + { + win_skip("RegOverridePredefKey not available\n"); + return; + } + pCoInitializeEx(NULL, COINIT_MULTITHREADED); hr = CoGetClassObject(rclsid, CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, (void **)&pUnk);

1 0

Alistair Leslie-Hughes : ole32/tests: Fix crash under NT.
by Alexandre Julliard 03 Jun '13

03 Jun '13

Module: wine Branch: master Commit: 0f4c77d8779d5e14e8f97226abbeddebdd9804c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f4c77d8779d5e14e8f97226a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Jun 2 20:19:57 2013 +1000 ole32/tests: Fix crash under NT. --- dlls/ole32/tests/storage32.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 9d99c38..3514fdd 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -3071,11 +3071,13 @@ if (hr == S_OK) { /* reader mode */ hr = StgOpenStorage(fileW, NULL, STGM_DIRECT_SWMR | STGM_READ | STGM_SHARE_DENY_NONE, NULL, 0, &stg); - ok(hr == S_OK, "got %08x\n", hr); - - hr = IStorage_QueryInterface(stg, &IID_IDirectWriterLock, (void**)&dwlock); - ok(hr == E_NOINTERFACE, "got %08x\n", hr); - IStorage_Release(stg); + ok(hr == S_OK || broken(hr == STG_E_INVALIDFLAG), "got %08x\n", hr); + if(hr == S_OK) + { + hr = IStorage_QueryInterface(stg, &IID_IDirectWriterLock, (void**)&dwlock); + ok(hr == E_NOINTERFACE, "got %08x\n", hr); + IStorage_Release(stg); + } /* writer mode */ hr = StgOpenStorage(fileW, NULL, STGM_DIRECT_SWMR | STGM_READWRITE | STGM_SHARE_DENY_WRITE, NULL, 0, &stg);

1 0

← Newer
1
...
35
36
37
38
39
40
41
42
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 June 2013