November 2012 - Wine-Commits

Francois Gouget : msvcp60: Make some codecvt_xxx() functions static or remove them.
by Alexandre Julliard Nov. 23, 2012

Nov. 23, 2012

Module: wine Branch: master Commit: ebd28d5034c2a19d3ae7cd380a71e8a01c05095e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebd28d5034c2a19d3ae7cd380… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Nov 22 18:38:39 2012 +0100 msvcp60: Make some codecvt_xxx() functions static or remove them. --- dlls/msvcp60/locale.c | 22 +--------------------- dlls/msvcp60/msvcp.h | 3 --- 2 files changed, 1 insertions(+), 24 deletions(-) diff --git a/dlls/msvcp60/locale.c b/dlls/msvcp60/locale.c index 1ad21ae..80920c0 100644 --- a/dlls/msvcp60/locale.c +++ b/dlls/msvcp60/locale.c @@ -2551,15 +2551,6 @@ int __thiscall codecvt_char_do_unshift(const codecvt_char *this, return CODECVT_noconv; } -/* ?unshift@?$codecvt(a)DDH@std@@QBEHAAHPAD1AAPAD(a)Z */ -/* ?unshift@?$codecvt(a)DDH@std@@QEBAHAEAHPEAD1AEAPEAD(a)Z */ -int codecvt_char_unshift(const codecvt_char *this, - int *state, char *to, char *to_end, char **to_next) -{ - TRACE("(%p %p %p %p %p)\n", this, state, to, to_end, to_next); - return call_codecvt_char_do_unshift(this, state, to, to_end, to_next); -} - /* ?do_length@?$codecvt(a)DDH@std@@MBEHABHPBD1I(a)Z */ /* ?do_length@?$codecvt(a)DDH@std@@MEBAHAEBHPEBD1_K(a)Z */ #define call_codecvt_char_do_length(this, state, from, from_end, max) CALL_VTBL_FUNC(this, 28, \ @@ -2696,7 +2687,7 @@ static MSVCP_size_t codecvt_wchar__Getcat(const locale_facet **facet, const loca return LC_CTYPE; } -codecvt_wchar* codecvt_wchar_use_facet(const locale *loc) +static codecvt_wchar* codecvt_wchar_use_facet(const locale *loc) { static codecvt_wchar *obj = NULL; @@ -2926,17 +2917,6 @@ int __thiscall codecvt_wchar_do_unshift(const codecvt_wchar *this, return CODECVT_ok; } -/* ?unshift@?$codecvt(a)GDH@std@@QBEHAAHPAD1AAPAD(a)Z */ -/* ?unshift@?$codecvt(a)GDH@std@@QEBAHAEAHPEAD1AEAPEAD(a)Z */ -/* ?unshift@?$codecvt(a)_WDH@std@@QBEHAAHPAD1AAPAD(a)Z */ -/* ?unshift@?$codecvt(a)_WDH@std@@QEBAHAEAHPEAD1AEAPEAD(a)Z */ -int codecvt_wchar_unshift(const codecvt_wchar *this, - int *state, char *to, char *to_end, char **to_next) -{ - TRACE("(%p %p %p %p %p)\n", this, state, to, to_end, to_next); - return call_codecvt_wchar_do_unshift(this, state, to, to_end, to_next); -} - /* ?do_length@?$codecvt(a)GDH@std@@MBEHABHPBD1I(a)Z */ /* ?do_length@?$codecvt(a)GDH@std@@MEBAHAEBHPEBD1_K(a)Z */ /* ?do_length@?$codecvt(a)_WDH@std@@MBEHABHPBD1I(a)Z */ diff --git a/dlls/msvcp60/msvcp.h b/dlls/msvcp60/msvcp.h index da23e31..cc0e688 100644 --- a/dlls/msvcp60/msvcp.h +++ b/dlls/msvcp60/msvcp.h @@ -107,7 +107,6 @@ typedef struct { } codecvt_char; MSVCP_bool __thiscall codecvt_base_always_noconv(const codecvt_base*); -int codecvt_char_unshift(const codecvt_char*, int*, char*, char*, char**); int __thiscall codecvt_char_out(const codecvt_char*, int*, const char*, const char*, const char**, char*, char*, char**); int __thiscall codecvt_char_in(const codecvt_char*, int*, const char*, @@ -125,7 +124,6 @@ typedef struct { _Cvtvec cvt; } codecvt_wchar; -int codecvt_wchar_unshift(const codecvt_wchar*, int*, char*, char*, char**); int __thiscall codecvt_wchar_out(const codecvt_wchar*, int*, const wchar_t*, const wchar_t*, const wchar_t**, char*, char*, char**); int __thiscall codecvt_wchar_in(const codecvt_wchar*, int*, const char*, @@ -171,7 +169,6 @@ void __thiscall locale_dtor(locale*); void free_locale(void); locale* __thiscall locale__Addfac(locale*, locale_facet*, MSVCP_size_t, MSVCP_size_t); codecvt_char* codecvt_char_use_facet(const locale*); -codecvt_wchar* codecvt_wchar_use_facet(const locale*); codecvt_wchar* codecvt_short_use_facet(const locale*); ctype_char* ctype_char_use_facet(const locale*); ctype_wchar* ctype_wchar_use_facet(const locale*);

