wine-commits April 2012

wine-commits@winehq.org

2 participants
718 discussions

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 09 Apr '12

09 Apr '12

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

Aric Stewart : quartz: Add control.idl as a typelib resource.
by Alexandre Julliard 09 Apr '12

09 Apr '12

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

Aric Stewart : wineqtdecoder: Register the QT Splitter to be a default potential handler for all unhandled streams .
by Alexandre Julliard 09 Apr '12

09 Apr '12

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

Aric Stewart : quartz: Add VMRSurfaceAllocatorNotify9 to VMR9.
by Alexandre Julliard 09 Apr '12

09 Apr '12

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

Dmitry Timoshkov : gdi32: Add more verbose messages to indicate when a font is being added/replaced/ refused to load.
by Alexandre Julliard 09 Apr '12

09 Apr '12

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

Dmitry Timoshkov : gdi32: Fix a typo in faces_equal() preventing loading all sizes of a bitmap font.
by Alexandre Julliard 09 Apr '12

09 Apr '12

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

Carlo Bramini : shlwapi: Add stub for AssocGetPerceivedType.
by Alexandre Julliard 09 Apr '12

09 Apr '12

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

André Hentschel : libwine: Add thumb support.
by Alexandre Julliard 09 Apr '12

09 Apr '12

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

Andrew Eikum : winealsa.drv: Enumerate ALSA devices in a single pass.
by Alexandre Julliard 09 Apr '12

09 Apr '12

