February 2014 - Wine-Commits

Henri Verbeet : dxgi/tests: Add tests for CreateDXGIFactory().
by Alexandre Julliard Feb. 11, 2014

Feb. 11, 2014

Module: wine Branch: master Commit: e806b5bab9dfd0e5a0f625f810f85d23f39ef705 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e806b5bab9dfd0e5a0f625f81… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 11 11:42:21 2014 +0100 dxgi/tests: Add tests for CreateDXGIFactory(). --- dlls/dxgi/tests/device.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index f44e831..b4337fa 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -21,6 +21,8 @@ #include "d3d10.h" #include "wine/test.h" +static HRESULT (WINAPI *pCreateDXGIFactory1)(REFIID iid, void **factory); + static IDXGIDevice *create_device(void) { IDXGIDevice *dxgi_device; @@ -499,12 +501,78 @@ static void test_createswapchain(void) ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_create_factory(void) +{ + IDXGIFactory1 *factory; + IUnknown *iface; + HRESULT hr; + + iface = (void *)0xdeadbeef; + hr = CreateDXGIFactory(&IID_IDXGIDevice, (void **)&iface); + ok(hr == E_NOINTERFACE, "Got unexpected hr %#x.\n", hr); + ok(!iface, "Got unexpected iface %p.\n", iface); + + hr = CreateDXGIFactory(&IID_IUnknown, (void **)&iface); + ok(SUCCEEDED(hr), "Failed to create factory with IID_IUnknown, hr %#x.\n", hr); + IUnknown_Release(iface); + + hr = CreateDXGIFactory(&IID_IDXGIObject, (void **)&iface); + ok(SUCCEEDED(hr), "Failed to create factory with IID_IDXGIObject, hr %#x.\n", hr); + IUnknown_Release(iface); + + factory = (void *)0xdeadbeef; + hr = CreateDXGIFactory(&IID_IDXGIFactory, (void **)&iface); + ok(SUCCEEDED(hr), "Failed to create factory with IID_IDXGIFactory, hr %#x.\n", hr); + hr = IUnknown_QueryInterface(iface, &IID_IDXGIFactory1, (void **)&factory); + ok(hr == E_NOINTERFACE, "Got unexpected hr %#x.\n", hr); + ok(!factory, "Got unexpected factory %p.\n", factory); + IUnknown_Release(iface); + + iface = (void *)0xdeadbeef; + hr = CreateDXGIFactory(&IID_IDXGIFactory1, (void **)&iface); + ok(hr == E_NOINTERFACE, "Got unexpected hr %#x.\n", hr); + ok(!iface, "Got unexpected iface %p.\n", iface); + + if (!pCreateDXGIFactory1) + { + win_skip("CreateDXGIFactory1 not available, skipping tests.\n"); + return; + } + + iface = (void *)0xdeadbeef; + hr = pCreateDXGIFactory1(&IID_IDXGIDevice, (void **)&iface); + ok(hr == E_NOINTERFACE, "Got unexpected hr %#x.\n", hr); + ok(!iface, "Got unexpected iface %p.\n", iface); + + hr = pCreateDXGIFactory1(&IID_IUnknown, (void **)&iface); + ok(SUCCEEDED(hr), "Failed to create factory with IID_IUnknown, hr %#x.\n", hr); + IUnknown_Release(iface); + + hr = pCreateDXGIFactory1(&IID_IDXGIObject, (void **)&iface); + ok(SUCCEEDED(hr), "Failed to create factory with IID_IDXGIObject, hr %#x.\n", hr); + IUnknown_Release(iface); + + hr = pCreateDXGIFactory1(&IID_IDXGIFactory, (void **)&iface); + ok(SUCCEEDED(hr), "Failed to create factory with IID_IDXGIFactory, hr %#x.\n", hr); + hr = IUnknown_QueryInterface(iface, &IID_IDXGIFactory1, (void **)&factory); + ok(SUCCEEDED(hr), "Failed to query IDXGIFactory1 interface, hr %#x.\n", hr); + IDXGIFactory1_Release(factory); + IUnknown_Release(iface); + + hr = pCreateDXGIFactory1(&IID_IDXGIFactory1, (void **)&iface); + ok(SUCCEEDED(hr), "Failed to create factory with IID_IDXGIFactory1, hr %#x.\n", hr); + IUnknown_Release(iface); +} + START_TEST(device) { + pCreateDXGIFactory1 = (void *)GetProcAddress(GetModuleHandleA("dxgi.dll"), "CreateDXGIFactory1"); + test_adapter_desc(); test_device_interfaces(); test_create_surface(); test_parents(); test_output(); test_createswapchain(); + test_create_factory(); }

1 0

Nikolay Sivov : ole32: Remove ERR() output that's not really helpful.
by Alexandre Julliard Feb. 11, 2014

Feb. 11, 2014

Module: wine Branch: master Commit: e593c3068c4a9ea4c094a38204cb355a37fd015c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e593c3068c4a9ea4c094a3820… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 11 08:35:08 2014 +0400 ole32: Remove ERR() output that's not really helpful. --- dlls/ole32/compobj.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index e615599..4429627 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -2378,10 +2378,7 @@ HRESULT WINAPI ProgIDFromCLSID(REFCLSID clsid, LPOLESTR *ppszProgID) LONG progidlen = 0; if (!ppszProgID) - { - ERR("ppszProgId isn't optional\n"); return E_INVALIDARG; - } *ppszProgID = NULL; @@ -2449,10 +2446,7 @@ HRESULT WINAPI CLSIDFromProgID(LPCOLESTR progid, LPCLSID clsid) ACTCTX_SECTION_KEYED_DATA data; if (!progid || !clsid) - { - ERR("neither progid (%p) nor clsid (%p) are optional\n", progid, clsid); return E_INVALIDARG; - } data.cbSize = sizeof(data); if (FindActCtxSectionStringW(0, NULL, ACTIVATION_CONTEXT_SECTION_COM_PROGID_REDIRECTION, @@ -2534,10 +2528,7 @@ HRESULT WINAPI CoGetPSClsid(REFIID riid, CLSID *pclsid) } if (!pclsid) - { - ERR("pclsid isn't optional\n"); return E_INVALIDARG; - } EnterCriticalSection(&apt->cs);

