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

Aric Stewart : quartz: Add VMRSurfaceAllocatorNotify9 to VMR9.
by Alexandre Julliard April 9, 2012

April 9, 2012

Module: wine Branch: master Commit: 69da44106e1d1c1ecfe03db197a22c344601c12d URL: http://source.winehq.org/git/wine.git/?a=commit;h=69da44106e1d1c1ecfe03db19… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Apr 3 14:38:13 2012 -0500 quartz: Add VMRSurfaceAllocatorNotify9 to VMR9. --- dlls/quartz/vmr9.c | 107 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 107 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index b92cc19..2f490e5 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -55,6 +55,7 @@ typedef struct IAMFilterMiscFlags IAMFilterMiscFlags_iface; IVMRFilterConfig9 IVMRFilterConfig9_iface; IVMRWindowlessControl9 IVMRWindowlessControl9_iface; + IVMRSurfaceAllocatorNotify9 IVMRSurfaceAllocatorNotify9_iface; IVMRSurfaceAllocatorEx9 *allocator; IVMRImagePresenter9 *presenter; @@ -117,6 +118,11 @@ static inline VMR9Impl *impl_from_IVMRWindowlessControl9( IVMRWindowlessControl9 return CONTAINING_RECORD(iface, VMR9Impl, IVMRWindowlessControl9_iface); } +static inline VMR9Impl *impl_from_IVMRSurfaceAllocatorNotify9( IVMRSurfaceAllocatorNotify9 *iface) +{ + return CONTAINING_RECORD(iface, VMR9Impl, IVMRSurfaceAllocatorNotify9_iface); +} + static HRESULT WINAPI VMR9_DoRenderSample(BaseRenderer *iface, IMediaSample * pSample) { VMR9Impl *This = (VMR9Impl *)iface; @@ -459,6 +465,8 @@ static HRESULT WINAPI VMR9Inner_QueryInterface(IUnknown * iface, REFIID riid, LP *ppv = &This->IVMRFilterConfig9_iface; else if (IsEqualIID(riid, &IID_IVMRWindowlessControl9) && This->mode == VMR9Mode_Windowless) *ppv = &This->IVMRWindowlessControl9_iface; + else if (IsEqualIID(riid, &IID_IVMRSurfaceAllocatorNotify9) && This->mode == VMR9Mode_Renderless) + *ppv = &This->IVMRSurfaceAllocatorNotify9_iface; else { HRESULT hr; @@ -1107,6 +1115,104 @@ static const IVMRWindowlessControl9Vtbl VMR9_WindowlessControl_Vtbl = VMR9WindowlessControl_GetBorderColor }; +static HRESULT WINAPI VMR9SurfaceAllocatorNotify_QueryInterface(IVMRSurfaceAllocatorNotify9 *iface, REFIID riid, LPVOID * ppv) +{ + VMR9Impl *This = impl_from_IVMRSurfaceAllocatorNotify9(iface); + return VMR9_QueryInterface(&This->renderer.filter.IBaseFilter_iface, riid, ppv); +} + +static ULONG WINAPI VMR9SurfaceAllocatorNotify_AddRef(IVMRSurfaceAllocatorNotify9 *iface) +{ + VMR9Impl *This = impl_from_IVMRSurfaceAllocatorNotify9(iface); + return VMR9_AddRef(&This->renderer.filter.IBaseFilter_iface); +} + +static ULONG WINAPI VMR9SurfaceAllocatorNotify_Release(IVMRSurfaceAllocatorNotify9 *iface) +{ + VMR9Impl *This = impl_from_IVMRSurfaceAllocatorNotify9(iface); + return VMR9_Release(&This->renderer.filter.IBaseFilter_iface); +} + +static HRESULT WINAPI VMR9SurfaceAllocatorNotify_AdviseSurfaceAllocator(IVMRSurfaceAllocatorNotify9 *iface, DWORD_PTR id, IVMRSurfaceAllocator9 *alloc) +{ + VMR9Impl *This = impl_from_IVMRSurfaceAllocatorNotify9(iface); + + /* FIXME: This code is not tested!!! */ + FIXME("(%p/%p)->(...) stub\n", iface, This); + This->cookie = id; + + if (This->presenter) + return VFW_E_WRONG_STATE; + + if (FAILED(IUnknown_QueryInterface(alloc, &IID_IVMRImagePresenter9, (void **)&This->presenter))) + return E_NOINTERFACE; + + if (SUCCEEDED(IUnknown_QueryInterface(alloc, &IID_IVMRSurfaceAllocatorEx9, (void **)&This->allocator))) + This->allocator_is_ex = 1; + else + { + This->allocator = (IVMRSurfaceAllocatorEx9 *)alloc; + IUnknown_AddRef(alloc); + This->allocator_is_ex = 0; + } + + return S_OK; +} + +static HRESULT WINAPI VMR9SurfaceAllocatorNotify_SetD3DDevice(IVMRSurfaceAllocatorNotify9 *iface, IDirect3DDevice9 *device, HMONITOR monitor) +{ + VMR9Impl *This = impl_from_IVMRSurfaceAllocatorNotify9(iface); + + FIXME("(%p/%p)->(...) stub\n", iface, This); + return E_NOTIMPL; +} + +static HRESULT WINAPI VMR9SurfaceAllocatorNotify_ChangeD3DDevice(IVMRSurfaceAllocatorNotify9 *iface, IDirect3DDevice9 *device, HMONITOR monitor) +{ + VMR9Impl *This = impl_from_IVMRSurfaceAllocatorNotify9(iface); + + FIXME("(%p/%p)->(...) stub\n", iface, This); + return E_NOTIMPL; +} + +static HRESULT WINAPI VMR9SurfaceAllocatorNotify_AllocateSurfaceHelper(IVMRSurfaceAllocatorNotify9 *iface, VMR9AllocationInfo *allocinfo, DWORD *numbuffers, IDirect3DSurface9 **surface) +{ + VMR9Impl *This = impl_from_IVMRSurfaceAllocatorNotify9(iface); + + FIXME("(%p/%p)->(%p, %p => %u, %p) semi-stub\n", iface, This, allocinfo, numbuffers, (numbuffers ? *numbuffers : 0), surface); + + if (!allocinfo || !numbuffers || !surface) + return E_POINTER; + + if (!*numbuffers || *numbuffers < allocinfo->MinBuffers) + { + ERR("Invalid number of buffers?\n"); + return E_INVALIDARG; + } + + return E_NOTIMPL; +} + +static HRESULT WINAPI VMR9SurfaceAllocatorNotify_NotifyEvent(IVMRSurfaceAllocatorNotify9 *iface, LONG code, LONG_PTR param1, LONG_PTR param2) +{ + VMR9Impl *This = impl_from_IVMRSurfaceAllocatorNotify9(iface); + + FIXME("(%p/%p)->(...) stub\n", iface, This); + return E_NOTIMPL; +} + +static const IVMRSurfaceAllocatorNotify9Vtbl IVMRSurfaceAllocatorNotify9_Vtbl = +{ + VMR9SurfaceAllocatorNotify_QueryInterface, + VMR9SurfaceAllocatorNotify_AddRef, + VMR9SurfaceAllocatorNotify_Release, + VMR9SurfaceAllocatorNotify_AdviseSurfaceAllocator, + VMR9SurfaceAllocatorNotify_SetD3DDevice, + VMR9SurfaceAllocatorNotify_ChangeD3DDevice, + VMR9SurfaceAllocatorNotify_AllocateSurfaceHelper, + VMR9SurfaceAllocatorNotify_NotifyEvent +}; + HRESULT VMR9Impl_create(IUnknown * outer_unk, LPVOID * ppv) { HRESULT hr; @@ -1130,6 +1236,7 @@ HRESULT VMR9Impl_create(IUnknown * outer_unk, LPVOID * ppv) pVMR9->hWndClippingWindow = NULL; pVMR9->IVMRFilterConfig9_iface.lpVtbl = &VMR9_FilterConfig_Vtbl; pVMR9->IVMRWindowlessControl9_iface.lpVtbl = &VMR9_WindowlessControl_Vtbl; + pVMR9->IVMRSurfaceAllocatorNotify9_iface.lpVtbl = &IVMRSurfaceAllocatorNotify9_Vtbl; hr = BaseRenderer_Init(&pVMR9->renderer, &VMR9_Vtbl, outer_unk, &CLSID_VideoMixingRenderer9, (DWORD_PTR)(__FILE__ ": VMR9Impl.csFilter"), &BaseFuncTable); if (FAILED(hr))

