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

Nikolay Sivov : wshom: Implement WindowStyle property for IWshShortcut.
by Alexandre Julliard 02 Jul '12

02 Jul '12

Module: wine Branch: master Commit: 7dc48d2787a3c74e043f75c32cb994a658f3029d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7dc48d2787a3c74e043f75c32… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jul 1 19:37:19 2012 +0400 wshom: Implement WindowStyle property for IWshShortcut. --- dlls/wshom.ocx/shell.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index 204f91d..1973e2d 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -469,15 +469,15 @@ static HRESULT WINAPI WshShortcut_put_TargetPath(IWshShortcut *iface, BSTR Path) static HRESULT WINAPI WshShortcut_get_WindowStyle(IWshShortcut *iface, int *ShowCmd) { WshShortcut *This = impl_from_IWshShortcut(iface); - FIXME("(%p)->(%p): stub\n", This, ShowCmd); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, ShowCmd); + return IShellLinkW_GetShowCmd(This->link, ShowCmd); } static HRESULT WINAPI WshShortcut_put_WindowStyle(IWshShortcut *iface, int ShowCmd) { WshShortcut *This = impl_from_IWshShortcut(iface); - FIXME("(%p)->(%d): stub\n", This, ShowCmd); - return E_NOTIMPL; + TRACE("(%p)->(%d)\n", This, ShowCmd); + return IShellLinkW_SetShowCmd(This->link, ShowCmd); } static HRESULT WINAPI WshShortcut_get_WorkingDirectory(IWshShortcut *iface, BSTR *WorkingDirectory)

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard 02 Jul '12

02 Jul '12

Module: wine Branch: master Commit: e67f6c23641ac302ad75cec18f33ba23add40d03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e67f6c23641ac302ad75cec18… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Jul 2 09:26:58 2012 +0200 po: Update French translation. --- po/fr.po | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/po/fr.po b/po/fr.po index 77beb6e..7d6ccd7 100644 --- a/po/fr.po +++ b/po/fr.po @@ -9751,6 +9751,36 @@ msgid "" "/ProgIDOpen Open a document using the specified progID.\n" "/? Display this help and exit.\n" msgstr "" +"Lance un programme, ou ouvre un document avec le programme normalement " +"associé à cette extension.\n" +"Usage :\n" +"start [options] fichier_programme [...]\n" +"start [options] fichier_document\n" +"\n" +"Options :\n" +"\"titre\" Spécifie le titre des fenêtres filles.\n" +"/d répertoire Lancer le programme depuis le répertoire spécifié.\n" +"/b Ne pas créer de nouvelle console pour le programme.\n" +"/i Lancer le programme avec des nouvelles variables " +"d'environnement.\n" +"/min Lancer le programme minimisé.\n" +"/max Lancer le programme maximisé.\n" +"/low Lancer le programme dans la classe de priorité inactif.\n" +"/normal Lancer le programme dans la classe de priorité normal.\n" +"/high Lancer le programme dans la classe de priorité haut.\n" +"/realtime Lancer le programme dans la classe de priorité temps réel.\n" +"/abovenormal Lancer le programme dans la classe de priorité supérieur à la " +"normale.\n" +"/belownormal Lancer le programme dans la classe de priorité inférieur à la " +"normale.\n" +"/node n Lancer le programme sur le nœud NUMA spécifié.\n" +"/affinity masque Lancer le programme avec le masque d'affinité spécifié.\n" +"/wait Attendre que le programme lancé se termine, puis renvoyer son " +"code de sortie.\n" +"/unix Utiliser un chemin Unix et lancer le fichier comme windows " +"explorer.\n" +"/ProgIDOpen Ouvrir un document via le programme identifié par progID.\n" +"/? Afficher cette aide et se terminer.\n" #: cmd.rc:211 msgid "TIME sets or shows the current system time.\n"

1 0

Alexandre Julliard : windowscodecs: Don't fail if the TIFF library doesn' t have the functions to disable warnings.
by Alexandre Julliard 02 Jul '12

02 Jul '12