1 0

Christian Costa : strmbase: Don' t forget to add ref pUnk in CopyMediaType when pbFormat is null.
by Alexandre Julliard Nov. 22, 2012

Nov. 22, 2012

Module: wine Branch: master Commit: b8a7ead3a3015ee18843743997c9fbe9503cdbc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8a7ead3a3015ee1884374399… Author: Christian Costa <titan.costa(a)gmail.com> Date: Wed Nov 21 09:48:06 2012 +0100 strmbase: Don't forget to add ref pUnk in CopyMediaType when pbFormat is null. --- dlls/strmbase/mediatype.c | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/strmbase/mediatype.c b/dlls/strmbase/mediatype.c index 7f19791..fef2739 100644 --- a/dlls/strmbase/mediatype.c +++ b/dlls/strmbase/mediatype.c @@ -28,15 +28,18 @@ WINE_DEFAULT_DEBUG_CHANNEL(strmbase); -HRESULT WINAPI CopyMediaType(AM_MEDIA_TYPE * pDest, const AM_MEDIA_TYPE *pSrc) +HRESULT WINAPI CopyMediaType(AM_MEDIA_TYPE *dest, const AM_MEDIA_TYPE *src) { - *pDest = *pSrc; - if (!pSrc->pbFormat) return S_OK; - if (!(pDest->pbFormat = CoTaskMemAlloc(pSrc->cbFormat))) - return E_OUTOFMEMORY; - memcpy(pDest->pbFormat, pSrc->pbFormat, pSrc->cbFormat); - if (pDest->pUnk) - IUnknown_AddRef(pDest->pUnk); + *dest = *src; + if (src->pbFormat) + { + dest->pbFormat = CoTaskMemAlloc(src->cbFormat); + if (!dest->pbFormat) + return E_OUTOFMEMORY; + memcpy(dest->pbFormat, src->pbFormat, src->cbFormat); + } + if (dest->pUnk) + IUnknown_AddRef(dest->pUnk); return S_OK; }

1 0

Henri Verbeet : d3d10core: Implement d3d10_device_RSGetScissorRects().
by Alexandre Julliard Nov. 22, 2012

Nov. 22, 2012

