wine-commits December 2013

wine-commits@winehq.org

3 participants
462 discussions

Frédéric Delanoy : advapi32/tests: Constify some character strings.
by Alexandre Julliard 20 Dec '13

20 Dec '13

Module: wine Branch: master Commit: 3e9b7b5992920bb8334ca02d9d685e3efd3098b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e9b7b5992920bb8334ca02d9… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Dec 19 22:25:15 2013 +0100 advapi32/tests: Constify some character strings. --- dlls/advapi32/tests/cred.c | 4 ++-- dlls/advapi32/tests/registry.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/tests/cred.c b/dlls/advapi32/tests/cred.c index 229aaaa..59d4bbb 100644 --- a/dlls/advapi32/tests/cred.c +++ b/dlls/advapi32/tests/cred.c @@ -563,8 +563,8 @@ static void test_CredMarshalCredentialA(void) static void test_CredUnmarshalCredentialA(void) { - static WCHAR tW[] = {'t',0}; - static WCHAR testW[] = {'t','e','s','t',0}; + static const WCHAR tW[] = {'t',0}; + static const WCHAR testW[] = {'t','e','s','t',0}; CERT_CREDENTIAL_INFO *cert; USERNAME_TARGET_CREDENTIAL_INFO *username; CRED_MARSHAL_TYPE type; diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 6c3a5f0..3df1cd2 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -1665,7 +1665,7 @@ static void test_rw_order(void) { HKEY hKey; DWORD dw = 0; - static char keyname[] = "test_rw_order"; + static const char keyname[] = "test_rw_order"; char value_buf[2]; DWORD values, value_len, value_name_max_len; LSTATUS ret;

1 0

Frédéric Delanoy : widl: Constify a character string.
by Alexandre Julliard 20 Dec '13

20 Dec '13

Module: wine Branch: master Commit: 120dac41a1dea9b0929b9dddaa718953f46ceb82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=120dac41a1dea9b0929b9ddda… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Dec 19 22:25:14 2013 +0100 widl: Constify a character string. --- tools/widl/widl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index b37a0f8..b9e1412 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -400,7 +400,7 @@ void write_dlldata(const statement_list_t *stmts) dlldata = fopen(dlldata_name, "r"); if (dlldata) { - static char marker[] = "REFERENCE_PROXY_FILE"; + static const char marker[] = "REFERENCE_PROXY_FILE"; static const char delegation_define[] = "#define PROXY_DELEGATION"; char *line = NULL; size_t len = 0;

1 0

Frédéric Delanoy : winefile: Constify some character strings.
by Alexandre Julliard 20 Dec '13

20 Dec '13

Module: wine Branch: master Commit: 8d8a4c103a8a914c81bbee80c3fc3b9acdcdd684 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d8a4c103a8a914c81bbee80c… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Dec 19 22:25:12 2013 +0100 winefile: Constify some character strings. --- programs/winefile/winefile.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index d2413d1..dee98c9 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -1757,11 +1757,11 @@ static void PropDlg_DisplayValue(HWND hlbox, HWND hedit) static void CheckForFileInfo(struct PropertiesDialog* dlg, HWND hwnd, LPCWSTR strFilename) { - static WCHAR sBackSlash[] = {'\\','\0'}; - static WCHAR sTranslation[] = {'\\','V','a','r','F','i','l','e','I','n','f','o','\\','T','r','a','n','s','l','a','t','i','o','n','\0'}; - static WCHAR sStringFileInfo[] = {'\\','S','t','r','i','n','g','F','i','l','e','I','n','f','o','\\', + static const WCHAR sBackSlash[] = {'\\','\0'}; + static const WCHAR sTranslation[] = {'\\','V','a','r','F','i','l','e','I','n','f','o','\\','T','r','a','n','s','l','a','t','i','o','n','\0'}; + static const WCHAR sStringFileInfo[] = {'\\','S','t','r','i','n','g','F','i','l','e','I','n','f','o','\\', '%','0','4','x','%','0','4','x','\\','%','s','\0'}; - static WCHAR sFmt[] = {'%','d','.','%','d','.','%','d','.','%','d','\0'}; + static const WCHAR sFmt[] = {'%','d','.','%','d','.','%','d','.','%','d','\0'}; DWORD dwVersionDataLen = GetFileVersionInfoSizeW(strFilename, NULL); if (dwVersionDataLen) {

1 0

Frédéric Delanoy : winetest: Constify a character string.
by Alexandre Julliard 20 Dec '13

20 Dec '13

Module: wine Branch: master Commit: a2473d2985226ed5205ac3d2c11334d95d1bc132 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2473d2985226ed5205ac3d2c… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Dec 19 22:25:13 2013 +0100 winetest: Constify a character string. --- programs/winetest/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 92a504e..cde618f 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -121,7 +121,7 @@ static char * get_file_version(char * file_name) char * data = heap_alloc(size); if (data) { if (GetFileVersionInfoA(file_name, handle, size, data)) { - static char backslash[] = "\\"; + static const char backslash[] = "\\"; VS_FIXEDFILEINFO *pFixedVersionInfo; UINT len; if (VerQueryValueA(data, backslash, (LPVOID *)&pFixedVersionInfo, &len)) {

1 0

Frédéric Delanoy : winedbg: Constify some character strings.
by Alexandre Julliard 20 Dec '13

20 Dec '13

Module: wine Branch: master Commit: 5730f6cf9896b4fa8e94c8dd6895d75e2e72848e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5730f6cf9896b4fa8e94c8dd6… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Dec 19 22:25:11 2013 +0100 winedbg: Constify some character strings. --- programs/winedbg/tgt_active.c | 4 ++-- programs/winedbg/tgt_minidump.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index baf47e9..8cfce32 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -286,8 +286,8 @@ static BOOL tgt_process_active_close_process(struct dbg_process* pcs, BOOL kill) static void fetch_module_name(void* name_addr, BOOL unicode, void* mod_addr, WCHAR* buffer, size_t bufsz, BOOL is_pcs) { - static WCHAR pcspid[] = {'P','r','o','c','e','s','s','_','%','0','8','x',0}; - static WCHAR dlladdr[] = {'D','L','L','_','%','0','8','l','x',0}; + static const WCHAR pcspid[] = {'P','r','o','c','e','s','s','_','%','0','8','x',0}; + static const WCHAR dlladdr[] = {'D','L','L','_','%','0','8','l','x',0}; memory_get_string_indirect(dbg_curr_process, name_addr, unicode, buffer, bufsz); if (!buffer[0] && diff --git a/programs/winedbg/tgt_minidump.c b/programs/winedbg/tgt_minidump.c index 4b12576..e3a823a 100644 --- a/programs/winedbg/tgt_minidump.c +++ b/programs/winedbg/tgt_minidump.c @@ -199,7 +199,7 @@ static enum dbg_start minidump_do_reload(struct tgt_process_minidump_data* data) WCHAR exec_name[1024]; WCHAR nameW[1024]; unsigned len; - static WCHAR default_exec_name[] = {'<','m','i','n','i','d','u','m','p','-','e','x','e','c','>',0}; + static const WCHAR default_exec_name[] = {'<','m','i','n','i','d','u','m','p','-','e','x','e','c','>',0}; /* fetch PID */ if (MiniDumpReadDumpStream(data->mapping, MiscInfoStream, NULL, &stream, NULL))

1 0

Frédéric Delanoy : start: Constify a character string.
by Alexandre Julliard 20 Dec '13

20 Dec '13

Module: wine Branch: master Commit: a478c108e2f1ff8cb76670af885a825fc0e92378 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a478c108e2f1ff8cb76670af8… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Dec 19 22:25:10 2013 +0100 start: Constify a character string. --- programs/start/start.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/start/start.c b/programs/start/start.c index f1cb26a..a27aad7 100644 --- a/programs/start/start.c +++ b/programs/start/start.c @@ -374,7 +374,7 @@ int wmain (int argc, WCHAR *argv[]) WCHAR *commandline; STARTUPINFOW startup_info; PROCESS_INFORMATION process_information; - static WCHAR commandlineformat[] = {'"','%','s','"','%','s',0}; + static const WCHAR commandlineformat[] = {'"','%','s','"','%','s',0}; /* explorer on windows always quotes the filename when running a binary on windows (see bug 5224) so we have to use CreateProcessW in this case */

1 0

Scott Ritchie : Update-Ubuntu-download-page-for-newer-versions
by Jeremy Newman 19 Dec '13

19 Dec '13

Module: website Branch: master Commit: b39d38a9ef4f0d2583201fcb616185a057cd0a1e URL: http://source.winehq.org/git/website.git/?a=commit;h=b39d38a9ef4f0d2583201f… Author: Scott Ritchie <scottritchie(a)ubuntu.com> Date: Wed Dec 18 17:12:44 2013 -0800 Update-Ubuntu-download-page-for-newer-versions --- templates/en/download.template | 2 +- templates/en/download/ubuntu.template | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/templates/en/download.template b/templates/en/download.template index cfdf1bb..ec1f7fa 100644 --- a/templates/en/download.template +++ b/templates/en/download.template @@ -61,7 +61,7 @@ requested in exchange for hosting the Wine web site. <img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu linux" border="0"></a> </td> <td> <a href="{$root}/download/ubuntu">Download Ubuntu packages</a> - - binary and source .debs for Ubuntu Precise (12.04), Quantal (12.10), and Raring (13.04) + - binary and source .debs for Ubuntu Precise (12.04), Quantal (12.10), Raring (13.04), and Saucy (13.10) <td><a href="mailto:scottritchie@ubuntu.com">Scott Ritchie</a></td> </tr> diff --git a/templates/en/download/ubuntu.template b/templates/en/download/ubuntu.template index 2a02c90..caee2fd 100644 --- a/templates/en/download/ubuntu.template +++ b/templates/en/download/ubuntu.template @@ -25,25 +25,25 @@ Software tab and click Add. <h2>Warning: Beta packages</h2> -The 1.5 packages here are beta packages. This means they will +The 1.7 packages here are beta packages. This means they will periodically suffer from <a href="http://wiki.winehq.org/Regression">regressions</a>, and as a result an -update may break functionality in Wine. If the stable 1.4 Wine version works +update may break functionality in Wine. If the stable 1.6 Wine version works for you, then you may not want to use these beta packages. <h2>Installing Wine:</h2> Once you have added the WineHQ PPA Repository, you are ready to install. -To get the most recent Wine 1.5 beta, -<a href="apt://wine1.5">click this link to install the wine1.5 package</a>. -To install the older, stable Wine 1.4 version, -<a href="apt://wine1.4">click this link to install the wine1.4 package</a>. +To get the most recent Wine 1.7 beta, +<a href="apt://wine1.7">click this link to install the wine1.7 package</a>. +To install the older, stable Wine 1.6 version, +<a href="apt://wine1.6">click this link to install the wine1.6 package</a>. <h2>Upgrading to a new version of Ubuntu</h2> -If you are upgrading the entire system, such as going from Ubuntu 11.10 to -12.04, you will need to come back to this page and add the repository again. +If you are upgrading the entire system, such as going from Ubuntu 13.10 to +14.04, you will need to come back to this page and add the repository again. The built in update manager will not switch the Wine repository automatically. @@ -56,6 +56,6 @@ may be useful on Kubuntu, Xubuntu, and other Ubuntu derivatives. Then update APT package information by running 'sudo apt-get update'. You can now install Wine by typing 'sudo apt-get -install wine1.5'. +install wine1.7'. If you'd like to browse the PPA manually, you can <a href="https://launchpad.net/~ubuntu-wine/+archive/ppa">visit its Launchpad page</a>.

1 0

Detlef Riekenberg : tools: make_authors is no longer used.
by Alexandre Julliard 19 Dec '13

19 Dec '13

Module: wine Branch: master Commit: b87b9f04d7b07be6d5715c58ace47b699c5ac30d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b87b9f04d7b07be6d5715c58a… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Dec 19 16:39:44 2013 +0100 tools: make_authors is no longer used. --- tools/make_authors | 51 --------------------------------------------------- 1 files changed, 0 insertions(+), 51 deletions(-) diff --git a/tools/make_authors b/tools/make_authors deleted file mode 100755 index eeaba02..0000000 --- a/tools/make_authors +++ /dev/null @@ -1,51 +0,0 @@ -#! /usr/bin/perl -w -# -# Generate AUTHORS -# -# Copyright 1998 Alexandre Julliard -# -# 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 -# -use strict; - -my @authors; -open(AUTHORS,"<AUTHORS") or die "Can't open AUTHORS"; -open(NEWAUTHORS,">AUTHORS.new") or die "Can't open AUTHORS.new"; -while(<AUTHORS>) - { - print NEWAUTHORS; - last if /^$/; - } -while(<AUTHORS>) - { - chop; - push @authors, $_; - } - -# Sort them -sub cmpnames() - { - my @anames = split(" ",$a); - my @bnames = split(" ",$b); - my $ret; - $ret = $anames[-1] cmp $bnames[-1]; - $ret = $anames[0] cmp $bnames[0] unless $ret; - return $ret; - } -@authors = sort cmpnames @authors; - -# Print authors -print NEWAUTHORS (join "\n", @authors) . "\n"; -print "Created AUTHORS.new\n";

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 19 Dec '13

19 Dec '13

Module: wine Branch: master Commit: a6e621cc4630dd9a47115f9fff4b2e6f2c6fa540 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6e621cc4630dd9a47115f9ff… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Dec 19 17:14:20 2013 +0200 po: Update Finnish translation. --- po/fi.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/fi.po b/po/fi.po index 853e257..709f557 100644 --- a/po/fi.po +++ b/po/fi.po @@ -10056,7 +10056,7 @@ msgstr "Winen komentokehote" #: cmd.rc:351 msgid "Microsoft Windows %1!S!\n" -msgstr "" +msgstr "Microsoft Windows %1!S!\n" #: cmd.rc:352 msgid "More? "

1 0

Jacek Caban : qcap: Added CLSID_AVICo stub implementation.
by Alexandre Julliard 19 Dec '13

19 Dec '13

Module: wine Branch: master Commit: 99c96b0f0154a220abd38da0c51e0268b1467017 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99c96b0f0154a220abd38da0c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 19 15:31:52 2013 +0100 qcap: Added CLSID_AVICo stub implementation. --- dlls/qcap/Makefile.in | 1 + dlls/qcap/avico.c | 184 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/qcap/qcap_main.c | 2 +- dlls/qcap/qcap_main.h | 16 ++++ dlls/qcap/tests/qcap.c | 17 +++++ 5 files changed, 219 insertions(+), 1 deletions(-) diff --git a/dlls/qcap/Makefile.in b/dlls/qcap/Makefile.in index ebb432d..41871e3 100644 --- a/dlls/qcap/Makefile.in +++ b/dlls/qcap/Makefile.in @@ -2,6 +2,7 @@ MODULE = qcap.dll IMPORTS = strmiids strmbase uuid ole32 gdi32 advapi32 C_SRCS = \ + avico.c \ avimux.c \ capturegraph.c \ enummedia.c \ diff --git a/dlls/qcap/avico.c b/dlls/qcap/avico.c new file mode 100644 index 0000000..a24a1c3 --- /dev/null +++ b/dlls/qcap/avico.c @@ -0,0 +1,184 @@ +/* + * Copyright 2013 Jacek Caban for CodeWeavers + * + * 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 <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "dshow.h" + +#include "qcap_main.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(qcap); + +typedef struct { + BaseFilter filter; +} AVICompressor; + +static inline AVICompressor *impl_from_BaseFilter(BaseFilter *filter) +{ + return CONTAINING_RECORD(filter, AVICompressor, filter); +} + +static inline AVICompressor *impl_from_IBaseFilter(IBaseFilter *iface) +{ + BaseFilter *filter = CONTAINING_RECORD(iface, BaseFilter, IBaseFilter_iface); + return impl_from_BaseFilter(filter); +} + +static HRESULT WINAPI AVICompressor_QueryInterface(IBaseFilter *iface, REFIID riid, void **ppv) +{ + AVICompressor *This = impl_from_IBaseFilter(iface); + + if(IsEqualIID(riid, &IID_IUnknown)) { + TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); + *ppv = &This->filter.IBaseFilter_iface; + }else if(IsEqualIID(riid, &IID_IPersist)) { + TRACE("(%p)->(IID_IPersist %p)\n", This, ppv); + *ppv = &This->filter.IBaseFilter_iface; + }else if(IsEqualIID(riid, &IID_IMediaFilter)) { + TRACE("(%p)->(IID_IMediaFilter %p)\n", This, ppv); + *ppv = &This->filter.IBaseFilter_iface; + }else if(IsEqualIID(riid, &IID_IBaseFilter)) { + TRACE("(%p)->(IID_IBaseFilter %p)\n", This, ppv); + *ppv = &This->filter.IBaseFilter_iface; + }else { + FIXME("no interface for %s\n", debugstr_guid(riid)); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; + +} + +static ULONG WINAPI AVICompressor_Release(IBaseFilter *iface) +{ + AVICompressor *This = impl_from_IBaseFilter(iface); + ULONG ref = BaseFilterImpl_Release(&This->filter.IBaseFilter_iface); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) + heap_free(This); + + return ref; +} + +static HRESULT WINAPI AVICompressor_Stop(IBaseFilter *iface) +{ + AVICompressor *This = impl_from_IBaseFilter(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI AVICompressor_Pause(IBaseFilter *iface) +{ + AVICompressor *This = impl_from_IBaseFilter(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI AVICompressor_Run(IBaseFilter *iface, REFERENCE_TIME tStart) +{ + AVICompressor *This = impl_from_IBaseFilter(iface); + FIXME("(%p)->(%s)\n", This, wine_dbgstr_longlong(tStart)); + return E_NOTIMPL; +} + +static HRESULT WINAPI AVICompressor_FindPin(IBaseFilter *iface, LPCWSTR Id, IPin **ppPin) +{ + AVICompressor *This = impl_from_IBaseFilter(iface); + FIXME("(%p)->(%s %p)\n", This, debugstr_w(Id), ppPin); + return VFW_E_NOT_FOUND; +} + +static HRESULT WINAPI AVICompressor_QueryFilterInfo(IBaseFilter *iface, FILTER_INFO *pInfo) +{ + AVICompressor *This = impl_from_IBaseFilter(iface); + FIXME("(%p)->(%p)\n", This, pInfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI AVICompressor_QueryVendorInfo(IBaseFilter *iface, LPWSTR *pVendorInfo) +{ + AVICompressor *This = impl_from_IBaseFilter(iface); + FIXME("(%p)->(%p)\n", This, pVendorInfo); + return E_NOTIMPL; +} + +static const IBaseFilterVtbl AVICompressorVtbl = { + AVICompressor_QueryInterface, + BaseFilterImpl_AddRef, + AVICompressor_Release, + BaseFilterImpl_GetClassID, + AVICompressor_Stop, + AVICompressor_Pause, + AVICompressor_Run, + BaseFilterImpl_GetState, + BaseFilterImpl_SetSyncSource, + BaseFilterImpl_GetSyncSource, + BaseFilterImpl_EnumPins, + AVICompressor_FindPin, + AVICompressor_QueryFilterInfo, + BaseFilterImpl_JoinFilterGraph, + AVICompressor_QueryVendorInfo +}; + +static IPin* WINAPI AVICompressor_GetPin(BaseFilter *iface, int pos) +{ + AVICompressor *This = impl_from_BaseFilter(iface); + FIXME("(%p)->(%d)\n", This, pos); + return NULL; +} + +static LONG WINAPI AVICompressor_GetPinCount(BaseFilter *iface) +{ + AVICompressor *This = impl_from_BaseFilter(iface); + FIXME("(%p)\n", This); + return 0; +} + +static const BaseFilterFuncTable filter_func_table = { + AVICompressor_GetPin, + AVICompressor_GetPinCount +}; + +IUnknown* WINAPI QCAP_createAVICompressor(IUnknown *outer, HRESULT *phr) +{ + AVICompressor *compressor; + + TRACE("\n"); + + compressor = heap_alloc_zero(sizeof(*compressor)); + if(!compressor) { + *phr = E_NOINTERFACE; + return NULL; + } + + BaseFilter_Init(&compressor->filter, &AVICompressorVtbl, &CLSID_AVICo, + (DWORD_PTR)(__FILE__ ": AVICompressor.csFilter"), &filter_func_table); + + *phr = S_OK; + return (IUnknown*)&compressor->filter.IBaseFilter_iface; +} diff --git a/dlls/qcap/qcap_main.c b/dlls/qcap/qcap_main.c index e0cd43d..0f9ed14 100644 --- a/dlls/qcap/qcap_main.c +++ b/dlls/qcap/qcap_main.c @@ -84,7 +84,7 @@ FactoryTemplate const g_Templates[] = { },{ wAVICompressor, &CLSID_AVICo, - NULL, /* FIXME: Implement QCAP_createAVICompressor */ + QCAP_createAVICompressor, NULL },{ wVFWCaptFilter, diff --git a/dlls/qcap/qcap_main.h b/dlls/qcap/qcap_main.h index 15449a3..f4684c1 100644 --- a/dlls/qcap/qcap_main.h +++ b/dlls/qcap/qcap_main.h @@ -28,6 +28,7 @@ extern IUnknown * WINAPI QCAP_createAudioCaptureFilter(IUnknown *pUnkOuter, HRES extern IUnknown * WINAPI QCAP_createAVICompressor(IUnknown *pUnkOuter, HRESULT *phr) DECLSPEC_HIDDEN; extern IUnknown * WINAPI QCAP_createVFWCaptureFilter(IUnknown *pUnkOuter, HRESULT *phr) DECLSPEC_HIDDEN; extern IUnknown * WINAPI QCAP_createVFWCaptureFilterPropertyPage(IUnknown *pUnkOuter, HRESULT *phr) DECLSPEC_HIDDEN; +extern IUnknown * WINAPI QCAP_createAVICompressor(IUnknown*,HRESULT*) DECLSPEC_HIDDEN; extern IUnknown * WINAPI QCAP_createAVIMux(IUnknown *pUnkOuter, HRESULT *phr) DECLSPEC_HIDDEN; extern IUnknown * WINAPI QCAP_createAVIMuxPropertyPage(IUnknown *pUnkOuter, HRESULT *phr) DECLSPEC_HIDDEN; extern IUnknown * WINAPI QCAP_createAVIMuxPropertyPage1(IUnknown *pUnkOuter, HRESULT *phr) DECLSPEC_HIDDEN; @@ -58,4 +59,19 @@ enum YUV_Format { void YUV_Init(void) DECLSPEC_HIDDEN; void YUV_To_RGB24(enum YUV_Format format, unsigned char *target, const unsigned char *source, int width, int height) DECLSPEC_HIDDEN; +static inline void * __WINE_ALLOC_SIZE(1) heap_alloc(size_t len) +{ + return HeapAlloc(GetProcessHeap(), 0, len); +} + +static inline void * __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t len) +{ + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); +} + +static inline BOOL heap_free(void *mem) +{ + return HeapFree(GetProcessHeap(), 0, mem); +} + #endif /* _QCAP_MAIN_H_DEFINED */ diff --git a/dlls/qcap/tests/qcap.c b/dlls/qcap/tests/qcap.c index 86beda7..014a763 100644 --- a/dlls/qcap/tests/qcap.c +++ b/dlls/qcap/tests/qcap.c @@ -1333,6 +1333,21 @@ static void test_AviMux(void) IBaseFilter_Release(avimux); } +static void test_AviCo(void) +{ + IBaseFilter *avico; + HRESULT hres; + + hres = CoCreateInstance(&CLSID_AVICo, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (void**)&avico); + if(hres == REGDB_E_CLASSNOTREG) { + win_skip("CLSID_AVICo not restered\n"); + return; + } + ok(hres == S_OK, "Could not create CLSID_AVICo class: %08x\n", hres); + + IBaseFilter_Release(avico); +} + START_TEST(qcap) { if (SUCCEEDED(CoInitialize(NULL))) @@ -1341,6 +1356,8 @@ START_TEST(qcap) test_CaptureGraphBuilder_RenderStream(); test_AviMux_QueryInterface(); test_AviMux(); + test_AviCo(); + CoUninitialize(); } else

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
47
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 December 2013