Module: wine Branch: master Commit: 0c6ac865bd344e90f4daadc1a2ea29b73aff1e00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c6ac865bd344e90f4daadc1a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 2 11:19:18 2012 +0200 windowscodecs: Don't fail if the TIFF library doesn't have the functions to disable warnings. --- dlls/windowscodecs/tiffformat.c | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 64e23de..232aa44 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -67,8 +67,6 @@ MAKE_FUNCPTR(TIFFReadEncodedStrip); MAKE_FUNCPTR(TIFFReadEncodedTile); MAKE_FUNCPTR(TIFFSetDirectory); MAKE_FUNCPTR(TIFFSetField); -MAKE_FUNCPTR(TIFFSetWarningHandler); -MAKE_FUNCPTR(TIFFSetWarningHandlerExt); MAKE_FUNCPTR(TIFFWriteDirectory); MAKE_FUNCPTR(TIFFWriteScanline); #undef MAKE_FUNCPTR @@ -82,6 +80,8 @@ static void *load_libtiff(void) if (!libtiff_handle && (libtiff_handle = wine_dlopen(SONAME_LIBTIFF, RTLD_NOW, NULL, 0)) != NULL) { + void * (*pTIFFSetWarningHandler)(void *); + void * (*pTIFFSetWarningHandlerExt)(void *); #define LOAD_FUNCPTR(f) \ if((p##f = wine_dlsym(libtiff_handle, #f, NULL, 0)) == NULL) { \ @@ -101,19 +101,18 @@ static void *load_libtiff(void) LOAD_FUNCPTR(TIFFReadEncodedTile); LOAD_FUNCPTR(TIFFSetDirectory); LOAD_FUNCPTR(TIFFSetField); - LOAD_FUNCPTR(TIFFSetWarningHandler); - LOAD_FUNCPTR(TIFFSetWarningHandlerExt); LOAD_FUNCPTR(TIFFWriteDirectory); LOAD_FUNCPTR(TIFFWriteScanline); #undef LOAD_FUNCPTR + if ((pTIFFSetWarningHandler = wine_dlsym(libtiff_handle, "TIFFSetWarningHandler", NULL, 0))) + pTIFFSetWarningHandler(NULL); + if ((pTIFFSetWarningHandlerExt = wine_dlsym(libtiff_handle, "TIFFSetWarningHandlerExt", NULL, 0))) + pTIFFSetWarningHandlerExt(NULL); } result = libtiff_handle; - pTIFFSetWarningHandler(NULL); - pTIFFSetWarningHandlerExt(NULL); - LeaveCriticalSection(&init_tiff_cs); return result; }

1 0

Marek Chmiel : dssenh: Added CryptAcquireContext test for the DSSENH cryptographic service provider .
by Alexandre Julliard 02 Jul '12

02 Jul '12