1 0

Aric Stewart : quartz: Add control.idl as a typelib resource.
by Alexandre Julliard April 9, 2012

April 9, 2012

Module: wine Branch: master Commit: f6ea0b6cdd5e8243978056eb69d47127a65c6f2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6ea0b6cdd5e8243978056eb6… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Apr 5 08:26:45 2012 -0500 quartz: Add control.idl as a typelib resource. --- dlls/quartz/Makefile.in | 1 + dlls/quartz/control_tlb.idl | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/Makefile.in b/dlls/quartz/Makefile.in index 1ec502a..24be02e 100644 --- a/dlls/quartz/Makefile.in +++ b/dlls/quartz/Makefile.in @@ -32,6 +32,7 @@ RC_SRCS = version.rc IDL_H_SRCS = fil_data.idl IDL_P_SRCS = quartz_strmif.idl IDL_R_SRCS = quartz_strmif.idl +IDL_TLB_SRCS = control_tlb.idl EXTRA_OBJS = dlldata.o diff --git a/dlls/quartz/control_tlb.idl b/dlls/quartz/control_tlb.idl new file mode 100644 index 0000000..6d18552 --- /dev/null +++ b/dlls/quartz/control_tlb.idl @@ -0,0 +1,17 @@ +/* + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "control.idl"

1 0

Dmitry Timoshkov : gdi32: Add more verbose messages to indicate when a font is being added/replaced/ refused to load.
by Alexandre Julliard April 9, 2012

April 9, 2012

Module: wine Branch: master Commit: 1f00c01ea5a04a23671bf8e78dde0e8e2cf38ae4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f00c01ea5a04a23671bf8e78… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 9 18:25:11 2012 +0900 gdi32: Add more verbose messages to indicate when a font is being added/replaced/refused to load. --- dlls/gdi32/freetype.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 40f82c2..58a081a 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1255,12 +1255,14 @@ static BOOL insert_face_in_family_list( Face *face, Family *family ) if (face->font_version <= cursor->font_version) { - TRACE("Original font is newer so skipping this one\n"); + TRACE("Original font %s is newer so skipping %s\n", + debugstr_a(cursor->file), debugstr_a(face->file)); return FALSE; } else { - TRACE("Replacing original with this one\n"); + TRACE("Replacing original %s with %s\n", + debugstr_a(cursor->file), debugstr_a(face->file)); list_add_before( &cursor->entry, &face->entry ); face->family = family; list_remove( &cursor->entry); @@ -1268,6 +1270,8 @@ static BOOL insert_face_in_family_list( Face *face, Family *family ) return TRUE; } } + else + TRACE("Adding new %s\n", debugstr_a(face->file)); if (style_order( face ) < style_order( cursor )) break; }

1 0

André Hentschel : libwine: Add thumb support.
by Alexandre Julliard April 9, 2012

April 9, 2012

Module: wine Branch: master Commit: db09c6c393ff7bdef842f67e62eec275eac7ab89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db09c6c393ff7bdef842f67e6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Apr 7 22:02:28 2012 +0200 libwine: Add thumb support. --- libs/wine/port.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/libs/wine/port.c b/libs/wine/port.c index c9d38dc..da74e85 100644 --- a/libs/wine/port.c +++ b/libs/wine/port.c @@ -153,8 +153,12 @@ __ASM_GLOBAL_FUNC( wine_call_on_stack, "mov sp, r2\n\t" /* stack */ "mov r2, r0\n\t" /* func -> scratch register */ "mov r0, r1\n\t" /* arg */ +#if defined(__thumb__) + "blx r2\n\t" /* call func */ +#else "mov LR, PC\n\t" /* return after branch */ "mov PC, r2\n\t" /* call func */ +#endif "mov sp, r4\n\t" /* restore old sp from local var */ "pop {r4,PC}") /* fetch return address into pc */ #elif defined(__sparc__) && defined(__GNUC__)