Module: wine Branch: master Commit: 9e97bff539afbb77d01bd9e24db4b88bed49fdbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e97bff539afbb77d01bd9e24… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 22 13:45:13 2012 +0100 d3d10core: Implement d3d10_device_RSGetScissorRects(). --- dlls/d3d10core/device.c | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index facacbd..78c9d1b 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -742,7 +742,22 @@ static void STDMETHODCALLTYPE d3d10_device_RSGetViewports(ID3D10Device *iface, static void STDMETHODCALLTYPE d3d10_device_RSGetScissorRects(ID3D10Device *iface, UINT *rect_count, D3D10_RECT *rects) { - FIXME("iface %p, rect_count %p, rects %p stub!\n", iface, rect_count, rects); + struct d3d10_device *device = impl_from_ID3D10Device(iface); + + TRACE("iface %p, rect_count %p, rects %p.\n", iface, rect_count, rects); + + if (!rects) + { + *rect_count = 1; + return; + } + + if (!*rect_count) + return; + + wined3d_device_get_scissor_rect(device->wined3d_device, rects); + if (*rect_count > 1) + memset(&rects[1], 0, (*rect_count - 1) * sizeof(*rects)); } static HRESULT STDMETHODCALLTYPE d3d10_device_GetDeviceRemovedReason(ID3D10Device *iface)

1 0

Henri Verbeet : d3d10core: Implement d3d10_device_RSSetScissorRects().
by Alexandre Julliard Nov. 22, 2012

Nov. 22, 2012

Module: wine Branch: master Commit: 2a8359d44c5cf243c9e498d483dae573868ec259 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a8359d44c5cf243c9e498d48… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 22 13:45:12 2012 +0100 d3d10core: Implement d3d10_device_RSSetScissorRects(). --- dlls/d3d10core/device.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 853c538..facacbd 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -1,5 +1,5 @@ /* - * Copyright 2008-2009 Henri Verbeet for CodeWeavers + * Copyright 2008-2012 Henri Verbeet for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -391,7 +391,17 @@ static void STDMETHODCALLTYPE d3d10_device_RSSetViewports(ID3D10Device *iface, static void STDMETHODCALLTYPE d3d10_device_RSSetScissorRects(ID3D10Device *iface, UINT rect_count, const D3D10_RECT *rects) { - FIXME("iface %p, rect_count %u, rects %p\n", iface, rect_count, rects); + struct d3d10_device *device = impl_from_ID3D10Device(iface); + + TRACE("iface %p, rect_count %u, rects %p.\n", iface, rect_count, rects); + + if (rect_count > 1) + FIXME("Multiple scissor rects not implemented.\n"); + + if (!rect_count) + return; + + wined3d_device_set_scissor_rect(device->wined3d_device, rects); } static void STDMETHODCALLTYPE d3d10_device_CopySubresourceRegion(ID3D10Device *iface,

1 0

Hans Leidekker : ole32/tests: Add a test to show that CoGetPSClsid is not affected by an override of HKEY_CLASSES_ROOT .
by Alexandre Julliard Nov. 22, 2012

Nov. 22, 2012

Module: wine Branch: master Commit: 479b7bcf604f40929b1f600f31f8d7dfc8b6c991 URL: http://source.winehq.org/git/wine.git/?a=commit;h=479b7bcf604f40929b1f600f3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 22 17:15:54 2012 +0100 ole32/tests: Add a test to show that CoGetPSClsid is not affected by an override of HKEY_CLASSES_ROOT. --- dlls/ole32/tests/compobj.c | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 9dfc271..048b082 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -41,6 +41,7 @@ static HRESULT (WINAPI * pCoGetObjectContext)(REFIID riid, LPVOID *ppv); static HRESULT (WINAPI * pCoSwitchCallContext)(IUnknown *pObject, IUnknown **ppOldObject); static HRESULT (WINAPI * pCoGetTreatAsClass)(REFCLSID clsidOld, LPCLSID pClsidNew); static HRESULT (WINAPI * pCoGetContextToken)(ULONG_PTR *token); +static LONG (WINAPI * pRegOverridePredefKey)(HKEY key, HKEY override); #define ok_ole_success(hr, func) ok(hr == S_OK, func " failed with error 0x%08x\n", hr) #define ok_more_than_one_lock() ok(cLocks > 0, "Number of locks should be > 0, but actually is %d\n", cLocks) @@ -715,6 +716,8 @@ static void test_CoGetPSClsid(void) { HRESULT hr; CLSID clsid; + HKEY hkey; + LONG res; hr = CoGetPSClsid(&IID_IClassFactory, &clsid); ok(hr == CO_E_NOTINITIALIZED, @@ -736,6 +739,28 @@ static void test_CoGetPSClsid(void) "CoGetPSClsid for null clsid returned 0x%08x instead of E_INVALIDARG\n", hr); + if (!pRegOverridePredefKey) + { + win_skip("RegOverridePredefKey not available\n"); + CoUninitialize(); + return; + } + hr = CoGetPSClsid(&IID_IClassFactory, &clsid); + ok_ole_success(hr, "CoGetPSClsid"); + + res = RegOpenKeyExA(HKEY_CURRENT_USER, "Software\\Classes", 0, KEY_ALL_ACCESS, &hkey); + ok(!res, "RegOpenKeyExA returned %d\n", res); + + res = pRegOverridePredefKey(HKEY_CLASSES_ROOT, hkey); + ok(!res, "RegOverridePredefKey returned %d\n", res); + + hr = CoGetPSClsid(&IID_IClassFactory, &clsid); + todo_wine ok_ole_success(hr, "CoGetPSClsid"); + + res = pRegOverridePredefKey(HKEY_CLASSES_ROOT, NULL); + ok(!res, "RegOverridePredefKey returned %d\n", res); + + RegCloseKey(hkey); CoUninitialize(); } @@ -1512,10 +1537,12 @@ static void test_CoInitializeEx(void) START_TEST(compobj) { HMODULE hOle32 = GetModuleHandle("ole32"); + HMODULE hAdvapi32 = GetModuleHandle("advapi32"); pCoGetObjectContext = (void*)GetProcAddress(hOle32, "CoGetObjectContext"); pCoSwitchCallContext = (void*)GetProcAddress(hOle32, "CoSwitchCallContext"); pCoGetTreatAsClass = (void*)GetProcAddress(hOle32,"CoGetTreatAsClass"); pCoGetContextToken = (void*)GetProcAddress(hOle32, "CoGetContextToken"); + pRegOverridePredefKey = (void*)GetProcAddress(hAdvapi32, "RegOverridePredefKey"); if (!(pCoInitializeEx = (void*)GetProcAddress(hOle32, "CoInitializeEx"))) { trace("You need DCOM95 installed to run this test\n");

1 0

Henri Verbeet : d3dx9: Avoid LPD3DXFILEENUMOBJECT.
by Alexandre Julliard Nov. 22, 2012

Nov. 22, 2012

Module: wine Branch: master Commit: 3c4c23f4592a3d713a7e9275f73e120d9e31730d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c4c23f4592a3d713a7e9275f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 22 13:45:10 2012 +0100 d3dx9: Avoid LPD3DXFILEENUMOBJECT. --- include/d3dx9xof.h | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/include/d3dx9xof.h b/include/d3dx9xof.h index f110a1f..9789ffd 100644 --- a/include/d3dx9xof.h +++ b/include/d3dx9xof.h @@ -76,10 +76,11 @@ DECLARE_INTERFACE_IID_(ID3DXFile,IUnknown,"cef08cf9-7b4f-4429-9624-2a690a933201" STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; /*** ID3DXFile methods ***/ - STDMETHOD(CreateEnumObject)(THIS_ LPCVOID, D3DXF_FILELOADOPTIONS, LPD3DXFILEENUMOBJECT*) PURE; + STDMETHOD(CreateEnumObject)(THIS_ const void *src, D3DXF_FILELOADOPTIONS type, + struct ID3DXFileEnumObject **enum_obj) PURE; STDMETHOD(CreateSaveObject)(THIS_ LPCVOID, D3DXF_FILESAVEOPTIONS, D3DXF_FILEFORMAT, LPD3DXFILESAVEOBJECT*) PURE; STDMETHOD(RegisterTemplates)(THIS_ LPCVOID, SIZE_T) PURE; - STDMETHOD(RegisterEnumTemplates)(THIS_ LPD3DXFILEENUMOBJECT) PURE; + STDMETHOD(RegisterEnumTemplates)(THIS_ struct ID3DXFileEnumObject *enum_obj) PURE; }; #undef INTERFACE @@ -139,7 +140,7 @@ DECLARE_INTERFACE_IID_(ID3DXFileData,IUnknown,"cef08cfd-7b4f-4429-9624-2a690a933 STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; /*** ID3DXFileData methods ***/ - STDMETHOD(GetEnum)(THIS_ LPD3DXFILEENUMOBJECT*) PURE; + STDMETHOD(GetEnum)(THIS_ ID3DXFileEnumObject **enum_obj) PURE; STDMETHOD(GetName)(THIS_ LPSTR, SIZE_T*) PURE; STDMETHOD(GetId)(THIS_ LPGUID) PURE; STDMETHOD(Lock)(THIS_ SIZE_T*, LPCVOID*) PURE;