Module: wine Branch: master Commit: 4961caa83654c1b6e0171e055f34e53d3bfc05f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4961caa83654c1b6e0171e055… Author: Marek Chmiel <kcmark(a)gmail.com> Date: Fri Jun 1 22:38:03 2012 -0500 dssenh: Added CryptAcquireContext test for the DSSENH cryptographic service provider. --- configure | 1 + configure.ac | 1 + dlls/dssenh/tests/Makefile.in | 7 ++ dlls/dssenh/tests/dssenh.c | 185 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 194 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 2a26441..28999e9 100755 --- a/configure +++ b/configure @@ -15190,6 +15190,7 @@ wine_fn_config_dll drmclien enable_drmclien wine_fn_config_dll dsound enable_dsound implib wine_fn_config_test dlls/dsound/tests dsound_test wine_fn_config_dll dssenh enable_dssenh +wine_fn_config_test dlls/dssenh/tests dssenh_test wine_fn_config_dll dswave enable_dswave wine_fn_config_dll dwmapi enable_dwmapi implib wine_fn_config_dll dxdiagn enable_dxdiagn po diff --git a/configure.ac b/configure.ac index 70e7663..a85459d 100644 --- a/configure.ac +++ b/configure.ac @@ -2606,6 +2606,7 @@ WINE_CONFIG_DLL(drmclien) WINE_CONFIG_DLL(dsound,,[implib]) WINE_CONFIG_TEST(dlls/dsound/tests) WINE_CONFIG_DLL(dssenh) +WINE_CONFIG_TEST(dlls/dssenh/tests) WINE_CONFIG_DLL(dswave) WINE_CONFIG_DLL(dwmapi,,[implib]) WINE_CONFIG_DLL(dxdiagn,,[po]) diff --git a/dlls/dssenh/tests/Makefile.in b/dlls/dssenh/tests/Makefile.in new file mode 100644 index 0000000..8150cbf --- /dev/null +++ b/dlls/dssenh/tests/Makefile.in @@ -0,0 +1,7 @@ +TESTDLL = dssenh.dll +IMPORTS = advapi32 + +C_SRCS = \ + dssenh.c + +(a)MAKE_TEST_RULES@ diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c new file mode 100644 index 0000000..b77dd23 --- /dev/null +++ b/dlls/dssenh/tests/dssenh.c @@ -0,0 +1,185 @@ +/* + * Unit tests for dss functions + * + * Copyright (c) 2012 Marek Kamil Chmiel + * + * 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 <string.h> +#include <stdio.h> +#include "wine/test.h" +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "wincrypt.h" + +static void test_acquire_context(void) +{ /* failure tests common between all four CSP providers */ + + HCRYPTPROV hProv = 0; + BOOL result; + + /* cannot acquire provider with 0 as Prov Type and NULL as CSP name */ + SetLastError(0xdeadbeef); + result = CryptAcquireContextA(&hProv, NULL, NULL, 0, 0); + ok(!result && GetLastError() == NTE_BAD_PROV_TYPE, + "Expected NTE_BAD_PROV_TYPE, got %08x\n", GetLastError()); + + SetLastError(0xdeadbeef); + result = CryptAcquireContextA(&hProv, NULL, NULL, 0, CRYPT_VERIFYCONTEXT); + ok(!result && GetLastError() == NTE_BAD_PROV_TYPE, + "Expected NTE_BAD_PROV_TYPE, got %08x\n", GetLastError()); + + /* flag allows us to delete a keyset, but not of an unknown provider */ + SetLastError(0xdeadbeef); + result = CryptAcquireContextA(&hProv, NULL, NULL, 0, CRYPT_DELETEKEYSET); + ok(!result && GetLastError() == NTE_BAD_PROV_TYPE, + "Expected NTE_BAD_PROV_TYPE, got %08x\n", GetLastError()); + + /* cannot acquire along with PROV_RSA_SIG, not compatible */ + SetLastError(0xdeadbeef); + result = CryptAcquireContextA(&hProv, NULL, MS_DEF_DSS_PROV_A, PROV_RSA_SIG, 0); + todo_wine + ok(!result && GetLastError() == NTE_PROV_TYPE_NO_MATCH, + "Expected NTE_PROV_TYPE_NO_MATCH, got %08x\n", GetLastError()); + + /* cannot acquire along with MS_DEF_RSA_SIG_PROV, not compatible */ + SetLastError(0xdeadbeef); + result = CryptAcquireContextA(&hProv, NULL, MS_DEF_RSA_SIG_PROV, PROV_DSS, 0); + ok(!result && GetLastError() == NTE_KEYSET_NOT_DEF, + "Expected NTE_KEYSET_NOT_DEF, got %08x\n", GetLastError()); + + /* cannot acquire provider with 0 as Prov Type */ + SetLastError(0xdeadbeef); + result = CryptAcquireContextA(&hProv, NULL, MS_DEF_DSS_PROV_A, 0, 0); + ok(!result && GetLastError() == NTE_BAD_PROV_TYPE, + "Expected NTE_BAD_PROV_TYPE, got %08x\n", GetLastError()); + + /* test base DSS provider (PROV_DSS) */ + + result = CryptAcquireContextA( + &hProv, NULL, MS_DEF_DSS_PROV_A, PROV_DSS, CRYPT_VERIFYCONTEXT); + if(!result) + { + skip("DSS csp is currently not available, skipping tests."); + return; + } + ok(result, "Expected no errors.\n"); + + result = CryptReleaseContext(hProv, 0); + ok(result, "Expected release of the provider.\n"); + + result = CryptAcquireContextA( + &hProv, NULL, MS_DEF_DSS_DH_PROV_A, PROV_DSS_DH, CRYPT_NEWKEYSET); + ok(result, "Expected no errors.\n"); + + result = CryptReleaseContext(hProv, 0); + ok(result, "Expected release of the provider.\n"); + + result = CryptAcquireContextA(&hProv, NULL, NULL, PROV_DSS, 0); + ok(result, "Expected no errors.\n"); + + result = CryptReleaseContext(hProv, 0); + ok(result, "Expected release of the provider.\n"); + + result = CryptAcquireContextA(&hProv, NULL, MS_DEF_DSS_PROV_A, PROV_DSS, 0); + ok(result, "Expected no errors.\n"); + + /* test DSS Diffie Hellman provider (PROV_DSS_DH) */ + + result = CryptAcquireContextA( + &hProv, NULL, MS_DEF_DSS_DH_PROV, PROV_DSS_DH, CRYPT_VERIFYCONTEXT); + ok(result, "Expected no errors.\n"); + + result = CryptReleaseContext(hProv, 0); + ok(result, "Expected release of the provider.\n"); + + result = CryptAcquireContextA(&hProv, NULL, NULL, PROV_DSS_DH, 0); + ok(result, "Expected no errors.\n"); + + result = CryptReleaseContext(hProv, 0); + ok(result, "Expected release of the provider.\n"); + + result = CryptAcquireContextA(&hProv, NULL, MS_DEF_DSS_DH_PROV, PROV_DSS_DH, 0); + ok(result, "Expected no errors.\n"); + + /* test DSS Enhanced provider (MS_ENH_DSS_DH_PROV) */ + + SetLastError(0xdeadbeef); + result = CryptAcquireContextA( + &hProv, NULL, MS_ENH_DSS_DH_PROV, PROV_DSS_DH, CRYPT_VERIFYCONTEXT); + if(!result && GetLastError() == NTE_KEYSET_NOT_DEF) + { + win_skip("DSSENH and Schannel provider is broken on WinNT4\n"); + return; + } + ok(result, "Expected no errors.\n"); + + result = CryptReleaseContext(hProv, 0); + ok(result, "Expected release of the provider.\n"); + + result = CryptAcquireContextA(&hProv, NULL, MS_ENH_DSS_DH_PROV, PROV_DSS_DH, 0); + ok(result, "Expected no errors.\n"); + + result = CryptReleaseContext(hProv, 0); + ok(result, "Expected release of the provider.\n"); + + /* test DSS Schannel provider (PROV_DH_SCHANNEL) */ + + result = CryptAcquireContextA( + &hProv, NULL, MS_DEF_DH_SCHANNEL_PROV, PROV_DH_SCHANNEL, CRYPT_VERIFYCONTEXT); + ok(result, "Expected no errors.\n"); + + result = CryptReleaseContext(hProv, 0); + ok(result, "Expected release of the provider.\n"); + + result = CryptAcquireContextA(&hProv, NULL, NULL, PROV_DH_SCHANNEL, 0); + ok(result, "Expected no errors.\n"); + + result = CryptReleaseContext(hProv, 0); + ok(result, "Expected release of the provider.\n"); + + result = CryptAcquireContextA( + &hProv, NULL, MS_DEF_DH_SCHANNEL_PROV, PROV_DH_SCHANNEL, 0); + ok(result, "Expected no errors.\n"); + + result = CryptReleaseContext(hProv, 0); + ok(result, "Expected release of the provider.\n"); + + /* failure tests, cannot acquire context because the key container already exists */ + SetLastError(0xdeadbeef); + result = CryptAcquireContextA( + &hProv, NULL, MS_DEF_DSS_DH_PROV, PROV_DSS_DH, CRYPT_NEWKEYSET); + ok(!result && GetLastError() == NTE_EXISTS, + "Expected NTE_EXISTS, got %08x\n", GetLastError()); + + SetLastError(0xdeadbeef); + result = CryptAcquireContextA( + &hProv, NULL, MS_ENH_DSS_DH_PROV, PROV_DSS_DH, CRYPT_NEWKEYSET); + ok(!result && GetLastError() == NTE_EXISTS, + "Expected NTE_EXISTS, got %08x\n", GetLastError()); + + SetLastError(0xdeadbeef); + result = CryptAcquireContextA( + &hProv, NULL, MS_DEF_DH_SCHANNEL_PROV, PROV_DH_SCHANNEL, CRYPT_NEWKEYSET); + ok(!result && GetLastError() == NTE_EXISTS, + "Expected NTE_EXISTS, got %08x\n", GetLastError()); +} + +START_TEST(dssenh) +{ + test_acquire_context(); +}