1 0

Aric Stewart : wineqtdecoder: Register the QT Splitter to be a default potential handler for all unhandled streams .
by Alexandre Julliard April 9, 2012

April 9, 2012

Module: wine Branch: master Commit: 9fba260ae46918e5f88294143515a087ce2a8314 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fba260ae46918e5f88294143… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Apr 4 12:31:42 2012 -0500 wineqtdecoder: Register the QT Splitter to be a default potential handler for all unhandled streams. --- dlls/wineqtdecoder/Makefile.in | 3 +++ dlls/wineqtdecoder/main.c | 21 +++++++++++++++++---- dlls/wineqtdecoder/rsrc.rc | 28 ++++++++++++++++++++++++++++ dlls/wineqtdecoder/wineqtdecoder.rgs | 14 ++++++++++++++ 4 files changed, 62 insertions(+), 4 deletions(-) diff --git a/dlls/wineqtdecoder/Makefile.in b/dlls/wineqtdecoder/Makefile.in index 45cbfa1..52ee03b 100644 --- a/dlls/wineqtdecoder/Makefile.in +++ b/dlls/wineqtdecoder/Makefile.in @@ -9,4 +9,7 @@ C_SRCS = \ qtutils.c \ qtvdecoder.c +RC_SRCS = \ + rsrc.rc + @MAKE_DLL_RULES@ diff --git a/dlls/wineqtdecoder/main.c b/dlls/wineqtdecoder/main.c index e6e7e60..c7dd76c 100644 --- a/dlls/wineqtdecoder/main.c +++ b/dlls/wineqtdecoder/main.c @@ -34,6 +34,7 @@ #include "objbase.h" #include "uuids.h" #include "strmif.h" +#include "rpcproxy.h" #include "wine/unicode.h" #include "wine/debug.h" @@ -42,6 +43,7 @@ #include "initguid.h" DEFINE_GUID(CLSID_QTVDecoder, 0x683DDACB, 0x4354, 0x490C, 0xA0,0x58, 0xE0,0x5A,0xD0,0xF2,0x05,0x37); DEFINE_GUID(CLSID_QTSplitter, 0xD0E70E49, 0x5927, 0x4894, 0xA3,0x86, 0x35,0x94,0x60,0xEE,0x87,0xC9); +DEFINE_GUID(WINESUBTYPE_QTSplitter, 0xFFFFFFFF, 0x5927, 0x4894, 0xA3,0x86, 0x35,0x94,0x60,0xEE,0x87,0xC9); WINE_DEFAULT_DEBUG_CHANNEL(qtdecoder); @@ -59,7 +61,8 @@ static const AMOVIESETUP_MEDIATYPE amfMTvideo[] = static const AMOVIESETUP_MEDIATYPE amfMTaudio[] = { { &MEDIATYPE_Audio, &MEDIASUBTYPE_NULL } }; static const AMOVIESETUP_MEDIATYPE amfMTstream[] = -{ { &MEDIATYPE_Stream, &MEDIASUBTYPE_NULL } }; +{ { &MEDIATYPE_Stream, &WINESUBTYPE_QTSplitter}, + { &MEDIATYPE_Stream, &MEDIASUBTYPE_NULL } }; static const AMOVIESETUP_PIN amfQTVPin[] = { { wNull, @@ -84,7 +87,7 @@ static const AMOVIESETUP_PIN amfQTDPin[] = FALSE, FALSE, FALSE, FALSE, &GUID_NULL, NULL, - 1, + 2, amfMTstream }, { @@ -139,12 +142,14 @@ FactoryTemplate const g_Templates[] = { }; int g_cTemplates = sizeof(g_Templates) / sizeof(g_Templates[0]); +static HINSTANCE hInst = NULL; /*********************************************************************** * Dll EntryPoint (wineqtdecoder.@) */ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) { + hInst = hInstDLL; return STRMBASE_DllMain(hInstDLL,fdwReason,lpv); } @@ -161,8 +166,12 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) */ HRESULT WINAPI DllRegisterServer(void) { + HRESULT hr; TRACE("()\n"); - return AMovieDllRegisterServer2(TRUE); + hr = AMovieDllRegisterServer2(TRUE); + if (SUCCEEDED(hr)) + hr = __wine_register_resources(hInst); + return hr; } /*********************************************************************** @@ -170,8 +179,12 @@ HRESULT WINAPI DllRegisterServer(void) */ HRESULT WINAPI DllUnregisterServer(void) { + HRESULT hr; TRACE("\n"); - return AMovieDllRegisterServer2(FALSE); + hr = AMovieDllRegisterServer2(FALSE); + if (SUCCEEDED(hr)) + hr = __wine_unregister_resources(hInst); + return hr; } /*********************************************************************** diff --git a/dlls/wineqtdecoder/rsrc.rc b/dlls/wineqtdecoder/rsrc.rc new file mode 100644 index 0000000..8615033 --- /dev/null +++ b/dlls/wineqtdecoder/rsrc.rc @@ -0,0 +1,28 @@ +/* + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Wine QT Decoder" +#define WINE_FILENAME_STR "wineqtdecoder.dll" +#define WINE_FILEVERSION 0,0,1,0 +#define WINE_FILEVERSION_STR "0.0.1.0" +#define WINE_PRODUCTVERSION 0,0,1,0 +#define WINE_PRODUCTVERSION_STR "1.0.1.0" +#define WINE_EXTRAVALUES VALUE "OLESelfRegister","" + +#include "wine/wine_common_ver.rc" + +/* @makedep: wineqtdecoder.rgs */ +2 WINE_REGISTRY wineqtdecoder.rgs diff --git a/dlls/wineqtdecoder/wineqtdecoder.rgs b/dlls/wineqtdecoder/wineqtdecoder.rgs new file mode 100644 index 0000000..1c495b3 --- /dev/null +++ b/dlls/wineqtdecoder/wineqtdecoder.rgs @@ -0,0 +1,14 @@ +HKCR +{ + NoRemove 'Media Type' + { + NoRemove '{E436EB83-524F-11CE-9F53-0020AF0BA770}' + { + ForceRemove '{FFFFFFFF-5927-4894-A386-359460EE87C9}' + { + val '0' = s '0,1,00,0' + val 'Source Filter' = s '{E436EBB5-524F-11CE-9F53-0020AF0BA770}' + } + } + } +}