1 0

Nikolay Sivov : ole32: Use precomposed table for GUID from string conversion.
by Alexandre Julliard Feb. 11, 2014

Feb. 11, 2014

Module: wine Branch: master Commit: 747c649d99dceffd03bb1458fa17049618501b67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=747c649d99dceffd03bb1458f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 11 08:34:41 2014 +0400 ole32: Use precomposed table for GUID from string conversion. --- dlls/ole32/compobj.c | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 719d9de..e615599 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -2065,11 +2065,21 @@ static inline BOOL is_valid_hex(WCHAR c) return TRUE; } +static const BYTE guid_conv_table[256] = +{ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x00 */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x10 */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x20 */ + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 0, 0, 0, 0, 0, /* 0x30 */ + 0, 0xa, 0xb, 0xc, 0xd, 0xe, 0xf, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x40 */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x50 */ + 0, 0xa, 0xb, 0xc, 0xd, 0xe, 0xf /* 0x60 */ +}; + /* conversion helper for CLSIDFromString/IIDFromString */ static BOOL guid_from_string(LPCWSTR s, GUID *id) { int i; - BYTE table[256]; if (!s || s[0]!='{') { memset( id, 0, sizeof (CLSID) ); @@ -2079,37 +2089,26 @@ static BOOL guid_from_string(LPCWSTR s, GUID *id) TRACE("%s -> %p\n", debugstr_w(s), id); - /* quick lookup table */ - memset(table, 0, 256); - - for (i = 0; i < 10; i++) { - table['0' + i] = i; - } - for (i = 0; i < 6; i++) { - table['A' + i] = i+10; - table['a' + i] = i+10; - } - /* in form {XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX} */ id->Data1 = 0; for (i = 1; i < 9; i++) { if (!is_valid_hex(s[i])) return FALSE; - id->Data1 = (id->Data1 << 4) | table[s[i]]; + id->Data1 = (id->Data1 << 4) | guid_conv_table[s[i]]; } if (s[9]!='-') return FALSE; id->Data2 = 0; for (i = 10; i < 14; i++) { if (!is_valid_hex(s[i])) return FALSE; - id->Data2 = (id->Data2 << 4) | table[s[i]]; + id->Data2 = (id->Data2 << 4) | guid_conv_table[s[i]]; } if (s[14]!='-') return FALSE; id->Data3 = 0; for (i = 15; i < 19; i++) { if (!is_valid_hex(s[i])) return FALSE; - id->Data3 = (id->Data3 << 4) | table[s[i]]; + id->Data3 = (id->Data3 << 4) | guid_conv_table[s[i]]; } if (s[19]!='-') return FALSE; @@ -2119,7 +2118,7 @@ static BOOL guid_from_string(LPCWSTR s, GUID *id) i++; } if (!is_valid_hex(s[i]) || !is_valid_hex(s[i+1])) return FALSE; - id->Data4[(i-20)/2] = table[s[i]] << 4 | table[s[i+1]]; + id->Data4[(i-20)/2] = guid_conv_table[s[i]] << 4 | guid_conv_table[s[i+1]]; } if (s[37] == '}' && s[38] == '\0')

1 0

Jacek Caban : wmp: Added GetMiscStatus implementation.
by Alexandre Julliard Feb. 11, 2014

Feb. 11, 2014

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

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

Feb. 11, 2014

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

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

Feb. 11, 2014

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

Henri Verbeet : d3d10core: Implement ID3D10Device1.
by Alexandre Julliard Feb. 11, 2014

Feb. 11, 2014

Module: wine Branch: master Commit: 409c872c996337a85992e44e12e1acce716e291d URL: http://source.winehq.org/git/wine.git/?a=commit;h=409c872c996337a85992e44e1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 11 11:42:23 2014 +0100 d3d10core: Implement ID3D10Device1. --- dlls/d3d10core/d3d10core_private.h | 6 +- dlls/d3d10core/device.c | 270 ++++++++++++++++++++---------------- dlls/d3d10core/texture.c | 7 +- dlls/dxgi/tests/device.c | 2 +- 4 files changed, 157 insertions(+), 128 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=409c872c996337a85992e…

1 0

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

Feb. 11, 2014

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

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard Feb. 11, 2014

Feb. 11, 2014

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 : advapi32/tests: Correct the test failure message.
by Alexandre Julliard Feb. 11, 2014

Feb. 11, 2014

Module: wine Branch: master Commit: 9c010d70b02153ac3d074c7f446ed3ee61e4026e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c010d70b02153ac3d074c7f4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Feb 11 09:10:42 2014 +0900 advapi32/tests: Correct the test failure message. --- dlls/advapi32/tests/security.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 044c3f0..907c73b 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -4988,7 +4988,7 @@ static void test_filemap_security(void) } else { - ok(!mapping, "CreateFileMapping(%04x) error %d\n", prot_map[i].prot, GetLastError()); + ok(!mapping, "CreateFileMapping(%04x) should fail\n", prot_map[i].prot); ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); continue; }

1 0