1 0

Michael Stefaniuc : qedit: Support COM aggregation for MediaDet.
by Alexandre Julliard 02 Jul '12

02 Jul '12

Module: wine Branch: master Commit: 855046fe874c10419b933f1ddf4743c646847531 URL: http://source.winehq.org/git/wine.git/?a=commit;h=855046fe874c10419b933f1dd… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jul 1 00:06:15 2012 +0200 qedit: Support COM aggregation for MediaDet. --- dlls/qedit/mediadet.c | 101 +++++++++++++++++++++++++++++++++++------------- 1 files changed, 73 insertions(+), 28 deletions(-) diff --git a/dlls/qedit/mediadet.c b/dlls/qedit/mediadet.c index a88dc9d..fea3aa4 100644 --- a/dlls/qedit/mediadet.c +++ b/dlls/qedit/mediadet.c @@ -33,8 +33,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(qedit); typedef struct MediaDetImpl { + IUnknown IUnknown_inner; IMediaDet IMediaDet_iface; - LONG refCount; + IUnknown *outer_unk; + LONG ref; IGraphBuilder *graph; IBaseFilter *source; IBaseFilter *splitter; @@ -43,6 +45,11 @@ typedef struct MediaDetImpl { IPin *cur_pin; } MediaDetImpl; +static inline MediaDetImpl *impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, MediaDetImpl, IUnknown_inner); +} + static inline MediaDetImpl *impl_from_IMediaDet(IMediaDet *iface) { return CONTAINING_RECORD(iface, MediaDetImpl, IMediaDet_iface); @@ -62,45 +69,79 @@ static void MD_cleanup(MediaDetImpl *This) This->cur_stream = 0; } -static ULONG WINAPI MediaDet_AddRef(IMediaDet* iface) +/* MediaDet inner IUnknown */ +static HRESULT WINAPI MediaDet_inner_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) { - MediaDetImpl *This = impl_from_IMediaDet(iface); - ULONG refCount = InterlockedIncrement(&This->refCount); - TRACE("(%p)->() AddRef from %d\n", This, refCount - 1); - return refCount; + MediaDetImpl *This = impl_from_IUnknown(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + + *ppv = NULL; + if (IsEqualIID(riid, &IID_IUnknown)) + *ppv = &This->IUnknown_inner; + else if IsEqualIID(riid, &IID_IMediaDet) + *ppv = &This->IMediaDet_iface; + else + WARN("(%p, %s,%p): not found\n", This, debugstr_guid(riid), ppv); + + if (!*ppv) + return E_NOINTERFACE; + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; } -static ULONG WINAPI MediaDet_Release(IMediaDet* iface) +static ULONG WINAPI MediaDet_inner_AddRef(IUnknown *iface) { - MediaDetImpl *This = impl_from_IMediaDet(iface); - ULONG refCount = InterlockedDecrement(&This->refCount); - TRACE("(%p)->() Release from %d\n", This, refCount + 1); + MediaDetImpl *This = impl_from_IUnknown(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) new ref = %u\n", This, ref); + + return ref; +} + +static ULONG WINAPI MediaDet_inner_Release(IUnknown *iface) +{ + MediaDetImpl *This = impl_from_IUnknown(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) new ref = %u\n", This, ref); - if (refCount == 0) + if (ref == 0) { MD_cleanup(This); CoTaskMemFree(This); return 0; } - return refCount; + return ref; } -static HRESULT WINAPI MediaDet_QueryInterface(IMediaDet* iface, REFIID riid, - void **ppvObject) +static const IUnknownVtbl mediadet_vtbl = +{ + MediaDet_inner_QueryInterface, + MediaDet_inner_AddRef, + MediaDet_inner_Release, +}; + +/* IMediaDet implementation */ +static HRESULT WINAPI MediaDet_QueryInterface(IMediaDet *iface, REFIID riid, void **ppv) { MediaDetImpl *This = impl_from_IMediaDet(iface); - TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppvObject); + return IUnknown_QueryInterface(This->outer_unk, riid, ppv); +} - if (IsEqualIID(riid, &IID_IUnknown) || - IsEqualIID(riid, &IID_IMediaDet)) { - MediaDet_AddRef(iface); - *ppvObject = This; - return S_OK; - } - *ppvObject = NULL; - WARN("(%p, %s,%p): not found\n", This, debugstr_guid(riid), ppvObject); - return E_NOINTERFACE; +static ULONG WINAPI MediaDet_AddRef(IMediaDet *iface) +{ + MediaDetImpl *This = impl_from_IMediaDet(iface); + return IUnknown_AddRef(This->outer_unk); +} + +static ULONG WINAPI MediaDet_Release(IMediaDet *iface) +{ + MediaDetImpl *This = impl_from_IMediaDet(iface); + return IUnknown_Release(This->outer_unk); } static HRESULT WINAPI MediaDet_get_Filter(IMediaDet* iface, IUnknown **pVal) @@ -603,9 +644,6 @@ HRESULT MediaDet_create(IUnknown * pUnkOuter, LPVOID * ppv) { TRACE("(%p,%p)\n", ppv, pUnkOuter); - if (pUnkOuter) - return CLASS_E_NOAGGREGATION; - obj = CoTaskMemAlloc(sizeof(MediaDetImpl)); if (NULL == obj) { *ppv = NULL; @@ -613,7 +651,8 @@ HRESULT MediaDet_create(IUnknown * pUnkOuter, LPVOID * ppv) { } ZeroMemory(obj, sizeof(MediaDetImpl)); - obj->refCount = 1; + obj->ref = 1; + obj->IUnknown_inner.lpVtbl = &mediadet_vtbl; obj->IMediaDet_iface.lpVtbl = &IMediaDet_VTable; obj->graph = NULL; obj->source = NULL; @@ -623,5 +662,11 @@ HRESULT MediaDet_create(IUnknown * pUnkOuter, LPVOID * ppv) { obj->cur_stream = 0; *ppv = obj; + if (pUnkOuter) + obj->outer_unk = pUnkOuter; + else + obj->outer_unk = &obj->IUnknown_inner; + + *ppv = &obj->IUnknown_inner; return S_OK; }

