February 2014 - Wine-commits

Henri Verbeet : d3d10_1: Implement D3D10CreateDevice1().
by Alexandre Julliard 11 Feb '14

11 Feb '14

Module: wine Branch: master Commit: d799eb2d8385456082a3fd72c58f531c4807e52f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d799eb2d8385456082a3fd72c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 11 11:42:24 2014 +0100 d3d10_1: Implement D3D10CreateDevice1(). --- configure | 2 + configure.ac | 1 + dlls/d3d10_1/Makefile.in | 8 ++ dlls/d3d10_1/d3d10_1.spec | 30 +++++++ dlls/d3d10_1/d3d10_1_main.c | 182 +++++++++++++++++++++++++++++++++++++++++++ dlls/d3d10_1/version.rc | 26 +++++++ 6 files changed, 249 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d799eb2d8385456082a3f…

1 0

Jacek Caban : wmp: Added missing registry entries for WindowsMediaPlayer coclass registration.
by Alexandre Julliard 11 Feb '14

11 Feb '14

Module: wine Branch: master Commit: 5a60ebf89a0a51af95e0a766ca4a526a0494ba6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a60ebf89a0a51af95e0a766c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 11 11:49:29 2014 +0100 wmp: Added missing registry entries for WindowsMediaPlayer coclass registration. --- dlls/wmp/Makefile.in | 1 + dlls/wmp/rsrc.rc | 24 ++++++++++++++++++++++++ dlls/wmp/wmp.rgs | 20 ++++++++++++++++++++ 3 files changed, 45 insertions(+) diff --git a/dlls/wmp/Makefile.in b/dlls/wmp/Makefile.in index 47e7ce6..6db31eb 100644 --- a/dlls/wmp/Makefile.in +++ b/dlls/wmp/Makefile.in @@ -4,4 +4,5 @@ C_SRCS = \ oleobj.c \ wmp_main.c +RC_SRCS = rsrc.rc IDL_SRCS = wmp_typelib.idl diff --git a/dlls/wmp/rsrc.rc b/dlls/wmp/rsrc.rc new file mode 100644 index 0000000..cc6c199 --- /dev/null +++ b/dlls/wmp/rsrc.rc @@ -0,0 +1,24 @@ +/* + * Copyright 2014 Jacek Caban + * + * 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 <windef.h> + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +/* @makedep: wmp.rgs */ +2 WINE_REGISTRY wmp.rgs diff --git a/dlls/wmp/wmp.rgs b/dlls/wmp/wmp.rgs new file mode 100644 index 0000000..fa40fa7 --- /dev/null +++ b/dlls/wmp/wmp.rgs @@ -0,0 +1,20 @@ +HKCR +{ + NoRemove CLSID + { + '{6BF52A52-394A-11D3-B153-00C04F79FAA6}' + { + Control + Insertable + MiscStatus = s '0' + { + 1 = s '131473' + } + Programmable + } + } + 'WMPlayer.OCX.7' = s 'Windows Media Player' + { + Insertable + } +}

1 0

Jacek Caban : wmp.idl: Added proper version independent ProgID.
by Alexandre Julliard 11 Feb '14

11 Feb '14