1 0

Christian Costa : strmbase: Use FreeMediaType instead of freeing media type by hand and forgetting pUnk release .
by Alexandre Julliard Nov. 22, 2012

Nov. 22, 2012

Module: wine Branch: master Commit: 44c6ca992e7094e625a589b104d0e2e61adf79e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44c6ca992e7094e625a589b10… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Nov 16 15:17:33 2012 +0100 strmbase: Use FreeMediaType instead of freeing media type by hand and forgetting pUnk release. --- dlls/strmbase/mediatype.c | 26 ++++++++++++-------------- 1 files changed, 12 insertions(+), 14 deletions(-) diff --git a/dlls/strmbase/mediatype.c b/dlls/strmbase/mediatype.c index 9c76287..7f19791 100644 --- a/dlls/strmbase/mediatype.c +++ b/dlls/strmbase/mediatype.c @@ -122,7 +122,7 @@ HRESULT WINAPI EnumMediaTypes_Construct(BasePin *basePin, BasePin_GetMediaType e pEnumMediaTypes->basePin = basePin; i = 0; - while (enumFunc(basePin,i,&amt) == S_OK) i++; + while (enumFunc(basePin, i, &amt) == S_OK) i++; pEnumMediaTypes->enumMediaDetails.cMediaTypes = i; pEnumMediaTypes->enumMediaDetails.pMediaTypes = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE) * i); @@ -131,10 +131,10 @@ HRESULT WINAPI EnumMediaTypes_Construct(BasePin *basePin, BasePin_GetMediaType e enumFunc(basePin,i,&amt); if (FAILED(CopyMediaType(&pEnumMediaTypes->enumMediaDetails.pMediaTypes[i], &amt))) { - while (i--) - CoTaskMemFree(pEnumMediaTypes->enumMediaDetails.pMediaTypes[i].pbFormat); - CoTaskMemFree(pEnumMediaTypes->enumMediaDetails.pMediaTypes); - return E_OUTOFMEMORY; + while (i--) + FreeMediaType(&pEnumMediaTypes->enumMediaDetails.pMediaTypes[i]); + CoTaskMemFree(pEnumMediaTypes->enumMediaDetails.pMediaTypes); + return E_OUTOFMEMORY; } } *ppEnum = &pEnumMediaTypes->IEnumMediaTypes_iface; @@ -185,8 +185,7 @@ static ULONG WINAPI IEnumMediaTypesImpl_Release(IEnumMediaTypes * iface) { ULONG i; for (i = 0; i < This->enumMediaDetails.cMediaTypes; i++) - if (This->enumMediaDetails.pMediaTypes[i].pbFormat) - CoTaskMemFree(This->enumMediaDetails.pMediaTypes[i].pbFormat); + FreeMediaType(&This->enumMediaDetails.pMediaTypes[i]); CoTaskMemFree(This->enumMediaDetails.pMediaTypes); IPin_Release(&This->basePin->IPin_iface); CoTaskMemFree(This); @@ -255,12 +254,11 @@ static HRESULT WINAPI IEnumMediaTypesImpl_Reset(IEnumMediaTypes * iface) TRACE("()\n"); for (i = 0; i < This->enumMediaDetails.cMediaTypes; i++) - if (This->enumMediaDetails.pMediaTypes[i].pbFormat) - CoTaskMemFree(This->enumMediaDetails.pMediaTypes[i].pbFormat); + FreeMediaType(&This->enumMediaDetails.pMediaTypes[i]); CoTaskMemFree(This->enumMediaDetails.pMediaTypes); i = 0; - while (This->enumMediaFunction(This->basePin, i,&amt) == S_OK) i++; + while (This->enumMediaFunction(This->basePin, i, &amt) == S_OK) i++; This->enumMediaDetails.cMediaTypes = i; This->enumMediaDetails.pMediaTypes = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE) * i); @@ -269,10 +267,10 @@ static HRESULT WINAPI IEnumMediaTypesImpl_Reset(IEnumMediaTypes * iface) This->enumMediaFunction(This->basePin, i,&amt); if (FAILED(CopyMediaType(&This->enumMediaDetails.pMediaTypes[i], &amt))) { - while (i--) - CoTaskMemFree(This->enumMediaDetails.pMediaTypes[i].pbFormat); - CoTaskMemFree(This->enumMediaDetails.pMediaTypes); - return E_OUTOFMEMORY; + while (i--) + FreeMediaType(&This->enumMediaDetails.pMediaTypes[i]); + CoTaskMemFree(This->enumMediaDetails.pMediaTypes); + return E_OUTOFMEMORY; } }