1 0

Michael Stefaniuc : qedit/tests: Add COM aggregation test for MediaDet.
by Alexandre Julliard 02 Jul '12

02 Jul '12

Module: wine Branch: master Commit: be25a23bc907df44d17c3343f844dd1aeb1169ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=be25a23bc907df44d17c3343f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jul 1 00:07:41 2012 +0200 qedit/tests: Add COM aggregation test for MediaDet. --- dlls/qedit/tests/mediadet.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/qedit/tests/mediadet.c b/dlls/qedit/tests/mediadet.c index b86eaa9..7dc2af2 100644 --- a/dlls/qedit/tests/mediadet.c +++ b/dlls/qedit/tests/mediadet.c @@ -132,7 +132,9 @@ static BOOL init_tests(void) static void test_mediadet(void) { HRESULT hr; + struct unk_impl unk_obj = {{&unk_vtbl}, 19, NULL}; IMediaDet *pM = NULL; + ULONG refcount; BSTR filename = NULL; LONG nstrms = 0; LONG strm; @@ -141,6 +143,22 @@ static void test_mediadet(void) int flags; int i; + /* COM aggregation */ + hr = CoCreateInstance(&CLSID_MediaDet, &unk_obj.IUnknown_iface, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void**)&unk_obj.inner_unk); + ok(hr == S_OK, "CoCreateInstance failed: %08x\n", hr); + + hr = IUnknown_QueryInterface(unk_obj.inner_unk, &IID_IMediaDet, (void**)&pM); + ok(hr == S_OK, "QueryInterface for IID_IMediaDet failed: %08x\n", hr); + refcount = IMediaDet_AddRef(pM); + ok(refcount == unk_obj.ref, "MediaDet just pretends to support COM aggregation\n"); + refcount = IMediaDet_Release(pM); + ok(refcount == unk_obj.ref, "MediaDet just pretends to support COM aggregation\n"); + refcount = IMediaDet_Release(pM); + ok(refcount == 19, "Refcount should be back at 19 but is %u\n", refcount); + + IUnknown_Release(unk_obj.inner_unk); + /* test.avi has one video stream. */ hr = CoCreateInstance(&CLSID_MediaDet, NULL, CLSCTX_INPROC_SERVER, &IID_IMediaDet, (LPVOID*)&pM);

