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

Marek Chmiel : dssenh: Added CryptAcquireContext test for the DSSENH cryptographic service provider .
by Alexandre Julliard July 2, 2012

July 2, 2012

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

Alexandre Julliard : windowscodecs: Don't fail if the TIFF library doesn' t have the functions to disable warnings.
by Alexandre Julliard July 2, 2012

July 2, 2012

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

Nikolay Sivov : msxml3: Correct IEnumVARIANT regarding IUnknown forwarding.
by Alexandre Julliard July 2, 2012

July 2, 2012

Module: wine Branch: master Commit: 60dd1c6a6eca6205f3838b4c96863639967d99f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60dd1c6a6eca6205f3838b4c9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 30 16:16:33 2012 +0400 msxml3: Correct IEnumVARIANT regarding IUnknown forwarding. --- dlls/msxml3/nodelist.c | 2 +- dlls/msxml3/selection.c | 14 +++++- dlls/msxml3/tests/domdoc.c | 93 +++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 100 insertions(+), 9 deletions(-) diff --git a/dlls/msxml3/nodelist.c b/dlls/msxml3/nodelist.c index 5710d48..f948fcf 100644 --- a/dlls/msxml3/nodelist.c +++ b/dlls/msxml3/nodelist.c @@ -40,7 +40,7 @@ #include "wine/debug.h" /* This file implements the object returned by childNodes property. Note that this is - * not the IXMLDOMNodeList returned by XPath querites - it's implemented in queryresult.c. + * not the IXMLDOMNodeList returned by XPath queries - it's implemented in selection.c. * They are different because the list returned by childNodes: * - is "live" - changes to the XML tree are automatically reflected in the list * - doesn't supports IXMLDOMSelection diff --git a/dlls/msxml3/selection.c b/dlls/msxml3/selection.c index ba173f9..55873bb 100644 --- a/dlls/msxml3/selection.c +++ b/dlls/msxml3/selection.c @@ -433,8 +433,14 @@ static HRESULT WINAPI enumvariant_QueryInterface( *ppvObject = NULL; - if ( IsEqualGUID( riid, &IID_IUnknown ) || - IsEqualGUID( riid, &IID_IEnumVARIANT )) + if (IsEqualGUID( riid, &IID_IUnknown )) + { + if (This->own) + *ppvObject = &This->IEnumVARIANT_iface; + else + return IXMLDOMSelection_QueryInterface(This->selection, riid, ppvObject); + } + else if (IsEqualGUID( riid, &IID_IEnumVARIANT )) { *ppvObject = &This->IEnumVARIANT_iface; } @@ -563,7 +569,9 @@ static HRESULT create_enumvariant(IXMLDOMSelection *selection, BOOL own, IUnknow if (This->own) IXMLDOMSelection_AddRef(selection); - return IEnumVARIANT_QueryInterface(&This->IEnumVARIANT_iface, &IID_IUnknown, (void**)penum); + *penum = (IUnknown*)&This->IEnumVARIANT_iface; + IUnknown_AddRef(*penum); + return S_OK; } static HRESULT domselection_get_dispid(IUnknown *iface, BSTR name, DWORD flags, DISPID *dispid) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 7a02e19..4b73d47 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -4122,13 +4122,15 @@ static void test_get_text(void) static void test_get_childNodes(void) { - BSTR str; + IXMLDOMNodeList *node_list, *node_list2; + IEnumVARIANT *enum1, *enum2, *enum3; VARIANT_BOOL b; IXMLDOMDocument *doc; - IXMLDOMElement *element; IXMLDOMNode *node, *node2; - IXMLDOMNodeList *node_list, *node_list2; + IXMLDOMElement *element; + IUnknown *unk1, *unk2; HRESULT hr; + BSTR str; LONG len; doc = create_document(&IID_IXMLDOMDocument); @@ -4148,6 +4150,58 @@ static void test_get_childNodes(void) EXPECT_HR(hr, S_OK); ok( len == 4, "len %d\n", len); + /* refcount tests for IEnumVARIANT support */ + EXPECT_REF(node_list, 1); + hr = IXMLDOMNodeList_QueryInterface(node_list, &IID_IEnumVARIANT, (void**)&enum1); +if (hr == S_OK) +{ + EXPECT_REF(node_list, 1); + EXPECT_REF(enum1, 2); + + EXPECT_REF(node_list, 1); + hr = IXMLDOMNodeList_QueryInterface(node_list, &IID_IEnumVARIANT, (void**)&enum2); + EXPECT_HR(hr, S_OK); + EXPECT_REF(node_list, 1); + ok(enum2 == enum1, "got %p, %p\n", enum2, enum1); + IEnumVARIANT_Release(enum2); + + hr = IXMLDOMNodeList_QueryInterface(node_list, &IID_IUnknown, (void**)&unk1); + EXPECT_HR(hr, S_OK); + hr = IEnumVARIANT_QueryInterface(enum1, &IID_IUnknown, (void**)&unk2); + EXPECT_HR(hr, S_OK); + EXPECT_REF(node_list, 3); + EXPECT_REF(enum1, 2); + ok(unk1 == unk2, "got %p, %p\n", unk1, unk2); + IUnknown_Release(unk1); + IUnknown_Release(unk2); + + EXPECT_REF(node_list, 1); + hr = IXMLDOMNodeList__newEnum(node_list, (IUnknown**)&enum2); + EXPECT_HR(hr, S_OK); + EXPECT_REF(node_list, 2); + EXPECT_REF(enum2, 1); + ok(enum2 != enum1, "got %p, %p\n", enum2, enum1); + + /* enumerator created with _newEnum() doesn't share IUnknown* with main object */ + hr = IXMLDOMNodeList_QueryInterface(node_list, &IID_IUnknown, (void**)&unk1); + EXPECT_HR(hr, S_OK); + hr = IEnumVARIANT_QueryInterface(enum2, &IID_IUnknown, (void**)&unk2); + EXPECT_HR(hr, S_OK); + EXPECT_REF(node_list, 3); + EXPECT_REF(enum2, 2); + ok(unk1 != unk2, "got %p, %p\n", unk1, unk2); + IUnknown_Release(unk1); + IUnknown_Release(unk2); + + hr = IXMLDOMNodeList__newEnum(node_list, (IUnknown**)&enum3); + EXPECT_HR(hr, S_OK); + ok(enum2 != enum3, "got %p, %p\n", enum2, enum3); + IEnumVARIANT_Release(enum3); + IEnumVARIANT_Release(enum2); + + IEnumVARIANT_Release(enum1); +} + hr = IXMLDOMNodeList_get_item( node_list, 2, &node ); EXPECT_HR(hr, S_OK); @@ -10171,6 +10225,7 @@ static void test_selection(void) IXMLDOMSelection *selection, *selection2; IEnumVARIANT *enum1, *enum2, *enum3; IXMLDOMNodeList *list; + IUnknown *unk1, *unk2; IXMLDOMDocument *doc; IDispatchEx *dispex; IXMLDOMNode *node; @@ -10218,6 +10273,25 @@ static void test_selection(void) ok(enum1 != NULL, "got %p\n", enum1); EXPECT_REF(enum1, 2); + EXPECT_REF(selection, 1); + hr = IXMLDOMSelection_QueryInterface(selection, &IID_IUnknown, (void**)&unk1); + EXPECT_HR(hr, S_OK); + EXPECT_REF(selection, 2); + EXPECT_REF(enum1, 2); + + /* enumerator and selection object return same IUnknown* */ + hr = IEnumVARIANT_QueryInterface(enum1, &IID_IUnknown, (void**)&unk2); + EXPECT_HR(hr, S_OK); + EXPECT_REF(selection, 3); + EXPECT_REF(enum1, 2); + ok(unk2 == unk1, "got %p, %p\n", unk1, unk2); + IUnknown_Release(unk2); + + EXPECT_REF(selection, 2); + IEnumVARIANT_AddRef(enum1); + EXPECT_REF(selection, 2); + IEnumVARIANT_Release(enum1); + enum3 = NULL; hr = IXMLDOMSelection_QueryInterface(selection, &IID_IEnumVARIANT, (void**)&enum3); EXPECT_HR(hr, S_OK); @@ -10226,7 +10300,7 @@ static void test_selection(void) EXPECT_REF(enum1, 3); IEnumVARIANT_Release(enum3); - EXPECT_REF(selection, 1); + EXPECT_REF(selection, 2); EXPECT_REF(enum1, 2); enum2 = NULL; @@ -10234,12 +10308,20 @@ static void test_selection(void) EXPECT_HR(hr, S_OK); ok(enum2 != NULL, "got %p\n", enum2); - EXPECT_REF(selection, 2); + EXPECT_REF(selection, 3); EXPECT_REF(enum1, 2); EXPECT_REF(enum2, 1); ok(enum1 != enum2, "got %p, %p\n", enum1, enum2); + hr = IEnumVARIANT_QueryInterface(enum2, &IID_IUnknown, (void**)&unk2); + EXPECT_HR(hr, S_OK); + EXPECT_REF(selection, 3); + EXPECT_REF(enum2, 2); + ok(unk2 != unk1, "got %p, %p\n", unk1, unk2); + IUnknown_Release(unk2); + IUnknown_Release(unk1); + selection2 = NULL; hr = IEnumVARIANT_QueryInterface(enum1, &IID_IXMLDOMSelection, (void**)&selection2); EXPECT_HR(hr, S_OK); @@ -10368,6 +10450,7 @@ static void test_selection(void) SysFreeString(name); IXMLDOMNode_Release(node); VariantClear(&v); + IEnumVARIANT_Release(enum1); hr = IXMLDOMSelection_nextNode(selection, &node); EXPECT_HR(hr, S_OK);