1 0

Morten Rønne : wininet/tests: Moved a test outside a loop to make numbers of tests run independent on the numbers of entries in the cache .
by Alexandre Julliard April 9, 2012

April 9, 2012

Module: wine Branch: master Commit: 4b3e4fa87b4ea8d3c59477068b6072763b0a180a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b3e4fa87b4ea8d3c59477068… Author: Morten Rønne <morten.roenne(a)tdcadsl.dk> Date: Mon Apr 9 10:44:58 2012 +0200 wininet/tests: Moved a test outside a loop to make numbers of tests run independent on the numbers of entries in the cache. --- dlls/wininet/tests/urlcache.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/tests/urlcache.c b/dlls/wininet/tests/urlcache.c index 93ad333..02d8d28 100644 --- a/dlls/wininet/tests/urlcache.c +++ b/dlls/wininet/tests/urlcache.c @@ -69,6 +69,7 @@ static void test_find_url_cache_entriesA(void) if (!strcmp(lpCacheEntryInfo->lpszSourceUrlName, TEST_URL)) { found = TRUE; + ret = TRUE; break; } SetLastError(0xdeadbeef); @@ -83,10 +84,10 @@ static void test_find_url_cache_entriesA(void) ret = FindNextUrlCacheEntry(hEnumHandle, lpCacheEntryInfo, &cbCacheEntryInfo); } } - ok(ret, "FindNextUrlCacheEntry failed with error %d\n", GetLastError()); if (!ret) break; } + ok(ret, "FindNextUrlCacheEntry failed with error %d\n", GetLastError()); ok(found, "Committed url cache entry not found during enumeration\n"); ret = FindCloseUrlCache(hEnumHandle);