Module: wine Branch: master Commit: f461e8496d4e2861dab6183465a89e2d286a73eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=f461e8496d4e2861dab618346… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Apr 9 09:20:31 2012 -0500 winealsa.drv: Enumerate ALSA devices in a single pass. --- dlls/winealsa.drv/mmdevdrv.c | 88 +++++++++++++++++++++++------------------- 1 files changed, 48 insertions(+), 40 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index c99186b..66e8baf 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -329,6 +329,8 @@ static BOOL alsa_try_open(const char *devnode, snd_pcm_stream_t stream) snd_pcm_t *handle; int err; + TRACE("devnode: %s, stream: %d\n", devnode, stream); + if((err = snd_pcm_open(&handle, devnode, stream, SND_PCM_NONBLOCK)) < 0){ WARN("The device \"%s\" failed to open: %d (%s).\n", devnode, err, snd_strerror(err)); @@ -386,11 +388,13 @@ static WCHAR *construct_device_id(EDataFlow flow, const WCHAR *chunk1, const cha }else ret[copied] = 0; + TRACE("Enumerated device: %s\n", wine_dbgstr_w(ret)); + return ret; } static HRESULT alsa_get_card_devices(EDataFlow flow, snd_pcm_stream_t stream, - WCHAR **ids, GUID *guids, UINT *num, snd_ctl_t *ctl, int card, + WCHAR ***ids, GUID **guids, UINT *num, snd_ctl_t *ctl, int card, const WCHAR *cardnameW) { int err, device; @@ -425,18 +429,24 @@ static HRESULT alsa_get_card_devices(EDataFlow flow, snd_pcm_stream_t stream, if(!alsa_try_open(devnode, stream)) continue; - if(ids && guids){ - devname = snd_pcm_info_get_name(info); - if(!devname){ - WARN("Unable to get device name for card %d, device %d\n", card, - device); - continue; - } + if(*num){ + *ids = HeapReAlloc(GetProcessHeap(), 0, *ids, sizeof(WCHAR *) * (*num + 1)); + *guids = HeapReAlloc(GetProcessHeap(), 0, *guids, sizeof(GUID) * (*num + 1)); + }else{ + *ids = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR *)); + *guids = HeapAlloc(GetProcessHeap(), 0, sizeof(GUID)); + } - ids[*num] = construct_device_id(flow, cardnameW, devname); - get_device_guid(flow, devnode, &guids[*num]); + devname = snd_pcm_info_get_name(info); + if(!devname){ + WARN("Unable to get device name for card %d, device %d\n", card, + device); + continue; } + (*ids)[*num] = construct_device_id(flow, cardnameW, devname); + get_device_guid(flow, devnode, &(*guids)[*num]); + ++(*num); } @@ -449,8 +459,8 @@ static HRESULT alsa_get_card_devices(EDataFlow flow, snd_pcm_stream_t stream, return S_OK; } -static void get_reg_devices(EDataFlow flow, snd_pcm_stream_t stream, WCHAR **ids, - GUID *guids, UINT *num) +static void get_reg_devices(EDataFlow flow, snd_pcm_stream_t stream, WCHAR ***ids, + GUID **guids, UINT *num) { static const WCHAR ALSAOutputDevices[] = {'A','L','S','A','O','u','t','p','u','t','D','e','v','i','c','e','s',0}; static const WCHAR ALSAInputDevices[] = {'A','L','S','A','I','n','p','u','t','D','e','v','i','c','e','s',0}; @@ -477,10 +487,15 @@ static void get_reg_devices(EDataFlow flow, snd_pcm_stream_t stream, WCHAR **ids WideCharToMultiByte(CP_UNIXCP, 0, p, -1, devname, sizeof(devname), NULL, NULL); if(alsa_try_open(devname, stream)){ - if(ids && guids){ - ids[*num] = construct_device_id(flow, p, NULL); - get_device_guid(flow, devname, &guids[*num]); + if(*num){ + *ids = HeapReAlloc(GetProcessHeap(), 0, *ids, sizeof(WCHAR *) * (*num + 1)); + *guids = HeapReAlloc(GetProcessHeap(), 0, *guids, sizeof(GUID) * (*num + 1)); + }else{ + *ids = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR *)); + *guids = HeapAlloc(GetProcessHeap(), 0, sizeof(GUID)); } + (*ids)[*num] = construct_device_id(flow, p, NULL); + get_device_guid(flow, devname, &(*guids)[*num]); ++*num; } @@ -492,7 +507,7 @@ static void get_reg_devices(EDataFlow flow, snd_pcm_stream_t stream, WCHAR **ids } } -static HRESULT alsa_enum_devices(EDataFlow flow, WCHAR **ids, GUID *guids, +static HRESULT alsa_enum_devices(EDataFlow flow, WCHAR ***ids, GUID **guids, UINT *num) { snd_pcm_stream_t stream = (flow == eRender ? SND_PCM_STREAM_PLAYBACK : @@ -503,10 +518,10 @@ static HRESULT alsa_enum_devices(EDataFlow flow, WCHAR **ids, GUID *guids, *num = 0; if(alsa_try_open(defname, stream)){ - if(ids && guids){ - *ids = construct_device_id(flow, defaultW, NULL); - get_device_guid(flow, defname, guids); - } + *ids = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR *)); + (*ids)[0] = construct_device_id(flow, defaultW, NULL); + *guids = HeapAlloc(GetProcessHeap(), 0, sizeof(GUID)); + get_device_guid(flow, defname, &(*guids)[0]); ++*num; } @@ -568,37 +583,30 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, GUID **guids, TRACE("%d %p %p %p %p\n", flow, ids, guids, num, def_index); - hr = alsa_enum_devices(flow, NULL, NULL, num); - if(FAILED(hr)) - return hr; - - if(*num == 0) - { - *ids = NULL; - *guids = NULL; - return S_OK; - } + *ids = NULL; + *guids = NULL; - *ids = HeapAlloc(GetProcessHeap(), 0, *num * sizeof(WCHAR *)); - *guids = HeapAlloc(GetProcessHeap(), 0, *num * sizeof(GUID)); - if(!*ids || !*guids){ + hr = alsa_enum_devices(flow, ids, guids, num); + if(FAILED(hr)){ + UINT i; + for(i = 0; i < *num; ++i) + HeapFree(GetProcessHeap(), 0, (*ids)[i]); HeapFree(GetProcessHeap(), 0, *ids); HeapFree(GetProcessHeap(), 0, *guids); return E_OUTOFMEMORY; } - *def_index = 0; + TRACE("Enumerated %u devices\n", *num); - hr = alsa_enum_devices(flow, *ids, *guids, num); - if(FAILED(hr)){ - int i; - for(i = 0; i < *num; ++i) - HeapFree(GetProcessHeap(), 0, (*ids)[i]); + if(*num == 0){ HeapFree(GetProcessHeap(), 0, *ids); + *ids = NULL; HeapFree(GetProcessHeap(), 0, *guids); - return E_OUTOFMEMORY; + *guids = NULL; } + *def_index = 0; + return S_OK; }

1 0

Jacek Caban : jscript: Replace only the first match for non-regexp pattern in String.replace.
by Alexandre Julliard 09 Apr '12

09 Apr '12

Module: wine Branch: master Commit: 78fc648dec5218dbb1290ee99907e78a08af7cc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78fc648dec5218dbb1290ee99… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 9 14:02:35 2012 +0200 jscript: Replace only the first match for non-regexp pattern in String.replace. --- dlls/jscript/string.c | 3 +++ dlls/jscript/tests/api.js | 9 +++++++++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index df44db9..17f6c2f 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -961,6 +961,9 @@ static HRESULT String_replace(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DI if(FAILED(hres)) break; } + + if(!regexp) + break; } if(SUCCEEDED(hres)) diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index be49179..ffc1c48 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -414,6 +414,15 @@ ok(r === "-ret-", "r = " + r + " expected '-ret-'"); r = "-[test]-".replace("[test]", replaceFunc3, "test"); ok(r === "-ret-", "r = " + r + " expected '-ret-'"); +r = "x,x,x".replace("x", "y"); +ok(r === "y,x,x", "r = " + r + " expected 'y,x,x'"); + +r = "x,x,x".replace("", "y"); +ok(r === "yx,x,x", "r = " + r + " expected 'yx,x,x'"); + +r = "x,x,x".replace("", ""); +ok(r === "x,x,x", "r = " + r + " expected 'x,x,x'"); + r = "1,2,3".split(","); ok(typeof(r) === "object", "typeof(r) = " + typeof(r)); ok(r.length === 3, "r.length = " + r.length);

1 0

← Newer
1
...
47
48
49
50
51
52
53
...
72
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 April 2012