1 0

Józef Kucia : d3dx9: Implement D3DXLoadVolumeFromMemory.
by Alexandre Julliard 02 Jul '12

02 Jul '12

Module: wine Branch: master Commit: ee44f33e85655c16c68ec7debf3e0702d1d040d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee44f33e85655c16c68ec7deb… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Fri Jun 29 14:16:58 2012 +0200 d3dx9: Implement D3DXLoadVolumeFromMemory. --- dlls/d3dx9_36/volume.c | 129 +++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 116 insertions(+), 13 deletions(-) diff --git a/dlls/d3dx9_36/volume.c b/dlls/d3dx9_36/volume.c index 1eae9f4..c008070 100644 --- a/dlls/d3dx9_36/volume.c +++ b/dlls/d3dx9_36/volume.c @@ -21,20 +21,123 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dx); -HRESULT WINAPI D3DXLoadVolumeFromMemory(LPDIRECT3DVOLUME9 destvolume, - CONST PALETTEENTRY* destpalette, - CONST D3DBOX* destbox, - LPCVOID srcmemory, - D3DFORMAT srcformat, - UINT srcrowpitch, - UINT srcslicepitch, - CONST PALETTEENTRY* srcpalette, - CONST D3DBOX* srcbox, +HRESULT WINAPI D3DXLoadVolumeFromMemory(IDirect3DVolume9 *dst_volume, + const PALETTEENTRY *dst_palette, + const D3DBOX *dst_box, + const void *src_memory, + D3DFORMAT src_format, + UINT src_row_pitch, + UINT src_slice_pitch, + const PALETTEENTRY *src_palette, + const D3DBOX *src_box, DWORD filter, - D3DCOLOR colorkey) + D3DCOLOR color_key) { - FIXME("(%p, %p, %p, %p, %x, %u, %u, %p, %p, %x, %x): stub\n", destvolume, destpalette, destbox, srcmemory, srcformat, - srcrowpitch, srcslicepitch, srcpalette, srcbox, filter, colorkey); + HRESULT hr; + D3DVOLUME_DESC desc; + D3DLOCKED_BOX locked_box; + UINT dst_width, dst_height, dst_depth; + UINT src_width, src_height, src_depth; + const PixelFormatDesc *src_format_desc, *dst_format_desc; - return E_NOTIMPL; + TRACE("(%p, %p, %p, %p, %#x, %u, %u, %p, %p, %x, %x)\n", dst_volume, dst_palette, dst_box, + src_memory, src_format, src_row_pitch, src_slice_pitch, src_palette, src_box, + filter, color_key); + + if (!dst_volume || !src_memory || !src_box) return D3DERR_INVALIDCALL; + + if (src_format == D3DFMT_UNKNOWN + || src_box->Left >= src_box->Right + || src_box->Top >= src_box->Bottom + || src_box->Front >= src_box->Back) + return E_FAIL; + + if (filter == D3DX_DEFAULT) + filter = D3DX_FILTER_TRIANGLE | D3DX_FILTER_DITHER; + + IDirect3DVolume9_GetDesc(dst_volume, &desc); + + src_width = src_box->Right - src_box->Left; + src_height = src_box->Bottom - src_box->Top; + src_depth = src_box->Back - src_box->Front; + + if (!dst_box) + { + dst_width = desc.Width; + dst_height = desc.Height; + dst_depth = desc.Depth; + } + else + { + if (dst_box->Left >= dst_box->Right || dst_box->Right > desc.Width) + return D3DERR_INVALIDCALL; + if (dst_box->Top >= dst_box->Bottom || dst_box->Bottom > desc.Height) + return D3DERR_INVALIDCALL; + if (dst_box->Front >= dst_box->Back || dst_box->Back > desc.Depth) + return D3DERR_INVALIDCALL; + + dst_width = dst_box->Right - dst_box->Left; + dst_height = dst_box->Bottom - dst_box->Top; + dst_depth = dst_box->Back - dst_box->Front; + } + + src_format_desc = get_format_info(src_format); + if (src_format_desc->type == FORMAT_UNKNOWN) + return E_NOTIMPL; + + dst_format_desc = get_format_info(desc.Format); + if (dst_format_desc->type == FORMAT_UNKNOWN) + return E_NOTIMPL; + + if (desc.Format == src_format + && dst_width == src_width && dst_height == src_height && dst_depth == src_depth) + { + UINT row, slice; + BYTE *dst_addr; + const BYTE *src_addr; + UINT row_block_count = (src_width + src_format_desc->block_width - 1) / src_format_desc->block_width; + UINT row_count = (src_height + src_format_desc->block_height - 1) / src_format_desc->block_height; + + if (src_box->Left & (src_format_desc->block_width - 1) + || src_box->Top & (src_format_desc->block_height - 1) + || (src_box->Right & (src_format_desc->block_width - 1) + && src_width != desc.Width) + || (src_box->Bottom & (src_format_desc->block_height - 1) + && src_height != desc.Height)) + { + FIXME("Source box (%u, %u, %u, %u) is misaligned\n", + src_box->Left, src_box->Top, src_box->Right, src_box->Bottom); + return E_NOTIMPL; + } + + hr = IDirect3DVolume9_LockBox(dst_volume, &locked_box, dst_box, 0); + if (FAILED(hr)) return hr; + + for (slice = 0; slice < src_depth; slice++) + { + src_addr = src_memory; + src_addr += (src_box->Front + slice) * src_slice_pitch; + src_addr += (src_box->Top / src_format_desc->block_height) * src_row_pitch; + src_addr += (src_box->Left / src_format_desc->block_width) * src_format_desc->block_byte_count; + + dst_addr = locked_box.pBits; + dst_addr += slice * locked_box.SlicePitch; + + for (row = 0; row < row_count; row++) + { + memcpy(dst_addr, src_addr, row_block_count * src_format_desc->block_byte_count); + src_addr += src_row_pitch; + dst_addr += locked_box.RowPitch; + } + } + + IDirect3DVolume9_UnlockBox(dst_volume); + } + else + { + FIXME("Stretching or format conversion not implemented\n"); + return E_NOTIMPL; + } + + return D3D_OK; }