1 0

Henri Verbeet : d3dx9: Avoid LPD3DXFILESAVEDATA.
by Alexandre Julliard Nov. 22, 2012

Nov. 22, 2012

Module: wine Branch: master Commit: b698e51c7a75367b7251476b76d20486092841d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b698e51c7a75367b7251476b7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 22 13:45:11 2012 +0100 d3dx9: Avoid LPD3DXFILESAVEDATA. --- include/d3dx9xof.h | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/include/d3dx9xof.h b/include/d3dx9xof.h index 9789ffd..8e08cca 100644 --- a/include/d3dx9xof.h +++ b/include/d3dx9xof.h @@ -93,7 +93,8 @@ DECLARE_INTERFACE_IID_(ID3DXFileSaveObject,IUnknown,"cef08cfa-7b4f-4429-9624-2a6 STDMETHOD_(ULONG,Release)(THIS) PURE; /*** ID3DXFileSaveObject methods ***/ STDMETHOD(GetFile)(THIS_ LPD3DXFILE*) PURE; - STDMETHOD(AddDataObject)(THIS_ REFGUID, LPCSTR, CONST GUID*, SIZE_T, LPCVOID, LPD3DXFILESAVEDATA*) PURE; + STDMETHOD(AddDataObject)(THIS_ REFGUID template_guid, const char *name, const GUID *guid, + SIZE_T data_size, const void *data, struct ID3DXFileSaveData **obj) PURE; STDMETHOD(Save)(THIS) PURE; }; #undef INTERFACE @@ -110,7 +111,8 @@ DECLARE_INTERFACE_IID_(ID3DXFileSaveData,IUnknown,"cef08cfb-7b4f-4429-9624-2a690 STDMETHOD(GetName)(THIS_ LPSTR, SIZE_T*) PURE; STDMETHOD(GetId)(THIS_ LPGUID) PURE; STDMETHOD(GetType)(THIS_ GUID*) PURE; - STDMETHOD(AddDataObject)(THIS_ REFGUID, LPCSTR, CONST GUID*, SIZE_T, LPCVOID, LPD3DXFILESAVEDATA*) PURE; + STDMETHOD(AddDataObject)(THIS_ REFGUID template_guid, const char *name, const GUID *guid, + SIZE_T data_size, const void *data, ID3DXFileSaveData **obj) PURE; STDMETHOD(AddDataReference)(THIS_ LPCSTR, CONST GUID*) PURE; }; #undef INTERFACE