1 0

Carlo Bramini : shlwapi: Add stub for AssocGetPerceivedType.
by Alexandre Julliard April 9, 2012

April 9, 2012

Module: wine Branch: master Commit: f2d40ca87d5ef9cfc7ef19c2146062f8461ff905 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2d40ca87d5ef9cfc7ef19c21… Author: Carlo Bramini <carlo.bramix(a)libero.it> Date: Sun Apr 8 15:22:25 2012 +0200 shlwapi: Add stub for AssocGetPerceivedType. --- dlls/shlwapi/assoc.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/shlwapi/shlwapi.spec | 1 + 2 files changed, 37 insertions(+), 0 deletions(-) diff --git a/dlls/shlwapi/assoc.c b/dlls/shlwapi/assoc.c index 877f514..4ecc922 100644 --- a/dlls/shlwapi/assoc.c +++ b/dlls/shlwapi/assoc.c @@ -103,6 +103,42 @@ HRESULT WINAPI AssocCreate(CLSID clsid, REFIID refiid, void **lpInterface) } /************************************************************************* + * AssocGetPerceivedType [SHLWAPI.@] + * + * Detect the type of a file by inspecting its extension + * + * PARAMS + * lpszExt [I] File extension to evaluate. + * lpType [O] Pointer to perceived type + * lpFlag [O] Pointer to perceived type flag + * lppszType [O] Address to pointer for perceived type text + * + * RETURNS + * Success: S_OK. lpType and lpFlag contain the perceived type and + * its informations. If lppszType is not NULL, it will point + * to a string with perceived type text. + * Failure: An HRESULT error code indicating the error. + * + * NOTES + * lppszType is optional and it can be NULL. + * if lpType or lpFlag are NULL, the function will crash. + * if lpszExt is NULL, an error is returned. + * + * BUGS + * Unimplemented. + */ +HRESULT WINAPI AssocGetPerceivedType(LPCWSTR lpszExt, PERCEIVED *lpType, + INT *lpFlag, LPWSTR *lppszType) +{ + FIXME("(%s, %p, %p, %p) not supported\n", debugstr_w(lpszExt), lpType, lpFlag, lppszType); + + if (lpszExt == NULL) + return HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); + + return E_NOTIMPL; +} + +/************************************************************************* * AssocQueryKeyW [SHLWAPI.@] * * See AssocQueryKeyA. diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index 40e2ee9..e0bdcf1 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -547,6 +547,7 @@ 551 stub -noname IShellFolder_CompareIDs @ 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)

1 0

Dmitry Timoshkov : gdi32: Fix a typo in faces_equal() preventing loading all sizes of a bitmap font.
by Alexandre Julliard April 9, 2012

April 9, 2012

Module: wine Branch: master Commit: e7a1362880ab58dcdad72176065a21688c3e69ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7a1362880ab58dcdad721760… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 9 18:24:53 2012 +0900 gdi32: Fix a typo in faces_equal() preventing loading all sizes of a bitmap font. --- dlls/gdi32/freetype.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index cf9f0d6..40f82c2 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1193,7 +1193,7 @@ static inline BOOL faces_equal( const Face *f1, const Face *f2 ) { if (strcmpiW( f1->StyleName, f2->StyleName )) return FALSE; if (f1->scalable) return TRUE; - if (f2->size.y_ppem != f2->size.y_ppem) return FALSE; + if (f1->size.y_ppem != f2->size.y_ppem) return FALSE; return !memcmp( &f1->fs, &f2->fs, sizeof(f1->fs) ); }

1 0

Alexandre Julliard : gdi32: Fix GetClipBox return value for non-memory DCs.
by Alexandre Julliard April 9, 2012

April 9, 2012

Module: wine Branch: master Commit: 1ca6ed774835187d14a4b536812bb9fb38e57ac0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ca6ed774835187d14a4b5368… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 9 15:13:31 2012 +0200 gdi32: Fix GetClipBox return value for non-memory DCs. --- dlls/gdi32/clipping.c | 6 +++++- dlls/gdi32/tests/dc.c | 23 +++++++++++++++++++++-- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/clipping.c b/dlls/gdi32/clipping.c index ef2dc12..c413e1a 100644 --- a/dlls/gdi32/clipping.c +++ b/dlls/gdi32/clipping.c @@ -409,7 +409,11 @@ INT WINAPI GetClipBox( HDC hdc, LPRECT rect ) if (get_dc_visrect( dc, &visrect ) && !intersect_rect( rect, rect, &visrect )) ret = NULLREGION; } - else ret = get_dc_visrect( dc, rect ) ? SIMPLEREGION : NULLREGION; + else + { + ret = is_rect_empty( &dc->vis_rect ) ? ERROR : SIMPLEREGION; + *rect = dc->vis_rect; + } if (dc->layout & LAYOUT_RTL) { diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index d8276f4..da2c31b 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -345,6 +345,8 @@ static void test_device_caps( HDC hdc, HDC ref_dc, const char *descr ) unsigned int i; WORD ramp[3][256]; BOOL ret; + RECT clip; + UINT type; if (GetObjectType( hdc ) == OBJ_METADC) { @@ -358,6 +360,8 @@ static void test_device_caps( HDC hdc, HDC ref_dc, const char *descr ) ok( !ret, "GetDeviceGammaRamp succeeded on %s\n", descr ); ok( GetLastError() == ERROR_INVALID_PARAMETER || broken(GetLastError() == 0xdeadbeef), /* nt4 */ "wrong error %u on %s\n", GetLastError(), descr ); + type = GetClipBox( hdc, &clip ); + ok( type == ERROR, "GetClipBox returned %d on %s\n", type, descr ); } else { @@ -371,8 +375,17 @@ static void test_device_caps( HDC hdc, HDC ref_dc, const char *descr ) ok( !ret, "GetDeviceGammaRamp succeeded on %s\n", descr ); ok( GetLastError() == ERROR_INVALID_PARAMETER || broken(GetLastError() == 0xdeadbeef), /* nt4 */ "wrong error %u on %s\n", GetLastError(), descr ); + type = GetClipBox( hdc, &clip ); + ok( type == SIMPLEREGION, "GetClipBox returned %d on memdc for %s\n", type, descr ); } + type = GetClipBox( ref_dc, &clip ); + ok( type == SIMPLEREGION, "GetClipBox returned %d on %s\n", type, descr ); + ok( clip.left == 0 && clip.top == 0 && + clip.right == GetDeviceCaps( ref_dc, DESKTOPHORZRES ) && + clip.bottom == GetDeviceCaps( ref_dc, DESKTOPVERTRES ), + "GetClipBox returned %d,%d,%d,%d on %s\n", clip.left, clip.top, clip.right, clip.bottom, descr ); + if (GetObjectType( hdc ) == OBJ_MEMDC) { char buffer[sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)]; @@ -400,6 +413,12 @@ static void test_device_caps( HDC hdc, HDC ref_dc, const char *descr ) ok( GetLastError() == ERROR_INVALID_PARAMETER || broken(GetLastError() == 0xdeadbeef), /* nt4 */ "wrong error %u on %s\n", GetLastError(), descr ); + type = GetClipBox( hdc, &clip ); + ok( type == SIMPLEREGION, "GetClipBox returned %d on memdc for %s\n", type, descr ); + ok( clip.left == 0 && clip.top == 0 && clip.right == 16 && clip.bottom == 16, + "GetClipBox returned %d,%d,%d,%d on memdc for %s\n", + clip.left, clip.top, clip.right, clip.bottom, descr ); + SelectObject( hdc, old ); DeleteObject( dib ); } @@ -412,7 +431,7 @@ static void test_CreateCompatibleDC(void) HBITMAP bitmap; INT caps; - screen_dc = GetDC( 0 ); + screen_dc = CreateDC( "DISPLAY", NULL, NULL, NULL ); bitmap = CreateBitmap( 10, 10, 1, 1, NULL ); /* Create a DC compatible with the screen */ @@ -456,7 +475,7 @@ static void test_CreateCompatibleDC(void) DeleteMetaFile( CloseMetaFile( hdcMetafile )); DeleteObject( bitmap ); - ReleaseDC( 0, screen_dc ); + DeleteDC( screen_dc ); } static void test_DC_bitmap(void)

1 0

Henri Verbeet : d3dx9: Don' t return a pointer to the implementation in ID3DXMeshImpl_QueryInterface().
by Alexandre Julliard April 9, 2012

April 9, 2012

Module: wine Branch: master Commit: 531818846ad6a5edc8700197970ed4e8be7bf705 URL: http://source.winehq.org/git/wine.git/?a=commit;h=531818846ad6a5edc87001979… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 8 19:13:26 2012 +0200 d3dx9: Don't return a pointer to the implementation in ID3DXMeshImpl_QueryInterface(). --- dlls/d3dx9_36/mesh.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 84856b3..be8ca60 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -96,16 +96,14 @@ static inline ID3DXMeshImpl *impl_from_ID3DXMesh(ID3DXMesh *iface) static HRESULT WINAPI ID3DXMeshImpl_QueryInterface(ID3DXMesh *iface, REFIID riid, LPVOID *object) { - ID3DXMeshImpl *This = impl_from_ID3DXMesh(iface); - - TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), object); + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), object); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_ID3DXBaseMesh) || IsEqualGUID(riid, &IID_ID3DXMesh)) { iface->lpVtbl->AddRef(iface); - *object = This; + *object = iface; return S_OK; }

1 0