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

Alistair Leslie-Hughes : scrrun: Add IFileSystem3 support.
by Alexandre Julliard 05 Apr '12

05 Apr '12

Module: wine Branch: master Commit: 62077059a5aa9bd26eb51be82a5c31691017b086 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62077059a5aa9bd26eb51be82… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Mar 20 14:54:25 2012 +1100 scrrun: Add IFileSystem3 support. --- .gitignore | 1 + dlls/scrrun/Makefile.in | 7 +- dlls/scrrun/filesystem.c | 383 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/scrrun/scrrun.c | 68 ++++++++- 4 files changed, 454 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=62077059a5aa9bd26eb51…

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

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

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

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 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 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 VMRFilterConfig9 to VMR9.
by Alexandre Julliard 05 Apr '12

05 Apr '12

Module: wine Branch: master Commit: eb4972017e5188500c8144ecac81f75eba02884f URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb4972017e5188500c8144eca… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Apr 3 14:38:07 2012 -0500 quartz: Add VMRFilterConfig9 to VMR9. --- dlls/quartz/vmr9.c | 156 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 156 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 07e3428..b8b81c2 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -53,12 +53,20 @@ typedef struct IUnknown IUnknown_inner; IAMFilterMiscFlags IAMFilterMiscFlags_iface; + IVMRFilterConfig9 IVMRFilterConfig9_iface; + IVMRSurfaceAllocatorEx9 *allocator; + IVMRImagePresenter9 *presenter; + BOOL allocator_is_ex; + + VMR9Mode mode; BITMAPINFOHEADER bmiheader; IUnknown * outer_unk; BOOL bUnkOuterValid; BOOL bAggregatable; + DWORD_PTR cookie; + RECT source_rect; RECT target_rect; LONG VideoWidth; @@ -95,6 +103,11 @@ static inline VMR9Impl *impl_from_IAMFilterMiscFlags( IAMFilterMiscFlags *iface) return CONTAINING_RECORD(iface, VMR9Impl, IAMFilterMiscFlags_iface); } +static inline VMR9Impl *impl_from_IVMRFilterConfig9( IVMRFilterConfig9 *iface) +{ + return CONTAINING_RECORD(iface, VMR9Impl, IVMRFilterConfig9_iface); +} + static HRESULT WINAPI VMR9_DoRenderSample(BaseRenderer *iface, IMediaSample * pSample) { VMR9Impl *This = (VMR9Impl *)iface; @@ -433,6 +446,8 @@ static HRESULT WINAPI VMR9Inner_QueryInterface(IUnknown * iface, REFIID riid, LP *ppv = &This->baseControlVideo.IBasicVideo_iface; else if (IsEqualIID(riid, &IID_IAMFilterMiscFlags)) *ppv = &This->IAMFilterMiscFlags_iface; + else if (IsEqualIID(riid, &IID_IVMRFilterConfig9)) + *ppv = &This->IVMRFilterConfig9_iface; else { HRESULT hr; @@ -494,6 +509,11 @@ static ULONG WINAPI VMR9Inner_Release(IUnknown * iface) { TRACE("Destroying\n"); + if (This->allocator) + IVMRSurfaceAllocator9_Release(This->allocator); + if (This->presenter) + IVMRImagePresenter9_Release(This->presenter); + CoTaskMemFree(This); } return refCount; @@ -762,6 +782,137 @@ static const IAMFilterMiscFlagsVtbl IAMFilterMiscFlags_Vtbl = { AMFilterMiscFlags_GetMiscFlags }; +static HRESULT WINAPI VMR9FilterConfig_QueryInterface(IVMRFilterConfig9 *iface, REFIID riid, LPVOID * ppv) +{ + VMR9Impl *This = impl_from_IVMRFilterConfig9(iface); + return VMR9_QueryInterface(&This->renderer.filter.IBaseFilter_iface, riid, ppv); +} + +static ULONG WINAPI VMR9FilterConfig_AddRef(IVMRFilterConfig9 *iface) +{ + VMR9Impl *This = impl_from_IVMRFilterConfig9(iface); + return VMR9_AddRef(&This->renderer.filter.IBaseFilter_iface); +} + +static ULONG WINAPI VMR9FilterConfig_Release(IVMRFilterConfig9 *iface) +{ + VMR9Impl *This = impl_from_IVMRFilterConfig9(iface); + return VMR9_Release(&This->renderer.filter.IBaseFilter_iface); +} + +static HRESULT WINAPI VMR9FilterConfig_SetImageCompositor(IVMRFilterConfig9 *iface, IVMRImageCompositor9 *compositor) +{ + VMR9Impl *This = impl_from_IVMRFilterConfig9(iface); + + FIXME("(%p/%p)->(%p) stub\n", iface, This, compositor); + return E_NOTIMPL; +} + +static HRESULT WINAPI VMR9FilterConfig_SetNumberOfStreams(IVMRFilterConfig9 *iface, DWORD max) +{ + VMR9Impl *This = impl_from_IVMRFilterConfig9(iface); + + FIXME("(%p/%p)->(%u) stub\n", iface, This, max); + return E_NOTIMPL; +} + +static HRESULT WINAPI VMR9FilterConfig_GetNumberOfStreams(IVMRFilterConfig9 *iface, DWORD *max) +{ + VMR9Impl *This = impl_from_IVMRFilterConfig9(iface); + + FIXME("(%p/%p)->(%p) stub\n", iface, This, max); + return E_NOTIMPL; +} + +static HRESULT WINAPI VMR9FilterConfig_SetRenderingPrefs(IVMRFilterConfig9 *iface, DWORD renderflags) +{ + VMR9Impl *This = impl_from_IVMRFilterConfig9(iface); + + FIXME("(%p/%p)->(%u) stub\n", iface, This, renderflags); + return E_NOTIMPL; +} + +static HRESULT WINAPI VMR9FilterConfig_GetRenderingPrefs(IVMRFilterConfig9 *iface, DWORD *renderflags) +{ + VMR9Impl *This = impl_from_IVMRFilterConfig9(iface); + + FIXME("(%p/%p)->(%p) stub\n", iface, This, renderflags); + return E_NOTIMPL; +} + +static HRESULT WINAPI VMR9FilterConfig_SetRenderingMode(IVMRFilterConfig9 *iface, DWORD mode) +{ + HRESULT hr = S_OK; + VMR9Impl *This = impl_from_IVMRFilterConfig9(iface); + + TRACE("(%p/%p)->(%u)\n", iface, This, mode); + + EnterCriticalSection(&This->renderer.filter.csFilter); + if (This->mode) + { + LeaveCriticalSection(&This->renderer.filter.csFilter); + return VFW_E_WRONG_STATE; + } + + if (This->allocator) + IVMRSurfaceAllocator9_Release(This->allocator); + if (This->presenter) + IVMRImagePresenter9_Release(This->presenter); + + This->allocator = NULL; + This->presenter = NULL; + + switch (mode) + { + case VMR9Mode_Windowed: + case VMR9Mode_Windowless: + This->allocator = NULL; + This->presenter = NULL; + This->allocator_is_ex = 0; + This->cookie = ~0; + break; + case VMR9Mode_Renderless: + break; + default: + LeaveCriticalSection(&This->renderer.filter.csFilter); + return E_INVALIDARG; + } + + This->mode = mode; + LeaveCriticalSection(&This->renderer.filter.csFilter); + return hr; +} + +static HRESULT WINAPI VMR9FilterConfig_GetRenderingMode(IVMRFilterConfig9 *iface, DWORD *mode) +{ + VMR9Impl *This = impl_from_IVMRFilterConfig9(iface); + + TRACE("(%p/%p)->(%p) stub\n", iface, This, mode); + if (!mode) + return E_POINTER; + + if (This->mode) + *mode = This->mode; + else + *mode = VMR9Mode_Windowed; + + return S_OK; +} + +static const IVMRFilterConfig9Vtbl VMR9_FilterConfig_Vtbl = +{ + VMR9FilterConfig_QueryInterface, + VMR9FilterConfig_AddRef, + VMR9FilterConfig_Release, + VMR9FilterConfig_SetImageCompositor, + VMR9FilterConfig_SetNumberOfStreams, + VMR9FilterConfig_GetNumberOfStreams, + VMR9FilterConfig_SetRenderingPrefs, + VMR9FilterConfig_GetRenderingPrefs, + VMR9FilterConfig_SetRenderingMode, + VMR9FilterConfig_GetRenderingMode +}; + HRESULT VMR9Impl_create(IUnknown * outer_unk, LPVOID * ppv) { HRESULT hr; @@ -779,6 +930,11 @@ HRESULT VMR9Impl_create(IUnknown * outer_unk, LPVOID * ppv) pVMR9->IUnknown_inner.lpVtbl = &IInner_VTable; pVMR9->IAMFilterMiscFlags_iface.lpVtbl = &IAMFilterMiscFlags_Vtbl; + pVMR9->mode = 0; + pVMR9->allocator = NULL; + pVMR9->presenter = NULL; + pVMR9->IVMRFilterConfig9_iface.lpVtbl = &VMR9_FilterConfig_Vtbl; + hr = BaseRenderer_Init(&pVMR9->renderer, &VMR9_Vtbl, outer_unk, &CLSID_VideoMixingRenderer9, (DWORD_PTR)(__FILE__ ": VMR9Impl.csFilter"), &BaseFuncTable); if (FAILED(hr)) goto fail;

1 0

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

05 Apr '12

Module: wine Branch: master Commit: e4656ebc886ac7f06e7559a933a4473c95ab3910 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4656ebc886ac7f06e7559a93… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Apr 3 14:38:10 2012 -0500 quartz: Add VMRWindowlessControl9 to VMR9. --- dlls/quartz/vmr9.c | 196 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 196 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index b8b81c2..b92cc19 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -54,6 +54,7 @@ typedef struct IUnknown IUnknown_inner; IAMFilterMiscFlags IAMFilterMiscFlags_iface; IVMRFilterConfig9 IVMRFilterConfig9_iface; + IVMRWindowlessControl9 IVMRWindowlessControl9_iface; IVMRSurfaceAllocatorEx9 *allocator; IVMRImagePresenter9 *presenter; @@ -67,6 +68,9 @@ typedef struct DWORD_PTR cookie; + /* for Windowless Mode */ + HWND hWndClippingWindow; + RECT source_rect; RECT target_rect; LONG VideoWidth; @@ -108,6 +112,11 @@ static inline VMR9Impl *impl_from_IVMRFilterConfig9( IVMRFilterConfig9 *iface) return CONTAINING_RECORD(iface, VMR9Impl, IVMRFilterConfig9_iface); } +static inline VMR9Impl *impl_from_IVMRWindowlessControl9( IVMRWindowlessControl9 *iface) +{ + return CONTAINING_RECORD(iface, VMR9Impl, IVMRWindowlessControl9_iface); +} + static HRESULT WINAPI VMR9_DoRenderSample(BaseRenderer *iface, IMediaSample * pSample) { VMR9Impl *This = (VMR9Impl *)iface; @@ -448,6 +457,8 @@ static HRESULT WINAPI VMR9Inner_QueryInterface(IUnknown * iface, REFIID riid, LP *ppv = &This->IAMFilterMiscFlags_iface; else if (IsEqualIID(riid, &IID_IVMRFilterConfig9)) *ppv = &This->IVMRFilterConfig9_iface; + else if (IsEqualIID(riid, &IID_IVMRWindowlessControl9) && This->mode == VMR9Mode_Windowless) + *ppv = &This->IVMRWindowlessControl9_iface; else { HRESULT hr; @@ -913,6 +924,189 @@ static const IVMRFilterConfig9Vtbl VMR9_FilterConfig_Vtbl = VMR9FilterConfig_GetRenderingMode }; +static HRESULT WINAPI VMR9WindowlessControl_QueryInterface(IVMRWindowlessControl9 *iface, REFIID riid, LPVOID * ppv) +{ + VMR9Impl *This = impl_from_IVMRWindowlessControl9(iface); + return VMR9_QueryInterface(&This->renderer.filter.IBaseFilter_iface, riid, ppv); +} + +static ULONG WINAPI VMR9WindowlessControl_AddRef(IVMRWindowlessControl9 *iface) +{ + VMR9Impl *This = impl_from_IVMRWindowlessControl9(iface); + return VMR9_AddRef(&This->renderer.filter.IBaseFilter_iface); +} + +static ULONG WINAPI VMR9WindowlessControl_Release(IVMRWindowlessControl9 *iface) +{ + VMR9Impl *This = impl_from_IVMRWindowlessControl9(iface); + return VMR9_Release(&This->renderer.filter.IBaseFilter_iface); +} + +static HRESULT WINAPI VMR9WindowlessControl_GetNativeVideoSize(IVMRWindowlessControl9 *iface, LONG *width, LONG *height, LONG *arwidth, LONG *arheight) +{ + VMR9Impl *This = impl_from_IVMRWindowlessControl9(iface); + TRACE("(%p/%p)->(%p, %p, %p, %p)\n", iface, This, width, height, arwidth, arheight); + + if (!width || !height || !arwidth || !arheight) + { + ERR("Got no pointer\n"); + return E_POINTER; + } + + *width = This->bmiheader.biWidth; + *height = This->bmiheader.biHeight; + *arwidth = This->bmiheader.biWidth; + *arheight = This->bmiheader.biHeight; + + return S_OK; +} + +static HRESULT WINAPI VMR9WindowlessControl_GetMinIdealVideoSize(IVMRWindowlessControl9 *iface, LONG *width, LONG *height) +{ + VMR9Impl *This = impl_from_IVMRWindowlessControl9(iface); + + FIXME("(%p/%p)->(...) stub\n", iface, This); + return E_NOTIMPL; +} + +static HRESULT WINAPI VMR9WindowlessControl_GetMaxIdealVideoSize(IVMRWindowlessControl9 *iface, LONG *width, LONG *height) +{ + VMR9Impl *This = impl_from_IVMRWindowlessControl9(iface); + + FIXME("(%p/%p)->(...) stub\n", iface, This); + return E_NOTIMPL; +} + +static HRESULT WINAPI VMR9WindowlessControl_SetVideoPosition(IVMRWindowlessControl9 *iface, const RECT *source, const RECT *dest) +{ + VMR9Impl *This = impl_from_IVMRWindowlessControl9(iface); + + TRACE("(%p/%p)->(%p, %p)\n", iface, This, source, dest); + + EnterCriticalSection(&This->renderer.filter.csFilter); + + if (source) + This->source_rect = *source; + if (dest) + { + This->target_rect = *dest; + if (This->baseControlWindow.baseWindow.hWnd) + { + FIXME("Output rectangle: starting at %dx%d, up to point %dx%d\n", dest->left, dest->top, dest->right, dest->bottom); + SetWindowPos(This->baseControlWindow.baseWindow.hWnd, NULL, dest->left, dest->top, dest->right - dest->left, + dest->bottom-dest->top, SWP_NOACTIVATE|SWP_NOCOPYBITS|SWP_NOOWNERZORDER|SWP_NOREDRAW); + } + } + + LeaveCriticalSection(&This->renderer.filter.csFilter); + + return S_OK; +} + +static HRESULT WINAPI VMR9WindowlessControl_GetVideoPosition(IVMRWindowlessControl9 *iface, RECT *source, RECT *dest) +{ + VMR9Impl *This = impl_from_IVMRWindowlessControl9(iface); + + if (source) + *source = This->source_rect; + + if (dest) + *dest = This->target_rect; + + FIXME("(%p/%p)->(%p/%p) stub\n", iface, This, source, dest); + return S_OK; +} + +static HRESULT WINAPI VMR9WindowlessControl_GetAspectRatioMode(IVMRWindowlessControl9 *iface, DWORD *mode) +{ + VMR9Impl *This = impl_from_IVMRWindowlessControl9(iface); + + FIXME("(%p/%p)->(...) stub\n", iface, This); + return E_NOTIMPL; +} + +static HRESULT WINAPI VMR9WindowlessControl_SetAspectRatioMode(IVMRWindowlessControl9 *iface, DWORD mode) +{ + VMR9Impl *This = impl_from_IVMRWindowlessControl9(iface); + + FIXME("(%p/%p)->(...) stub\n", iface, This); + return E_NOTIMPL; +} + +static HRESULT WINAPI VMR9WindowlessControl_SetVideoClippingWindow(IVMRWindowlessControl9 *iface, HWND hwnd) +{ + VMR9Impl *This = impl_from_IVMRWindowlessControl9(iface); + + TRACE("(%p/%p)->(%p)\n", iface, This, hwnd); + + EnterCriticalSection(&This->renderer.filter.csFilter); + This->hWndClippingWindow = hwnd; + if (!hwnd) + IVMRSurfaceAllocatorEx9_TerminateDevice(This->allocator, This->cookie); + LeaveCriticalSection(&This->renderer.filter.csFilter); + return S_OK; +} + +static HRESULT WINAPI VMR9WindowlessControl_RepaintVideo(IVMRWindowlessControl9 *iface, HWND hwnd, HDC hdc) +{ + VMR9Impl *This = impl_from_IVMRWindowlessControl9(iface); + + FIXME("(%p/%p)->(...) stub\n", iface, This); + return E_NOTIMPL; +} + +static HRESULT WINAPI VMR9WindowlessControl_DisplayModeChanged(IVMRWindowlessControl9 *iface) +{ + VMR9Impl *This = impl_from_IVMRWindowlessControl9(iface); + + FIXME("(%p/%p)->(...) stub\n", iface, This); + return E_NOTIMPL; +} + +static HRESULT WINAPI VMR9WindowlessControl_GetCurrentImage(IVMRWindowlessControl9 *iface, BYTE **dib) +{ + VMR9Impl *This = impl_from_IVMRWindowlessControl9(iface); + + FIXME("(%p/%p)->(...) stub\n", iface, This); + return E_NOTIMPL; +} + +static HRESULT WINAPI VMR9WindowlessControl_SetBorderColor(IVMRWindowlessControl9 *iface, COLORREF color) +{ + VMR9Impl *This = impl_from_IVMRWindowlessControl9(iface); + + FIXME("(%p/%p)->(...) stub\n", iface, This); + return E_NOTIMPL; +} + +static HRESULT WINAPI VMR9WindowlessControl_GetBorderColor(IVMRWindowlessControl9 *iface, COLORREF *color) +{ + VMR9Impl *This = impl_from_IVMRWindowlessControl9(iface); + + FIXME("(%p/%p)->(...) stub\n", iface, This); + return E_NOTIMPL; +} + +static const IVMRWindowlessControl9Vtbl VMR9_WindowlessControl_Vtbl = +{ + VMR9WindowlessControl_QueryInterface, + VMR9WindowlessControl_AddRef, + VMR9WindowlessControl_Release, + VMR9WindowlessControl_GetNativeVideoSize, + VMR9WindowlessControl_GetMinIdealVideoSize, + VMR9WindowlessControl_GetMaxIdealVideoSize, + VMR9WindowlessControl_SetVideoPosition, + VMR9WindowlessControl_GetVideoPosition, + VMR9WindowlessControl_GetAspectRatioMode, + VMR9WindowlessControl_SetAspectRatioMode, + VMR9WindowlessControl_SetVideoClippingWindow, + VMR9WindowlessControl_RepaintVideo, + VMR9WindowlessControl_DisplayModeChanged, + VMR9WindowlessControl_GetCurrentImage, + VMR9WindowlessControl_SetBorderColor, + VMR9WindowlessControl_GetBorderColor +}; + HRESULT VMR9Impl_create(IUnknown * outer_unk, LPVOID * ppv) { HRESULT hr; @@ -933,7 +1127,9 @@ HRESULT VMR9Impl_create(IUnknown * outer_unk, LPVOID * ppv) pVMR9->mode = 0; pVMR9->allocator = NULL; pVMR9->presenter = NULL; + pVMR9->hWndClippingWindow = NULL; pVMR9->IVMRFilterConfig9_iface.lpVtbl = &VMR9_FilterConfig_Vtbl; + pVMR9->IVMRWindowlessControl9_iface.lpVtbl = &VMR9_WindowlessControl_Vtbl; hr = BaseRenderer_Init(&pVMR9->renderer, &VMR9_Vtbl, outer_unk, &CLSID_VideoMixingRenderer9, (DWORD_PTR)(__FILE__ ": VMR9Impl.csFilter"), &BaseFuncTable); if (FAILED(hr))

1 0

Stefan Leichter : atl80: New dll.
by Alexandre Julliard 05 Apr '12

05 Apr '12

Module: wine Branch: master Commit: 887f009df63b134b3c1eb36e17b84cf3fc33b446 URL: http://source.winehq.org/git/wine.git/?a=commit;h=887f009df63b134b3c1eb36e1… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Wed Apr 4 22:31:02 2012 +0200 atl80: New dll. --- configure | 1 + configure.ac | 1 + dlls/atl80/Makefile.in | 3 ++ dlls/atl80/atl80.spec | 56 ++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 61 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 604bd9e..c4a49ee 100755 --- a/configure +++ b/configure @@ -14898,6 +14898,7 @@ wine_fn_config_dll apphelp enable_apphelp wine_fn_config_dll appwiz.cpl enable_appwiz_cpl po wine_fn_config_dll atl enable_atl implib wine_fn_config_test dlls/atl/tests atl_test +wine_fn_config_dll atl80 enable_atl80 wine_fn_config_dll authz enable_authz wine_fn_config_dll avicap32 enable_avicap32 implib wine_fn_config_dll avifil32 enable_avifil32 implib,po diff --git a/configure.ac b/configure.ac index 6fed66c..cfa492c 100644 --- a/configure.ac +++ b/configure.ac @@ -2404,6 +2404,7 @@ WINE_CONFIG_DLL(apphelp) WINE_CONFIG_DLL(appwiz.cpl,,[po]) WINE_CONFIG_DLL(atl,,[implib]) WINE_CONFIG_TEST(dlls/atl/tests) +WINE_CONFIG_DLL(atl80) WINE_CONFIG_DLL(authz) WINE_CONFIG_DLL(avicap32,,[implib]) WINE_CONFIG_DLL(avifil32,,[implib,po]) diff --git a/dlls/atl80/Makefile.in b/dlls/atl80/Makefile.in new file mode 100644 index 0000000..d144f83 --- /dev/null +++ b/dlls/atl80/Makefile.in @@ -0,0 +1,3 @@ +MODULE = atl80.dll + +(a)MAKE_DLL_RULES@ diff --git a/dlls/atl80/atl80.spec b/dlls/atl80/atl80.spec new file mode 100644 index 0000000..d2b0cff --- /dev/null +++ b/dlls/atl80/atl80.spec @@ -0,0 +1,56 @@ +10 stdcall AtlAdvise(ptr ptr ptr ptr) atl.AtlAdvise +11 stdcall AtlUnadvise(ptr ptr long) atl.AtlUnadvise +12 stdcall AtlFreeMarshalStream(ptr) atl.AtlFreeMarshalStream +13 stdcall AtlMarshalPtrInProc(ptr ptr ptr) atl.AtlMarshalPtrInProc +14 stdcall AtlUnmarshalPtr(ptr ptr ptr) atl.AtlUnmarshalPtr +15 stdcall AtlModuleGetClassObject(ptr ptr ptr ptr) atl.AtlModuleGetClassObject +16 stdcall AtlModuleInit(ptr long long) atl.AtlModuleInit +17 stdcall AtlModuleRegisterClassObjects(ptr long long) atl.AtlModuleRegisterClassObjects +18 stdcall AtlModuleRegisterServer(ptr long ptr) atl.AtlModuleRegisterServer +19 stdcall AtlModuleRegisterTypeLib(ptr wstr) atl.AtlModuleRegisterTypeLib +20 stdcall AtlModuleRevokeClassObjects(ptr) atl.AtlModuleRevokeClassObjects +21 stdcall AtlModuleTerm(ptr) atl.AtlModuleTerm +22 stdcall AtlModuleUnregisterServer(ptr ptr) atl.AtlModuleUnregisterServer +23 stdcall AtlModuleUpdateRegistryFromResourceD(ptr wstr long ptr ptr) atl.AtlModuleUpdateRegistryFromResourceD +24 stub AtlWaitWithMessageLoop +25 stub AtlSetErrorInfo +26 stdcall AtlCreateTargetDC(long ptr) atl.AtlCreateTargetDC +27 stdcall AtlHiMetricToPixel(ptr ptr) atl.AtlHiMetricToPixel +28 stdcall AtlPixelToHiMetric(ptr ptr) atl.AtlPixelToHiMetric +29 stub AtlDevModeW2A +30 stdcall AtlComPtrAssign(ptr ptr) atl.AtlComPtrAssign +31 stdcall AtlComQIPtrAssign(ptr ptr ptr) atl.AtlComQIPtrAssign +32 stdcall AtlInternalQueryInterface(ptr ptr ptr ptr) atl.AtlInternalQueryInterface +34 stub AtlGetVersion +35 stub AtlAxDialogBoxW +36 stub AtlAxDialogBoxA +37 stdcall AtlAxCreateDialogW(long wstr long ptr long) atl.AtlAxCreateDialogW +38 stdcall AtlAxCreateDialogA(long str long ptr long) atl.AtlAxCreateDialogA +39 stdcall AtlAxCreateControl(ptr ptr ptr ptr) atl.AtlAxCreateControl +40 stdcall AtlAxCreateControlEx(ptr ptr ptr ptr ptr ptr ptr) atl.AtlAxCreateControlEx +41 stdcall AtlAxAttachControl(ptr ptr ptr) atl.AtlAxAttachControl +42 stdcall AtlAxWinInit() atl.AtlAxWinInit +43 stdcall AtlModuleAddCreateWndData(ptr ptr ptr) atl.AtlModuleAddCreateWndData +44 stdcall AtlModuleExtractCreateWndData(ptr) atl.AtlModuleExtractCreateWndData +45 stdcall AtlModuleRegisterWndClassInfoW(ptr ptr ptr) atl.AtlModuleRegisterWndClassInfoW +46 stdcall AtlModuleRegisterWndClassInfoA(ptr ptr ptr) atl.AtlModuleRegisterWndClassInfoA +47 stdcall AtlAxGetControl(long ptr) atl.AtlAxGetControl +48 stdcall AtlAxGetHost(long ptr) atl.AtlAxGetHost +49 stub AtlRegisterClassCategoriesHelper +50 stdcall AtlIPersistStreamInit_Load(ptr ptr ptr ptr) atl.AtlIPersistStreamInit_Load +51 stdcall AtlIPersistStreamInit_Save(ptr long ptr ptr ptr) atl.AtlIPersistStreamInit_Save +52 stub AtlIPersistPropertyBag_Load +53 stub AtlIPersistPropertyBag_Save +54 stub AtlGetObjectSourceInterface +55 stub AtlModuleUnRegisterTypeLib +56 stdcall AtlModuleLoadTypeLib(ptr wstr ptr ptr) atl.AtlModuleLoadTypeLib +57 stdcall AtlModuleUnregisterServerEx(ptr long ptr) atl.AtlModuleUnregisterServerEx +58 stdcall AtlModuleAddTermFunc(ptr ptr long) atl.AtlModuleAddTermFunc +59 stub AtlAxCreateControlLic +60 stub AtlAxCreateControlLicEx +61 stub AtlCreateRegistrar +62 stub AltWinModuleRegisterClassExW +63 stub AltWinModuleRegisterClassExA +64 stub AltCallTermFunc +65 stub AltWinModuleInit +66 stub AltWinModuleTerm

1 0