1 0

Henri Verbeet : d3dx9: Avoid LPD3DXFILEDATA.
by Alexandre Julliard Nov. 22, 2012

Nov. 22, 2012

Module: wine Branch: master Commit: b868105e4b9c87dcc6fbaafb084a69e386c472b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b868105e4b9c87dcc6fbaafb0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 22 13:45:09 2012 +0100 d3dx9: Avoid LPD3DXFILEDATA. --- include/d3dx9anim.h | 6 +++--- include/d3dx9xof.h | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/d3dx9anim.h b/include/d3dx9anim.h index 0c9d7b9..9a25ec8 100644 --- a/include/d3dx9anim.h +++ b/include/d3dx9anim.h @@ -183,9 +183,9 @@ DECLARE_INTERFACE(ID3DXAllocateHierarchy) #define INTERFACE ID3DXLoadUserData DECLARE_INTERFACE(ID3DXLoadUserData) { - STDMETHOD(LoadTopLevelData)(LPD3DXFILEDATA child_data) PURE; - STDMETHOD(LoadFrameChildData)(LPD3DXFRAME frame, LPD3DXFILEDATA child_data) PURE; - STDMETHOD(LoadMeshChildData)(LPD3DXMESHCONTAINER mesh_container, LPD3DXFILEDATA child_data) PURE; + STDMETHOD(LoadTopLevelData)(ID3DXFileData *child_data) PURE; + STDMETHOD(LoadFrameChildData)(D3DXFRAME *frame, ID3DXFileData *child_data) PURE; + STDMETHOD(LoadMeshChildData)(D3DXMESHCONTAINER *mesh_container, ID3DXFileData *child_data) PURE; }; #undef INTERFACE diff --git a/include/d3dx9xof.h b/include/d3dx9xof.h index 123f0ac..f110a1f 100644 --- a/include/d3dx9xof.h +++ b/include/d3dx9xof.h @@ -125,9 +125,9 @@ DECLARE_INTERFACE_IID_(ID3DXFileEnumObject,IUnknown,"cef08cfc-7b4f-4429-9624-2a6 /*** ID3DXFileEnumObject methods ***/ STDMETHOD(GetFile)(THIS_ LPD3DXFILE*) PURE; STDMETHOD(GetChildren)(THIS_ SIZE_T*) PURE; - STDMETHOD(GetChild)(THIS_ SIZE_T, LPD3DXFILEDATA*) PURE; - STDMETHOD(GetDataObjectById)(THIS_ REFGUID, LPD3DXFILEDATA*) PURE; - STDMETHOD(GetDataObjectByName)(THIS_ LPCSTR, LPD3DXFILEDATA*) PURE; + STDMETHOD(GetChild)(THIS_ SIZE_T id, struct ID3DXFileData **child) PURE; + STDMETHOD(GetDataObjectById)(THIS_ REFGUID guid, struct ID3DXFileData **obj) PURE; + STDMETHOD(GetDataObjectByName)(THIS_ const char *name, struct ID3DXFileData **obj) PURE; }; #undef INTERFACE @@ -147,7 +147,7 @@ DECLARE_INTERFACE_IID_(ID3DXFileData,IUnknown,"cef08cfd-7b4f-4429-9624-2a690a933 STDMETHOD(GetType)(THIS_ GUID*) PURE; STDMETHOD_(BOOL,IsReference)(THIS) PURE; STDMETHOD(GetChildren)(THIS_ SIZE_T*) PURE; - STDMETHOD(GetChild)(THIS_ SIZE_T, LPD3DXFILEDATA*) PURE; + STDMETHOD(GetChild)(THIS_ SIZE_T id, ID3DXFileData **child) PURE; }; #undef INTERFACE