1 0

Józef Kucia : d3dx9/tests: Add tests for D3DXLoadVolumeFromMemory.
by Alexandre Julliard 02 Jul '12

02 Jul '12

Module: wine Branch: master Commit: 09519eece10bc0fed86cf8ddfd22c97fc26a207a URL: http://source.winehq.org/git/wine.git/?a=commit;h=09519eece10bc0fed86cf8ddf… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Fri Jun 29 14:16:59 2012 +0200 d3dx9/tests: Add tests for D3DXLoadVolumeFromMemory. --- dlls/d3dx9_36/tests/Makefile.in | 3 +- dlls/d3dx9_36/tests/volume.c | 217 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 219 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=09519eece10bc0fed86cf…

1 0

Józef Kucia : d3dx9: Implement D3DXLoadVolumeFromVolume.
by Alexandre Julliard 02 Jul '12

02 Jul '12

Module: wine Branch: master Commit: 9e262e1a9b8baf239f771c2ef9b7b28b6e7b4850 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e262e1a9b8baf239f771c2ef… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Fri Jun 29 14:17:00 2012 +0200 d3dx9: Implement D3DXLoadVolumeFromVolume. --- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/volume.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index f6a29df..fbfa5f1 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -195,7 +195,7 @@ @ stdcall D3DXLoadVolumeFromMemory(ptr ptr ptr ptr long long long ptr ptr long long) @ stub D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr) @ stub D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr) -@ stub D3DXLoadVolumeFromVolume(ptr ptr ptr ptr ptr ptr long long) +@ stdcall D3DXLoadVolumeFromVolume(ptr ptr ptr ptr ptr ptr long long) @ stdcall D3DXMatrixAffineTransformation(ptr float ptr ptr ptr) @ stdcall D3DXMatrixAffineTransformation2D(ptr float ptr float ptr) @ stdcall D3DXMatrixDecompose(ptr ptr ptr ptr) diff --git a/dlls/d3dx9_36/volume.c b/dlls/d3dx9_36/volume.c index c008070..51e6072 100644 --- a/dlls/d3dx9_36/volume.c +++ b/dlls/d3dx9_36/volume.c @@ -141,3 +141,46 @@ HRESULT WINAPI D3DXLoadVolumeFromMemory(IDirect3DVolume9 *dst_volume, return D3D_OK; } + +HRESULT WINAPI D3DXLoadVolumeFromVolume(IDirect3DVolume9 *dst_volume, + const PALETTEENTRY *dst_palette, + const D3DBOX *dst_box, + IDirect3DVolume9 *src_volume, + const PALETTEENTRY *src_palette, + const D3DBOX *src_box, + DWORD filter, + D3DCOLOR color_key) +{ + HRESULT hr; + D3DBOX box; + D3DVOLUME_DESC desc; + D3DLOCKED_BOX locked_box; + + TRACE("(%p, %p, %p, %p, %p, %p, %#x, %#x)\n", + dst_volume, dst_palette, dst_box, src_volume, src_palette, src_box, + filter, color_key); + + if (!dst_volume || !src_volume) return D3DERR_INVALIDCALL; + + IDirect3DVolume9_GetDesc(src_volume, &desc); + + if (!src_box) + { + box.Left = box.Top = 0; + box.Right = desc.Width; + box.Bottom = desc.Height; + box.Front = 0; + box.Back = desc.Depth; + } + else box = *src_box; + + hr = IDirect3DVolume9_LockBox(src_volume, &locked_box, &box, D3DLOCK_READONLY); + if (FAILED(hr)) return hr; + + hr = D3DXLoadVolumeFromMemory(dst_volume, dst_palette, dst_box, + locked_box.pBits, desc.Format, locked_box.RowPitch, locked_box.SlicePitch, + src_palette, &box, filter, color_key); + + IDirect3DVolume9_UnlockBox(src_volume); + return hr; +}

1 0

Józef Kucia : d3dx9: Implement D3DXCreateVolumeTextureFromFileInMemoryEx.
by Alexandre Julliard 02 Jul '12

02 Jul '12

Module: wine Branch: master Commit: 07b0f25404856114a91204efa2a03e2ef01f17ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=07b0f25404856114a91204efa… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Fri Jun 29 14:17:01 2012 +0200 d3dx9: Implement D3DXCreateVolumeTextureFromFileInMemoryEx. --- dlls/d3dx9_36/d3dx9_36_private.h | 2 + dlls/d3dx9_36/surface.c | 52 ++++++++++++ dlls/d3dx9_36/tests/texture.c | 53 ++++++------ dlls/d3dx9_36/texture.c | 164 +++++++++++++++++++++++++++++++++----- 4 files changed, 225 insertions(+), 46 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=07b0f25404856114a9120…

1 0