wine-commits April 2012

wine-commits@winehq.org

2 participants
718 discussions

Aric Stewart : quartz: Add IAMFilterMiscFlags to VMR9 implementation.
by Alexandre Julliard 05 Apr '12

05 Apr '12

Module: wine Branch: master Commit: 8e79273b0efd80e186a84ca2ce8f9e34317ab628 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e79273b0efd80e186a84ca2c… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Apr 3 14:38:04 2012 -0500 quartz: Add IAMFilterMiscFlags to VMR9 implementation. --- dlls/quartz/vmr9.c | 37 +++++++++++++++++++++++++++++++++++-- 1 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index d9f9035..07e3428 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -52,6 +52,7 @@ typedef struct BaseControlVideo baseControlVideo; IUnknown IUnknown_inner; + IAMFilterMiscFlags IAMFilterMiscFlags_iface; BITMAPINFOHEADER bmiheader; IUnknown * outer_unk; @@ -89,6 +90,11 @@ static inline VMR9Impl *impl_from_IBasicVideo( IBasicVideo *iface) return CONTAINING_RECORD(iface, VMR9Impl, baseControlVideo.IBasicVideo_iface); } +static inline VMR9Impl *impl_from_IAMFilterMiscFlags( IAMFilterMiscFlags *iface) +{ + return CONTAINING_RECORD(iface, VMR9Impl, IAMFilterMiscFlags_iface); +} + static HRESULT WINAPI VMR9_DoRenderSample(BaseRenderer *iface, IMediaSample * pSample) { VMR9Impl *This = (VMR9Impl *)iface; @@ -425,6 +431,8 @@ static HRESULT WINAPI VMR9Inner_QueryInterface(IUnknown * iface, REFIID riid, LP *ppv = &This->baseControlWindow.IVideoWindow_iface; else if (IsEqualIID(riid, &IID_IBasicVideo)) *ppv = &This->baseControlVideo.IBasicVideo_iface; + else if (IsEqualIID(riid, &IID_IAMFilterMiscFlags)) + *ppv = &This->IAMFilterMiscFlags_iface; else { HRESULT hr; @@ -445,8 +453,6 @@ static HRESULT WINAPI VMR9Inner_QueryInterface(IUnknown * iface, REFIID riid, LP ; else if (IsEqualIID(riid, &IID_IVMRSurfaceAllocatorNotify9)) ; - else if (IsEqualIID(riid, &IID_IAMFilterMiscFlags)) - FIXME("No interface for IID_IAMFilterMiscFlags\n"); else if (IsEqualIID(riid, &IID_IMediaPosition)) FIXME("No interface for IID_IMediaPosition\n"); else if (IsEqualIID(riid, &IID_IQualProp)) @@ -730,6 +736,32 @@ static const IBasicVideoVtbl IBasicVideo_VTable = BaseControlVideoImpl_IsUsingDefaultDestination }; +static HRESULT WINAPI AMFilterMiscFlags_QueryInterface(IAMFilterMiscFlags *iface, REFIID riid, void **ppv) { + VMR9Impl *This = impl_from_IAMFilterMiscFlags(iface); + return VMR9_QueryInterface(&This->renderer.filter.IBaseFilter_iface, riid, ppv); +} + +static ULONG WINAPI AMFilterMiscFlags_AddRef(IAMFilterMiscFlags *iface) { + VMR9Impl *This = impl_from_IAMFilterMiscFlags(iface); + return VMR9_AddRef(&This->renderer.filter.IBaseFilter_iface); +} + +static ULONG WINAPI AMFilterMiscFlags_Release(IAMFilterMiscFlags *iface) { + VMR9Impl *This = impl_from_IAMFilterMiscFlags(iface); + return VMR9_Release(&This->renderer.filter.IBaseFilter_iface); +} + +static ULONG WINAPI AMFilterMiscFlags_GetMiscFlags(IAMFilterMiscFlags *iface) { + return AM_FILTER_MISC_FLAGS_IS_RENDERER; +} + +static const IAMFilterMiscFlagsVtbl IAMFilterMiscFlags_Vtbl = { + AMFilterMiscFlags_QueryInterface, + AMFilterMiscFlags_AddRef, + AMFilterMiscFlags_Release, + AMFilterMiscFlags_GetMiscFlags +}; + HRESULT VMR9Impl_create(IUnknown * outer_unk, LPVOID * ppv) { HRESULT hr; @@ -745,6 +777,7 @@ HRESULT VMR9Impl_create(IUnknown * outer_unk, LPVOID * ppv) pVMR9->bUnkOuterValid = FALSE; pVMR9->bAggregatable = FALSE; pVMR9->IUnknown_inner.lpVtbl = &IInner_VTable; + pVMR9->IAMFilterMiscFlags_iface.lpVtbl = &IAMFilterMiscFlags_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 BaseControlVideo to VMR9.
by Alexandre Julliard 05 Apr '12

05 Apr '12

Module: wine Branch: master Commit: 76a42b9b9e68b7511562af3e219d7ad900516473 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76a42b9b9e68b7511562af3e2… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Apr 3 14:38:01 2012 -0500 quartz: Add BaseControlVideo to VMR9. --- dlls/quartz/vmr9.c | 299 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 295 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=76a42b9b9e68b7511562a…

1 0

Aric Stewart : quartz: Add BaseControlWindow to VMR9.
by Alexandre Julliard 05 Apr '12

05 Apr '12

Module: wine Branch: master Commit: 8365b7a37215e9f04aacbcd1338830b44203858c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8365b7a37215e9f04aacbcd13… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Apr 3 14:37:58 2012 -0500 quartz: Add BaseControlWindow to VMR9. --- dlls/quartz/vmr9.c | 135 +++++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 123 insertions(+), 12 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index b1d75a3..42105ab 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -48,6 +48,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); typedef struct { BaseRenderer renderer; + BaseControlWindow baseControlWindow; + IUnknown IUnknown_inner; BITMAPINFOHEADER bmiheader; @@ -61,6 +63,16 @@ static inline VMR9Impl *impl_from_inner_IUnknown(IUnknown *iface) return CONTAINING_RECORD(iface, VMR9Impl, IUnknown_inner); } +static inline VMR9Impl *impl_from_BaseWindow( BaseWindow *wnd ) +{ + return CONTAINING_RECORD(wnd, VMR9Impl, baseControlWindow.baseWindow); +} + +static inline VMR9Impl *impl_from_IVideoWindow( IVideoWindow *iface) +{ + return CONTAINING_RECORD(iface, VMR9Impl, baseControlWindow.IVideoWindow_iface); +} + static HRESULT WINAPI VMR9_DoRenderSample(BaseRenderer *iface, IMediaSample * pSample) { VMR9Impl *This = (VMR9Impl *)iface; @@ -164,6 +176,25 @@ static const BaseRendererFuncTable BaseFuncTable = { NULL, }; +static LPWSTR WINAPI VMR9_GetClassWindowStyles(BaseWindow *This, DWORD *pClassStyles, DWORD *pWindowStyles, DWORD *pWindowStylesEx) +{ + static WCHAR classnameW[] = { 'I','V','M','R','9',' ','C','l','a','s','s', 0 }; + + *pClassStyles = 0; + *pWindowStyles = WS_SIZEBOX; + *pWindowStylesEx = 0; + + return classnameW; +} + +static const BaseWindowFuncTable renderer_BaseWindowFuncTable = { + VMR9_GetClassWindowStyles, + BaseWindowImpl_GetDefaultRect, + NULL, + BaseControlWindowImpl_PossiblyEatMessage, + NULL, +}; + static HRESULT WINAPI VMR9Inner_QueryInterface(IUnknown * iface, REFIID riid, LPVOID * ppv) { VMR9Impl *This = impl_from_inner_IUnknown(iface); @@ -176,6 +207,8 @@ static HRESULT WINAPI VMR9Inner_QueryInterface(IUnknown * iface, REFIID riid, LP if (IsEqualIID(riid, &IID_IUnknown)) *ppv = &This->IUnknown_inner; + else if (IsEqualIID(riid, &IID_IVideoWindow)) + *ppv = &This->baseControlWindow.IVideoWindow_iface; else { HRESULT hr; @@ -194,8 +227,6 @@ static HRESULT WINAPI VMR9Inner_QueryInterface(IUnknown * iface, REFIID riid, LP FIXME("No interface for IID_IBasicVideo\n"); else if (IsEqualIID(riid, &IID_IBasicVideo2)) FIXME("No interface for IID_IBasicVideo2\n"); - else if (IsEqualIID(riid, &IID_IVideoWindow)) - FIXME("No interface for IID_IVideoWindow\n"); else if (IsEqualIID(riid, &IID_IVMRWindowlessControl9)) ; else if (IsEqualIID(riid, &IID_IVMRSurfaceAllocatorNotify9)) @@ -336,6 +367,84 @@ static const IBaseFilterVtbl VMR9_Vtbl = BaseFilterImpl_QueryVendorInfo }; +/*** IUnknown methods ***/ +static HRESULT WINAPI Videowindow_QueryInterface(IVideoWindow *iface, REFIID riid, LPVOID*ppvObj) +{ + VMR9Impl *This = impl_from_IVideoWindow(iface); + + TRACE("(%p/%p)->(%s (%p), %p)\n", This, iface, debugstr_guid(riid), riid, ppvObj); + + return VMR9_QueryInterface(&This->renderer.filter.IBaseFilter_iface, riid, ppvObj); +} + +static ULONG WINAPI Videowindow_AddRef(IVideoWindow *iface) +{ + VMR9Impl *This = impl_from_IVideoWindow(iface); + + TRACE("(%p/%p)->()\n", This, iface); + + return VMR9_AddRef(&This->renderer.filter.IBaseFilter_iface); +} + +static ULONG WINAPI Videowindow_Release(IVideoWindow *iface) +{ + VMR9Impl *This = impl_from_IVideoWindow(iface); + + TRACE("(%p/%p)->()\n", This, iface); + + return VMR9_Release(&This->renderer.filter.IBaseFilter_iface); +} + +static const IVideoWindowVtbl IVideoWindow_VTable = +{ + Videowindow_QueryInterface, + Videowindow_AddRef, + Videowindow_Release, + BaseControlWindowImpl_GetTypeInfoCount, + BaseControlWindowImpl_GetTypeInfo, + BaseControlWindowImpl_GetIDsOfNames, + BaseControlWindowImpl_Invoke, + BaseControlWindowImpl_put_Caption, + BaseControlWindowImpl_get_Caption, + BaseControlWindowImpl_put_WindowStyle, + BaseControlWindowImpl_get_WindowStyle, + BaseControlWindowImpl_put_WindowStyleEx, + BaseControlWindowImpl_get_WindowStyleEx, + BaseControlWindowImpl_put_AutoShow, + BaseControlWindowImpl_get_AutoShow, + BaseControlWindowImpl_put_WindowState, + BaseControlWindowImpl_get_WindowState, + BaseControlWindowImpl_put_BackgroundPalette, + BaseControlWindowImpl_get_BackgroundPalette, + BaseControlWindowImpl_put_Visible, + BaseControlWindowImpl_get_Visible, + BaseControlWindowImpl_put_Left, + BaseControlWindowImpl_get_Left, + BaseControlWindowImpl_put_Width, + BaseControlWindowImpl_get_Width, + BaseControlWindowImpl_put_Top, + BaseControlWindowImpl_get_Top, + BaseControlWindowImpl_put_Height, + BaseControlWindowImpl_get_Height, + BaseControlWindowImpl_put_Owner, + BaseControlWindowImpl_get_Owner, + BaseControlWindowImpl_put_MessageDrain, + BaseControlWindowImpl_get_MessageDrain, + BaseControlWindowImpl_get_BorderColor, + BaseControlWindowImpl_put_BorderColor, + BaseControlWindowImpl_get_FullScreenMode, + BaseControlWindowImpl_put_FullScreenMode, + BaseControlWindowImpl_SetWindowForeground, + BaseControlWindowImpl_NotifyOwnerMessage, + BaseControlWindowImpl_SetWindowPosition, + BaseControlWindowImpl_GetWindowPosition, + BaseControlWindowImpl_GetMinIdealImageSize, + BaseControlWindowImpl_GetMaxIdealImageSize, + BaseControlWindowImpl_GetRestorePosition, + BaseControlWindowImpl_HideCursor, + BaseControlWindowImpl_IsCursorHidden +}; + HRESULT VMR9Impl_create(IUnknown * outer_unk, LPVOID * ppv) { HRESULT hr; @@ -353,17 +462,19 @@ HRESULT VMR9Impl_create(IUnknown * outer_unk, LPVOID * ppv) pVMR9->IUnknown_inner.lpVtbl = &IInner_VTable; hr = BaseRenderer_Init(&pVMR9->renderer, &VMR9_Vtbl, outer_unk, &CLSID_VideoMixingRenderer9, (DWORD_PTR)(__FILE__ ": VMR9Impl.csFilter"), &BaseFuncTable); + if (FAILED(hr)) + goto fail; - if (SUCCEEDED(hr)) - { - *ppv = (LPVOID)pVMR9; - TRACE("Created at %p\n", pVMR9); - } - else - { - BaseRendererImpl_Release(&pVMR9->renderer.filter.IBaseFilter_iface); - CoTaskMemFree(pVMR9); - } + hr = BaseControlWindow_Init(&pVMR9->baseControlWindow, &IVideoWindow_VTable, &pVMR9->renderer.filter, &pVMR9->renderer.filter.csFilter, &pVMR9->renderer.pInputPin->pin, &renderer_BaseWindowFuncTable); + if (FAILED(hr)) + goto fail; + + *ppv = (LPVOID)pVMR9; + TRACE("Created at %p\n", pVMR9); + return hr; +fail: + BaseRendererImpl_Release(&pVMR9->renderer.filter.IBaseFilter_iface); + CoTaskMemFree(pVMR9); return hr; }

1 0

Aric Stewart : quartz: Add initial VMR9 stub.
by Alexandre Julliard 05 Apr '12

05 Apr '12

Module: wine Branch: master Commit: d969b802102b8fdb3b1c6dee740617963cea03f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d969b802102b8fdb3b1c6dee7… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Apr 3 14:37:55 2012 -0500 quartz: Add initial VMR9 stub. --- dlls/quartz/Makefile.in | 3 +- dlls/quartz/main.c | 1 + dlls/quartz/quartz_private.h | 1 + dlls/quartz/quartz_strmif.idl | 7 + dlls/quartz/regsvr.c | 12 ++ dlls/quartz/vmr9.c | 369 +++++++++++++++++++++++++++++++++++++++++ 6 files changed, 392 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d969b802102b8fdb3b1c6…

1 0

Joris Huizer : amstream: IAMMultiMediaStreamImpl_SetState: correct ifs.
by Alexandre Julliard 05 Apr '12

05 Apr '12

Module: wine Branch: master Commit: ee0bfd36ed9b60ed20af3178f0f00ce7a9996bc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee0bfd36ed9b60ed20af3178f… Author: Joris Huizer <jorishuizer(a)planet.nl> Date: Wed Apr 4 21:18:00 2012 +0200 amstream: IAMMultiMediaStreamImpl_SetState: correct ifs. --- dlls/amstream/amstream.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/amstream/amstream.c b/dlls/amstream/amstream.c index 150f412..156fd69 100644 --- a/dlls/amstream/amstream.c +++ b/dlls/amstream/amstream.c @@ -191,9 +191,9 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_SetState(IAMMultiMediaStream* ifac TRACE("(%p/%p)->(%u)\n", This, iface, new_state); - if (STREAMSTATE_RUN) + if (new_state == STREAMSTATE_RUN) hr = IMediaControl_Run(This->media_control); - else if (STREAMSTATE_STOP) + else if (new_state == STREAMSTATE_STOP) hr = IMediaControl_Stop(This->media_control); return hr;

1 0

Ken Thomases : gdi32: On Mac OS X, find fonts using Core Text rather than FontConfig, by default.
by Alexandre Julliard 05 Apr '12

05 Apr '12

Module: wine Branch: master Commit: 9cb7a97981c8bedcb4425ec22e2b90047b2ccc9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cb7a97981c8bedcb4425ec22… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Apr 4 17:41:10 2012 -0500 gdi32: On Mac OS X, find fonts using Core Text rather than FontConfig, by default. --- configure | 5 ++- configure.ac | 6 ++- dlls/gdi32/freetype.c | 124 ++++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 130 insertions(+), 5 deletions(-) diff --git a/configure b/configure index 12f5802..604bd9e 100755 --- a/configure +++ b/configure @@ -2561,7 +2561,7 @@ fi # Check whether --with-fontconfig was given. if test "${with_fontconfig+set}" = set; then : - withval=$with_fontconfig; if test "x$withval" = "xno"; then ac_cv_header_fontconfig_fontconfig_h=no; fi + withval=$with_fontconfig; fi @@ -4058,6 +4058,7 @@ case $host in enable_win16=${enable_win16:-yes} fi + with_fontconfig=${with_fontconfig:-no} ;; x86_64*) if test "x$enable_win64" != "xyes" -a "$cross_compiling" != "yes" @@ -5278,6 +5279,8 @@ OPENGL_LIBS="" +test "x$with_fontconfig" != "xno" || ac_cv_header_fontconfig_fontconfig_h=no + # Check whether --enable-largefile was given. if test "${enable_largefile+set}" = set; then : enableval=$enable_largefile; diff --git a/configure.ac b/configure.ac index f55b2ff..6fed66c 100644 --- a/configure.ac +++ b/configure.ac @@ -43,8 +43,7 @@ AC_ARG_WITH(cups, AS_HELP_STRING([--without-cups],[do not use CUPS])) AC_ARG_WITH(curses, AS_HELP_STRING([--without-curses],[do not use (n)curses]), [if test "x$withval" = "xno"; then ac_cv_header_ncurses_h=no; ac_cv_header_curses_h=no; fi]) AC_ARG_WITH(dbus, AS_HELP_STRING([--without-dbus],[do not use DBus (dynamic device support)])) -AC_ARG_WITH(fontconfig,AS_HELP_STRING([--without-fontconfig],[do not use fontconfig]), - [if test "x$withval" = "xno"; then ac_cv_header_fontconfig_fontconfig_h=no; fi]) +AC_ARG_WITH(fontconfig,AS_HELP_STRING([--without-fontconfig],[do not use fontconfig])) AC_ARG_WITH(freetype, AS_HELP_STRING([--without-freetype],[do not use the FreeType library])) AC_ARG_WITH(gettext, AS_HELP_STRING([--without-gettext],[do not use gettext])) AC_ARG_WITH(gettextpo, AS_HELP_STRING([--with-gettextpo],[use the GetTextPO library to rebuild po files]), @@ -142,6 +141,7 @@ case $host in AC_SUBST(TARGETFLAGS,"-m32") enable_win16=${enable_win16:-yes} fi + with_fontconfig=${with_fontconfig:-no} ;; x86_64*) if test "x$enable_win64" != "xyes" -a "$cross_compiling" != "yes" @@ -381,6 +381,8 @@ AC_SUBST(OPENGL_LIBS,"") dnl **** Check for header files **** +test "x$with_fontconfig" != "xno" || ac_cv_header_fontconfig_fontconfig_h=no + AC_SYS_LARGEFILE() AC_CHECK_HEADERS(\ diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index ff8e784..cf9f0d6 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -2340,9 +2340,9 @@ static BOOL ReadFontDir(const char *dirname, BOOL external_fonts) return TRUE; } +#ifdef SONAME_LIBFONTCONFIG static void load_fontconfig_fonts(void) { -#ifdef SONAME_LIBFONTCONFIG void *fc_handle = NULL; FcConfig *config; FcPattern *pat; @@ -2408,10 +2408,126 @@ LOAD_FUNCPTR(FcPatternGetString); pFcObjectSetDestroy(os); pFcPatternDestroy(pat); sym_not_found: -#endif return; } +#elif defined(HAVE_CARBON_CARBON_H) + +static void load_mac_font_callback(const void *value, void *context) +{ + CFStringRef pathStr = value; + CFIndex len; + char* path; + + len = CFStringGetMaximumSizeOfFileSystemRepresentation(pathStr); + path = HeapAlloc(GetProcessHeap(), 0, len); + if (path && CFStringGetFileSystemRepresentation(pathStr, path, len)) + { + TRACE("font file %s\n", path); + AddFontToList(path, NULL, 0, ADDFONT_EXTERNAL_FONT | ADDFONT_ADD_TO_CACHE); + } + HeapFree(GetProcessHeap(), 0, path); +} + +static void load_mac_fonts(void) +{ + CFStringRef removeDupesKey; + CFBooleanRef removeDupesValue; + CFDictionaryRef options; + CTFontCollectionRef col; + CFArrayRef descs; + CFMutableSetRef paths; + CFIndex i; + + removeDupesKey = kCTFontCollectionRemoveDuplicatesOption; + removeDupesValue = kCFBooleanTrue; + options = CFDictionaryCreate(NULL, (const void**)&removeDupesKey, (const void**)&removeDupesValue, 1, + &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks); + col = CTFontCollectionCreateFromAvailableFonts(options); + if (options) CFRelease(options); + if (!col) + { + WARN("CTFontCollectionCreateFromAvailableFonts failed\n"); + return; + } + + descs = CTFontCollectionCreateMatchingFontDescriptors(col); + CFRelease(col); + if (!descs) + { + WARN("CTFontCollectionCreateMatchingFontDescriptors failed\n"); + return; + } + + paths = CFSetCreateMutable(NULL, 0, &kCFTypeSetCallBacks); + if (!paths) + { + WARN("CFSetCreateMutable failed\n"); + CFRelease(descs); + return; + } + + for (i = 0; i < CFArrayGetCount(descs); i++) + { + CTFontDescriptorRef desc; + CTFontRef font; + ATSFontRef atsFont; + OSStatus status; + FSRef fsref; + CFURLRef url; + CFStringRef ext; + CFStringRef path; + + desc = CFArrayGetValueAtIndex(descs, i); + + /* CTFontDescriptor doesn't support kCTFontURLAttribute until 10.6, so + we have to go CFFontDescriptor -> CTFont -> ATSFont -> FSRef -> CFURL. */ + font = CTFontCreateWithFontDescriptor(desc, 0, NULL); + if (!font) continue; + + atsFont = CTFontGetPlatformFont(font, NULL); + if (!atsFont) + { + CFRelease(font); + continue; + } + + status = ATSFontGetFileReference(atsFont, &fsref); + CFRelease(font); + if (status != noErr) continue; + + url = CFURLCreateFromFSRef(NULL, &fsref); + if (!url) continue; + + ext = CFURLCopyPathExtension(url); + if (ext) + { + BOOL skip = (CFStringCompare(ext, CFSTR("pfa"), kCFCompareCaseInsensitive) == kCFCompareEqualTo || + CFStringCompare(ext, CFSTR("pfb"), kCFCompareCaseInsensitive) == kCFCompareEqualTo); + CFRelease(ext); + if (skip) + { + CFRelease(url); + continue; + } + } + + path = CFURLCopyFileSystemPath(url, kCFURLPOSIXPathStyle); + CFRelease(url); + if (!path) continue; + + CFSetAddValue(paths, path); + CFRelease(path); + } + + CFRelease(descs); + + CFSetApplyFunction(paths, load_mac_font_callback, NULL); + CFRelease(paths); +} + +#endif + static BOOL load_font_from_data_dir(LPCWSTR file) { BOOL ret = FALSE; @@ -3485,7 +3601,11 @@ static void init_font_list(void) RegCloseKey(hkey); } +#ifdef SONAME_LIBFONTCONFIG load_fontconfig_fonts(); +#elif defined(HAVE_CARBON_CARBON_H) + load_mac_fonts(); +#endif /* then look in any directories that we've specified in the config file */ /* @@ Wine registry key: HKCU\Software\Wine\Fonts */

1 0

Ken Thomases : Revert "gdi32: Load fonts from default Mac external font paths.".
by Alexandre Julliard 05 Apr '12

05 Apr '12

Module: wine Branch: master Commit: 272cf2a9730865dd5ca32689d62209a4b761e993 URL: http://source.winehq.org/git/wine.git/?a=commit;h=272cf2a9730865dd5ca32689d… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Apr 4 17:40:13 2012 -0500 Revert "gdi32: Load fonts from default Mac external font paths.". This reverts commit 85a71387dac1ca3ad47970800c8c01743681b528. --- dlls/gdi32/freetype.c | 17 +---------------- 1 files changed, 1 insertions(+), 16 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 72b74be..ff8e784 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3403,7 +3403,6 @@ static void init_font_list(void) DWORD valuelen, datalen, i = 0, type, dlen, vlen; WCHAR windowsdir[MAX_PATH]; char *unixname; - const char *home; const char *data_dir; delete_external_font_keys(); @@ -3509,6 +3508,7 @@ static void init_font_list(void) ptr = valueA; while (ptr) { + const char* home; LPSTR next = strchr( ptr, ':' ); if (next) *next++ = 0; if (ptr[0] == '~' && ptr[1] == '/' && (home = getenv( "HOME" )) && @@ -3529,21 +3529,6 @@ static void init_font_list(void) } RegCloseKey(hkey); } - -#ifdef __APPLE__ - /* Mac default font locations. */ - ReadFontDir( "/Library/Fonts", TRUE ); - ReadFontDir( "/Network/Library/Fonts", TRUE ); - ReadFontDir( "/System/Library/Fonts", TRUE ); - if ((home = getenv( "HOME" ))) - { - unixname = HeapAlloc( GetProcessHeap(), 0, strlen(home)+15 ); - strcpy( unixname, home ); - strcat( unixname, "/Library/Fonts" ); - ReadFontDir( unixname, TRUE); - HeapFree( GetProcessHeap(), 0, unixname ); - } -#endif } static BOOL move_to_front(const WCHAR *name)

1 0

Igor Paliychuk : po: Update Ukrainian translation.
by Alexandre Julliard 05 Apr '12

05 Apr '12

Module: wine Branch: master Commit: 9c1591ee54ad074edfd96c2480593284cefd344b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c1591ee54ad074edfd96c248… Author: Igor Paliychuk <mansonigor(a)gmail.com> Date: Wed Apr 4 18:44:07 2012 +0300 po: Update Ukrainian translation. --- po/uk.po | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/po/uk.po b/po/uk.po index 06b12bc..6acf133 100644 --- a/po/uk.po +++ b/po/uk.po @@ -9842,12 +9842,12 @@ msgstr "Ви впевнені?" #: cmd.rc:307 xcopy.rc:40 msgctxt "Yes key" msgid "Y" -msgstr "" +msgstr "Т" #: cmd.rc:308 xcopy.rc:41 msgctxt "No key" msgid "N" -msgstr "" +msgstr "Н" #: cmd.rc:309 msgid "File association missing for extension %1\n" @@ -9916,7 +9916,7 @@ msgstr "Не можу викликати мітку пакету за межам #: cmd.rc:327 xcopy.rc:42 msgctxt "All key" msgid "A" -msgstr "" +msgstr "В" #: cmd.rc:328 msgid "Delete %1?" @@ -9984,11 +9984,11 @@ msgstr "Том в приводі %1!c! не має мітки.\n" #: cmd.rc:343 msgid " (Yes|No)" -msgstr "" +msgstr " (Так|Ні)" #: cmd.rc:344 msgid " (Yes|No|All)" -msgstr "" +msgstr " (Так|Ні|Всі)" #: dxdiag.rc:27 msgid "DirectX Diagnostic Tool" @@ -13973,15 +13973,15 @@ msgid "" "(F - File, D - Directory)\n" msgstr "" "'%1' є файлом чи директорією?\n" -"(F - Файл, D - Директорія)\n" +"(Ф - Файл, Д - Директорія)\n" #: xcopy.rc:35 msgid "%1? (Yes|No)\n" -msgstr "" +msgstr "%1? (Так|Ні)\n" #: xcopy.rc:36 msgid "Overwrite %1? (Yes|No|All)\n" -msgstr "Переписати %1? (Yes|No|All)\n" +msgstr "Переписати %1? (Так|Ні|Всі)\n" #: xcopy.rc:37 msgid "Copying of '%1' to '%2' failed with r/c %3!d!\n" @@ -13994,12 +13994,12 @@ msgstr "Помилка читання '%1'\n" #: xcopy.rc:43 msgctxt "File key" msgid "F" -msgstr "" +msgstr "Ф" #: xcopy.rc:44 msgctxt "Directory key" msgid "D" -msgstr "" +msgstr "Д" #: xcopy.rc:77 msgid ""

1 0

Hans Leidekker : kernel32: GetModuleHandleEx already clears the module handle on failure.
by Alexandre Julliard 05 Apr '12

05 Apr '12

Module: wine Branch: master Commit: 31ffa5477336ca06fc24e9ef83eff396c6a718f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31ffa5477336ca06fc24e9ef8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 5 11:16:37 2012 +0200 kernel32: GetModuleHandleEx already clears the module handle on failure. --- dlls/kernel32/module.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index d4978cf..6b91a4c 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -570,7 +570,7 @@ HMODULE WINAPI DECLSPEC_HOTPATCH GetModuleHandleA(LPCSTR module) { HMODULE ret; - if (!GetModuleHandleExA( GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, module, &ret )) ret = 0; + GetModuleHandleExA( GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, module, &ret ); return ret; } @@ -583,7 +583,7 @@ HMODULE WINAPI GetModuleHandleW(LPCWSTR module) { HMODULE ret; - if (!GetModuleHandleExW( GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, module, &ret )) ret = 0; + GetModuleHandleExW( GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, module, &ret ); return ret; }

1 0

Hans Leidekker : kernel32: Clear the module handle on failure in GetModuleHandleEx.
by Alexandre Julliard 05 Apr '12

05 Apr '12

Module: wine Branch: master Commit: f96c7278e72a28f96ddb535de8746f4a9780fc9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f96c7278e72a28f96ddb535de… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 5 11:16:08 2012 +0200 kernel32: Clear the module handle on failure in GetModuleHandleEx. --- dlls/kernel32/module.c | 4 +++- dlls/kernel32/tests/module.c | 8 ++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index 739392f..d4978cf 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -548,7 +548,9 @@ BOOL WINAPI GetModuleHandleExW( DWORD flags, LPCWSTR name, HMODULE *module ) !(flags & GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT)) LdrUnlockLoaderLock( 0, magic ); - *module = ret; + if (status == STATUS_SUCCESS) *module = ret; + else *module = NULL; + return (status == STATUS_SUCCESS); } diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index 30da85f..f88c8cb 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -540,7 +540,7 @@ static void testGetModuleHandleEx(void) error = GetLastError(); ok( !ret, "unexpected success\n" ); ok( error == ERROR_MOD_NOT_FOUND, "got %u\n", error ); - todo_wine ok( mod == NULL, "got %p\n", mod ); + ok( mod == NULL, "got %p\n", mod ); SetLastError( 0xdeadbeef ); ret = pGetModuleHandleExW( 0, NULL, NULL ); @@ -567,7 +567,7 @@ static void testGetModuleHandleEx(void) error = GetLastError(); ok( !ret, "unexpected success\n" ); ok( error == ERROR_MOD_NOT_FOUND, "got %u\n", error ); - todo_wine ok( mod == NULL, "got %p\n", mod ); + ok( mod == NULL, "got %p\n", mod ); SetLastError( 0xdeadbeef ); ret = pGetModuleHandleExA( GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, NULL, NULL ); @@ -593,7 +593,7 @@ static void testGetModuleHandleEx(void) error = GetLastError(); ok( !ret, "unexpected success\n" ); ok( error == ERROR_MOD_NOT_FOUND, "got %u\n", error ); - todo_wine ok( mod == NULL, "got %p\n", mod ); + ok( mod == NULL, "got %p\n", mod ); SetLastError( 0xdeadbeef ); ret = pGetModuleHandleExW( GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, NULL, NULL ); @@ -619,7 +619,7 @@ static void testGetModuleHandleEx(void) error = GetLastError(); ok( !ret, "unexpected success\n" ); ok( error == ERROR_MOD_NOT_FOUND, "got %u\n", error ); - todo_wine ok( mod == NULL, "got %p\n", mod ); + ok( mod == NULL, "got %p\n", mod ); mod_kernel32 = LoadLibraryA( "kernel32" );

1 0

← Newer
1
...
54
55
56
57
58
59
60
...
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