Module: wine Branch: master Commit: 4016bb18deaeab9440b2b171511a4d2da2fb9767 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4016bb18deaeab9440b2b1715… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 11 11:49:03 2014 +0100 wmp.idl: Added proper version independent ProgID. --- include/wmp.idl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/wmp.idl b/include/wmp.idl index 429fc8d..d9cd857 100644 --- a/include/wmp.idl +++ b/include/wmp.idl @@ -43,7 +43,8 @@ library WMPLib { [ helpstring("Windows Media Player"), threading(apartment), - progid("WMPlayer.OCX"), + progid("WMPlayer.OCX.7"), + vi_progid("WMPlayer.OCX"), uuid(6bf52a52-394a-11d3-b153-00c04f79faa6) ] coclass WindowsMediaPlayer

1 0

Jacek Caban : wmp: Added GetMiscStatus implementation.
by Alexandre Julliard 11 Feb '14

11 Feb '14

Module: wine Branch: master Commit: d1691bc2044853548384c0a10254705b119948ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1691bc2044853548384c0a10… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 11 13:15:53 2014 +0100 wmp: Added GetMiscStatus implementation. --- dlls/wmp/oleobj.c | 16 ++++++++++++++-- dlls/wmp/tests/oleobj.c | 6 ++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/wmp/oleobj.c b/dlls/wmp/oleobj.c index 6506824..01204e2 100644 --- a/dlls/wmp/oleobj.c +++ b/dlls/wmp/oleobj.c @@ -268,8 +268,20 @@ static HRESULT WINAPI OleObject_EnumAdvise(IOleObject *iface, IEnumSTATDATA **pp static HRESULT WINAPI OleObject_GetMiscStatus(IOleObject *iface, DWORD dwAspect, DWORD *pdwStatus) { WindowsMediaPlayer *This = impl_from_IOleObject(iface); - FIXME("(%p)->(%d %p)\n", This, dwAspect, pdwStatus); - return E_NOTIMPL; + + TRACE("(%p)->(%d %p)\n", This, dwAspect, pdwStatus); + + switch(dwAspect) { + case DVASPECT_CONTENT: + *pdwStatus = OLEMISC_SETCLIENTSITEFIRST|OLEMISC_ACTIVATEWHENVISIBLE|OLEMISC_INSIDEOUT + |OLEMISC_CANTLINKINSIDE|OLEMISC_RECOMPOSEONRESIZE; + break; + default: + FIXME("Unhandled aspect %d\n", dwAspect); + return E_NOTIMPL; + } + + return S_OK; } static HRESULT WINAPI OleObject_SetColorScheme(IOleObject *iface, LOGPALETTE *pLogpal) diff --git a/dlls/wmp/tests/oleobj.c b/dlls/wmp/tests/oleobj.c index c8fb5a3..f209cc3 100644 --- a/dlls/wmp/tests/oleobj.c +++ b/dlls/wmp/tests/oleobj.c @@ -630,6 +630,7 @@ static void test_wmp(void) IOleClientSite *client_site; IPersistStreamInit *psi; IOleObject *oleobj; + DWORD misc_status; GUID guid; LONG ref; HRESULT hres; @@ -652,6 +653,11 @@ static void test_wmp(void) test_QI((IUnknown*)oleobj); + hres = IOleObject_GetMiscStatus(oleobj, DVASPECT_CONTENT, &misc_status); + ok(hres == S_OK, "GetMiscStatus failed: %08x\n", hres); + ok(misc_status == (OLEMISC_SETCLIENTSITEFIRST|OLEMISC_ACTIVATEWHENVISIBLE|OLEMISC_INSIDEOUT + |OLEMISC_CANTLINKINSIDE|OLEMISC_RECOMPOSEONRESIZE), "misc_status = %x\n", misc_status); + hres = IOleObject_QueryInterface(oleobj, &IID_IPersistStreamInit, (void**)&psi); ok(hres == S_OK, "Could not get IPersistStreamInit iface: %08x\n", hres);

1 0

Jacek Caban : wmp: Added IOleInPlaceObjectWindowless stub implementation.
by Alexandre Julliard 11 Feb '14

11 Feb '14

Module: wine Branch: master Commit: 07c3e134c84beef5c592a314630026d3615e5c79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07c3e134c84beef5c592a3146… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 11 11:50:48 2014 +0100 wmp: Added IOleInPlaceObjectWindowless stub implementation. --- dlls/wmp/oleobj.c | 109 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/wmp/tests/oleobj.c | 4 ++ 2 files changed, 113 insertions(+) diff --git a/dlls/wmp/oleobj.c b/dlls/wmp/oleobj.c index 01204e2..773b0b0 100644 --- a/dlls/wmp/oleobj.c +++ b/dlls/wmp/oleobj.c @@ -26,6 +26,7 @@ struct WindowsMediaPlayer { IOleObject IOleObject_iface; IProvideClassInfo2 IProvideClassInfo2_iface; IPersistStreamInit IPersistStreamInit_iface; + IOleInPlaceObjectWindowless IOleInPlaceObjectWindowless_iface; LONG ref; @@ -68,6 +69,15 @@ static HRESULT WINAPI OleObject_QueryInterface(IOleObject *iface, REFIID riid, v }else if(IsEqualGUID(riid, &IID_IPersistStreamInit)) { TRACE("(%p)->(IID_IPersistStreamInit %p)\n", This, ppv); *ppv = &This->IPersistStreamInit_iface; + }else if(IsEqualGUID(riid, &IID_IOleWindow)) { + TRACE("(%p)->(IID_IOleWindow %p)\n", This, ppv); + *ppv = &This->IOleInPlaceObjectWindowless_iface; + }else if(IsEqualGUID(riid, &IID_IOleInPlaceObject)) { + TRACE("(%p)->(IID_IOleInPlaceObject %p)\n", This, ppv); + *ppv = &This->IOleInPlaceObjectWindowless_iface; + }else if(IsEqualGUID(riid, &IID_IOleInPlaceObjectWindowless)) { + TRACE("(%p)->(IID_IOleInPlaceObjectWindowless %p)\n", This, ppv); + *ppv = &This->IOleInPlaceObjectWindowless_iface; }else { FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); *ppv = NULL; @@ -318,6 +328,104 @@ static const IOleObjectVtbl OleObjectVtbl = { OleObject_SetColorScheme }; +static inline WindowsMediaPlayer *impl_from_IOleInPlaceObjectWindowless(IOleInPlaceObjectWindowless *iface) +{ + return CONTAINING_RECORD(iface, WindowsMediaPlayer, IOleInPlaceObjectWindowless_iface); +} + +static HRESULT WINAPI OleInPlaceObjectWindowless_QueryInterface(IOleInPlaceObjectWindowless *iface, + REFIID riid, void **ppv) +{ + WindowsMediaPlayer *This = impl_from_IOleInPlaceObjectWindowless(iface); + return IOleObject_QueryInterface(&This->IOleObject_iface, riid, ppv); +} + +static ULONG WINAPI OleInPlaceObjectWindowless_AddRef(IOleInPlaceObjectWindowless *iface) +{ + WindowsMediaPlayer *This = impl_from_IOleInPlaceObjectWindowless(iface); + return IOleObject_AddRef(&This->IOleObject_iface); +} + +static ULONG WINAPI OleInPlaceObjectWindowless_Release(IOleInPlaceObjectWindowless *iface) +{ + WindowsMediaPlayer *This = impl_from_IOleInPlaceObjectWindowless(iface); + return IOleObject_Release(&This->IOleObject_iface); +} + +static HRESULT WINAPI OleInPlaceObjectWindowless_GetWindow(IOleInPlaceObjectWindowless *iface, HWND *phwnd) +{ + WindowsMediaPlayer *This = impl_from_IOleInPlaceObjectWindowless(iface); + FIXME("(%p)->(%p)\n", This, phwnd); + return E_NOTIMPL; +} + +static HRESULT WINAPI OleInPlaceObjectWindowless_ContextSensitiveHelp(IOleInPlaceObjectWindowless *iface, + BOOL fEnterMode) +{ + WindowsMediaPlayer *This = impl_from_IOleInPlaceObjectWindowless(iface); + FIXME("(%p)->(%x)\n", This, fEnterMode); + return E_NOTIMPL; +} + +static HRESULT WINAPI OleInPlaceObjectWindowless_InPlaceDeactivate(IOleInPlaceObjectWindowless *iface) +{ + WindowsMediaPlayer *This = impl_from_IOleInPlaceObjectWindowless(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI OleInPlaceObjectWindowless_UIDeactivate(IOleInPlaceObjectWindowless *iface) +{ + WindowsMediaPlayer *This = impl_from_IOleInPlaceObjectWindowless(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI OleInPlaceObjectWindowless_SetObjectRects(IOleInPlaceObjectWindowless *iface, + LPCRECT lprcPosRect, LPCRECT lprcClipRect) +{ + WindowsMediaPlayer *This = impl_from_IOleInPlaceObjectWindowless(iface); + FIXME("(%p)->(%p %p)\n", This, lprcPosRect, lprcClipRect); + return E_NOTIMPL; +} + +static HRESULT WINAPI OleInPlaceObjectWindowless_ReactivateAndUndo(IOleInPlaceObjectWindowless *iface) +{ + WindowsMediaPlayer *This = impl_from_IOleInPlaceObjectWindowless(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI OleInPlaceObjectWindowless_OnWindowMessage(IOleInPlaceObjectWindowless *iface, + UINT msg, WPARAM wParam, LPARAM lParam, LRESULT *lpResult) +{ + WindowsMediaPlayer *This = impl_from_IOleInPlaceObjectWindowless(iface); + FIXME("(%p)->(%u %lu %lu %p)\n", This, msg, wParam, lParam, lpResult); + return E_NOTIMPL; +} + +static HRESULT WINAPI OleInPlaceObjectWindowless_GetDropTarget(IOleInPlaceObjectWindowless *iface, + IDropTarget **ppDropTarget) +{ + WindowsMediaPlayer *This = impl_from_IOleInPlaceObjectWindowless(iface); + FIXME("(%p)->(%p)\n", This, ppDropTarget); + return E_NOTIMPL; +} + +static const IOleInPlaceObjectWindowlessVtbl OleInPlaceObjectWindowlessVtbl = { + OleInPlaceObjectWindowless_QueryInterface, + OleInPlaceObjectWindowless_AddRef, + OleInPlaceObjectWindowless_Release, + OleInPlaceObjectWindowless_GetWindow, + OleInPlaceObjectWindowless_ContextSensitiveHelp, + OleInPlaceObjectWindowless_InPlaceDeactivate, + OleInPlaceObjectWindowless_UIDeactivate, + OleInPlaceObjectWindowless_SetObjectRects, + OleInPlaceObjectWindowless_ReactivateAndUndo, + OleInPlaceObjectWindowless_OnWindowMessage, + OleInPlaceObjectWindowless_GetDropTarget +}; + static inline WindowsMediaPlayer *impl_from_IProvideClassInfo2(IProvideClassInfo2 *iface) { return CONTAINING_RECORD(iface, WindowsMediaPlayer, IProvideClassInfo2_iface); @@ -466,6 +574,7 @@ HRESULT WINAPI WMPFactory_CreateInstance(IClassFactory *iface, IUnknown *outer, wmp->IOleObject_iface.lpVtbl = &OleObjectVtbl; wmp->IProvideClassInfo2_iface.lpVtbl = &ProvideClassInfo2Vtbl; wmp->IPersistStreamInit_iface.lpVtbl = &PersistStreamInitVtbl; + wmp->IOleInPlaceObjectWindowless_iface.lpVtbl = &OleInPlaceObjectWindowlessVtbl; wmp->ref = 1; diff --git a/dlls/wmp/tests/oleobj.c b/dlls/wmp/tests/oleobj.c index f209cc3..8f2eed2 100644 --- a/dlls/wmp/tests/oleobj.c +++ b/dlls/wmp/tests/oleobj.c @@ -622,6 +622,10 @@ static void test_QI(IUnknown *unk) hres = IUnknown_QueryInterface(unk, &IID_IQuickActivate, (void**)&tmp); ok(hres == E_NOINTERFACE, "Got IQuickActivate iface when no expected\n"); + + hres = IUnknown_QueryInterface(unk, &IID_IOleInPlaceObjectWindowless, (void**)&tmp); + ok(hres == S_OK, "Could not get IOleInPlaceObjectWindowless iface: %08x\n", hres); + IUnknown_Release(tmp); } static void test_wmp(void)

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 11 Feb '14

11 Feb '14

Module: wine Branch: master Commit: c8f780be6a993486d69b7e0b80b85cf655eeb569 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8f780be6a993486d69b7e0b8… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Mon Feb 10 22:56:16 2014 +0200 po: Update Lithuanian translation. --- po/lt.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/po/lt.po b/po/lt.po index 9263c6e..efc5cc0 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2014-01-08 21:58+0300\n" +"PO-Revision-Date: 2014-02-10 22:51+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -6589,10 +6589,8 @@ msgid "The username could not be found.\n" msgstr "Naudotojo vardas nerastas.\n" #: winerror.mc:3741 -#, fuzzy -#| msgid "The site does not exist.\n" msgid "This network connection does not exist.\n" -msgstr "Tinklavietė neegzistuoja.\n" +msgstr "Šis tinklo ryšys neegzistuoja.\n" #: localspl.rc:31 localui.rc:31 winspool.rc:30 msgid "Local Port"

1 0

Dmitry Timoshkov : scrrun: Move the counter check into the code block where counter is actually incremented.
by Alexandre Julliard 11 Feb '14

11 Feb '14

Module: wine Branch: master Commit: 173233cfe382ccb06d586d01130c8533f57c8061 URL: http://source.winehq.org/git/wine.git/?a=commit;h=173233cfe382ccb06d586d011… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Feb 10 15:48:27 2014 +0900 scrrun: Move the counter check into the code block where counter is actually incremented. --- dlls/scrrun/filesystem.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 59add71..c41709c 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -540,10 +540,9 @@ static HRESULT WINAPI foldercoll_enumvariant_Next(IEnumVARIANT *iface, ULONG cel V_VT(&var[count]) = VT_DISPATCH; V_DISPATCH(&var[count]) = (IDispatch*)folder; count++; - } - - if (count >= celt) break; + if (count >= celt) break; + } } while (FindNextFileW(handle, &data)); if (fetched)

1 0

Dmitry Timoshkov : scrrun: Fix a file enumeration handle leak.
by Alexandre Julliard 11 Feb '14

11 Feb '14

Module: wine Branch: master Commit: c47ba3a425a745e76a96ec5d4e615cca35cdf38b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c47ba3a425a745e76a96ec5d4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Feb 10 15:48:35 2014 +0900 scrrun: Fix a file enumeration handle leak. --- dlls/scrrun/filesystem.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index c41709c..21aaf70 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -644,6 +644,7 @@ static ULONG WINAPI filecoll_enumvariant_Release(IEnumVARIANT *iface) if (!ref) { IFileCollection_Release(&This->data.u.filecoll.coll->IFileCollection_iface); + FindClose(This->data.u.filecoll.find); heap_free(This); }

1 0

Bruno Jesus : bcrypt: Add semi-stub implementation of BCryptGenRandom.
by Alexandre Julliard 11 Feb '14

11 Feb '14

Module: wine Branch: master Commit: a7578c7ae7ef1aa7bc2e8d0846a0bfc60bc664a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7578c7ae7ef1aa7bc2e8d084… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Feb 10 20:12:15 2014 -0200 bcrypt: Add semi-stub implementation of BCryptGenRandom. --- dlls/bcrypt/Makefile.in | 1 + dlls/bcrypt/bcrypt_main.c | 32 +++++++++++++++++++++++++++++++- dlls/bcrypt/tests/bcrypt.c | 15 +++++++++++++-- 3 files changed, 45 insertions(+), 3 deletions(-) diff --git a/dlls/bcrypt/Makefile.in b/dlls/bcrypt/Makefile.in index f9aacec..87e1429 100644 --- a/dlls/bcrypt/Makefile.in +++ b/dlls/bcrypt/Makefile.in @@ -1,4 +1,5 @@ MODULE = bcrypt.dll +IMPORTS = advapi32 C_SRCS = \ bcrypt_main.c diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 02d0a7d..22da0dd 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -25,6 +25,7 @@ #define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" +#include "ntsecapi.h" #include "bcrypt.h" #include "wine/debug.h" @@ -57,7 +58,36 @@ NTSTATUS WINAPI BCryptEnumAlgorithms(ULONG dwAlgOperations, ULONG *pAlgCount, NTSTATUS WINAPI BCryptGenRandom(BCRYPT_ALG_HANDLE algorithm, UCHAR *buffer, ULONG count, ULONG flags) { - FIXME("%p, %p, %u, %08x - stub\n", algorithm, buffer, count, flags); + const DWORD supported_flags = BCRYPT_USE_SYSTEM_PREFERRED_RNG; + TRACE("%p, %p, %u, %08x - semi-stub\n", algorithm, buffer, count, flags); + if (!algorithm) + { + /* It's valid to call without an algorithm if BCRYPT_USE_SYSTEM_PREFERRED_RNG + * is set. In this case the preferred system RNG is used. + */ + if (!(flags & BCRYPT_USE_SYSTEM_PREFERRED_RNG)) + return STATUS_INVALID_HANDLE; + } + if (!buffer) + return STATUS_INVALID_PARAMETER; + + if (flags & ~supported_flags) + FIXME("unsupported flags %08x\n", flags & ~supported_flags); + + if (algorithm) + FIXME("ignoring selected algorithm\n"); + + /* When zero bytes are requested the function returns success too. */ + if (!count) + return STATUS_SUCCESS; + + if (flags & BCRYPT_USE_SYSTEM_PREFERRED_RNG) + { + if (RtlGenRandom(buffer, count)) + return STATUS_SUCCESS; + } + + FIXME("called with unsupported parameters, returning error\n"); return STATUS_NOT_IMPLEMENTED; } diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 1d18634..288e745 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -53,7 +53,6 @@ static void test_BCryptGenRandom(void) return; } - todo_wine { ret = pBCryptGenRandom(NULL, NULL, 0, 0); ok(ret == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got 0x%x\n", ret); ret = pBCryptGenRandom(NULL, buffer, 0, 0); @@ -62,9 +61,21 @@ static void test_BCryptGenRandom(void) ok(ret == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got 0x%x\n", ret); ret = pBCryptGenRandom(NULL, buffer, sizeof(buffer), BCRYPT_USE_SYSTEM_PREFERRED_RNG); ok(ret == STATUS_SUCCESS, "Expected success, got 0x%x\n", ret); + ret = pBCryptGenRandom(NULL, buffer, sizeof(buffer), + BCRYPT_USE_SYSTEM_PREFERRED_RNG|BCRYPT_RNG_USE_ENTROPY_IN_BUFFER); + ok(ret == STATUS_SUCCESS, "Expected success, got 0x%x\n", ret); ret = pBCryptGenRandom(NULL, NULL, sizeof(buffer), BCRYPT_USE_SYSTEM_PREFERRED_RNG); ok(ret == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got 0x%x\n", ret); - } + + /* Zero sized buffer should work too */ + ret = pBCryptGenRandom(NULL, buffer, 0, BCRYPT_USE_SYSTEM_PREFERRED_RNG); + ok(ret == STATUS_SUCCESS, "Expected success, got 0x%x\n", ret); + + /* Test random number generation - It's impossible for a sane RNG to return 8 zeros */ + memset(buffer, 0, 16); + ret = pBCryptGenRandom(NULL, buffer, 8, BCRYPT_USE_SYSTEM_PREFERRED_RNG); + ok(ret == STATUS_SUCCESS, "Expected success, got 0x%x\n", ret); + ok(memcmp(buffer, buffer + 8, 8), "Expected a random number, got 0\n"); } START_TEST(bcrypt)

1 0

Alistair Leslie-Hughes : dpnet/tests: Add DirectPlay8Server tests.
by Alexandre Julliard 11 Feb '14

11 Feb '14

Module: wine Branch: master Commit: 1500a8a937bcfccf1d2e1c02b3f10be74b1a2e1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1500a8a937bcfccf1d2e1c02b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Feb 3 14:26:58 2014 +1100 dpnet/tests: Add DirectPlay8Server tests. --- dlls/dpnet/tests/server.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/dlls/dpnet/tests/server.c b/dlls/dpnet/tests/server.c index f3b1da2..723f829 100644 --- a/dlls/dpnet/tests/server.c +++ b/dlls/dpnet/tests/server.c @@ -22,8 +22,27 @@ #include <dplay8.h> #include "wine/test.h" +/* {CD0C3D4B-E15E-4CF2-9EA8-6E1D6548C5A5} */ +static const GUID appguid = { 0xcd0c3d4b, 0xe15e, 0x4cf2, { 0x9e, 0xa8, 0x6e, 0x1d, 0x65, 0x48, 0xc5, 0xa5 } }; +static WCHAR sessionname[] = {'w','i','n','e','g','a','m','e','s','s','e','r','v','e','r',0}; + +static BOOL nCreatePlayer; +static BOOL nDestroyPlayer; + static HRESULT WINAPI DirectPlayMessageHandler(PVOID pvUserContext, DWORD dwMessageId, PVOID pMsgBuffer) { + trace("msgid: 0x%08x\n", dwMessageId); + + switch(dwMessageId) + { + case DPN_MSGID_CREATE_PLAYER: + nCreatePlayer = TRUE; + break; + case DPN_MSGID_DESTROY_PLAYER: + nDestroyPlayer = TRUE; + break; + } + return S_OK; } @@ -46,8 +65,31 @@ static void create_server(void) ok(hr == S_OK, "got 0x%08x\n", hr); if(hr == S_OK) { + IDirectPlay8Address *localaddr = NULL; + DPN_APPLICATION_DESC appdesc; + + hr = CoCreateInstance( &CLSID_DirectPlay8Address, NULL, CLSCTX_ALL, &IID_IDirectPlay8Address, (LPVOID*)&localaddr); + ok(hr == S_OK, "Failed to create IDirectPlay8Address object"); + + hr = IDirectPlay8Address_SetSP(localaddr, &CLSID_DP8SP_TCPIP); + ok(hr == S_OK, "got 0x%08x\n", hr); + + memset( &appdesc, 0, sizeof(DPN_APPLICATION_DESC) ); + appdesc.dwSize = sizeof( DPN_APPLICATION_DESC ); + appdesc.dwFlags = DPNSESSION_CLIENT_SERVER; + appdesc.guidApplication = appguid; + appdesc.pwszSessionName = sessionname; + + hr = IDirectPlay8Server_Host(server, &appdesc, &localaddr, 1, NULL, NULL, NULL, 0); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + + todo_wine ok(nCreatePlayer, "No DPN_MSGID_CREATE_PLAYER Message\n"); + ok(!nDestroyPlayer, "Received DPN_MSGID_DESTROY_PLAYER Message\n"); + hr = IDirectPlay8Server_Close(server, 0); todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + + todo_wine ok(nDestroyPlayer, "No DPN_MSGID_DESTROY_PLAYER Message\n"); } IDirectPlay8Server_Release(server);

1 0