1 0

Henri Verbeet : winex11: Get rid of some unused prototypes.
by Alexandre Julliard July 2, 2012

July 2, 2012

Module: wine Branch: master Commit: 0fda9d95a5c49e10880fb3616e394f9d323b6363 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fda9d95a5c49e10880fb3616… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 2 14:46:00 2012 +0200 winex11: Get rid of some unused prototypes. --- dlls/winex11.drv/x11drv.h | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index df01379..a4a4f0d 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -220,8 +220,6 @@ extern INT X11DRV_YWStoDS( HDC hdc, INT height ) DECLSPEC_HIDDEN; extern const int X11DRV_XROPfunction[]; -extern void _XInitImageFuncPtrs(XImage *) DECLSPEC_HIDDEN; - extern int client_side_with_render DECLSPEC_HIDDEN; extern int client_side_antialias_with_core DECLSPEC_HIDDEN; extern int client_side_antialias_with_render DECLSPEC_HIDDEN; @@ -649,8 +647,6 @@ extern void X11DRV_init_desktop( Window win, unsigned int width, unsigned int he extern void X11DRV_resize_desktop(unsigned int width, unsigned int height) DECLSPEC_HIDDEN; extern void X11DRV_Settings_AddDepthModes(void) DECLSPEC_HIDDEN; extern void X11DRV_Settings_AddOneMode(unsigned int width, unsigned int height, unsigned int bpp, unsigned int freq) DECLSPEC_HIDDEN; -extern int X11DRV_Settings_CreateDriver(LPDDHALINFO info) DECLSPEC_HIDDEN; -extern LPDDHALMODEINFO X11DRV_Settings_CreateModes(unsigned int max_modes, int reserve_depths) DECLSPEC_HIDDEN; unsigned int X11DRV_Settings_GetModeCount(void) DECLSPEC_HIDDEN; void X11DRV_Settings_Init(void) DECLSPEC_HIDDEN; LPDDHALMODEINFO X11DRV_Settings_SetHandlers(const char *name,

1 0

Józef Kucia : d3dx9: Implement D3DXLoadVolumeFromVolume.
by Alexandre Julliard July 2, 2012

July 2, 2012

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

Henri Verbeet : d3d9: Pass a wined3d_swapchain_desc structure to swapchain_init().
by Alexandre Julliard July 2, 2012

July 2, 2012

Module: wine Branch: master Commit: 2457d343147a93314d26397e7172e79374cf71de URL: http://source.winehq.org/git/wine.git/?a=commit;h=2457d343147a93314d26397e7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 2 14:45:57 2012 +0200 d3d9: Pass a wined3d_swapchain_desc structure to swapchain_init(). --- dlls/d3d9/d3d9_private.h | 2 +- dlls/d3d9/device.c | 73 ++++++++++++++++++++++----------------------- dlls/d3d9/swapchain.c | 40 ++---------------------- 3 files changed, 41 insertions(+), 74 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2457d343147a93314d263…

1 0

Nikolay Sivov : wshom: Implement WindowStyle property for IWshShortcut.
by Alexandre Julliard July 2, 2012

July 2, 2012

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 July 2, 2012

July 2, 2012

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

Michael Stefaniuc : qedit/tests: Add COM aggregation test for MediaDet.
by Alexandre Julliard July 2, 2012

July 2, 2012

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 D3DXCreateVolumeTextureFromFileInMemoryEx.
by Alexandre Julliard July 2, 2012

July 2, 2012

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