1 0

Dmitry Timoshkov : windowscodecs: Implement QueryCapability in the GIF decoder.
by Alexandre Julliard Nov. 22, 2012

Nov. 22, 2012

Module: wine Branch: master Commit: 7baf4ecd064a0c226ce3ceb2b83182a70328d65e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7baf4ecd064a0c226ce3ceb2b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Nov 22 18:27:22 2012 +0800 windowscodecs: Implement QueryCapability in the GIF decoder. --- dlls/windowscodecs/gifformat.c | 19 +++++++++++++++---- 1 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/gifformat.c b/dlls/windowscodecs/gifformat.c index eb8a37b..d87a6e7 100644 --- a/dlls/windowscodecs/gifformat.c +++ b/dlls/windowscodecs/gifformat.c @@ -1064,11 +1064,22 @@ static ULONG WINAPI GifDecoder_Release(IWICBitmapDecoder *iface) return ref; } -static HRESULT WINAPI GifDecoder_QueryCapability(IWICBitmapDecoder *iface, IStream *pIStream, - DWORD *pdwCapability) +static HRESULT WINAPI GifDecoder_QueryCapability(IWICBitmapDecoder *iface, IStream *stream, + DWORD *capability) { - FIXME("(%p,%p,%p): stub\n", iface, pIStream, pdwCapability); - return E_NOTIMPL; + HRESULT hr; + + TRACE("(%p,%p,%p)\n", iface, stream, capability); + + if (!stream || !capability) return E_INVALIDARG; + + hr = IWICBitmapDecoder_Initialize(iface, stream, WICDecodeMetadataCacheOnDemand); + if (hr != S_OK) return hr; + + *capability = WICBitmapDecoderCapabilityCanDecodeAllImages | + WICBitmapDecoderCapabilityCanDecodeSomeImages | + WICBitmapDecoderCapabilityCanEnumerateMetadata; + return S_OK; } static int _gif_inputfunc(GifFileType *gif, GifByteType *data, int len) {

1 0