March 2017 - Wine-commits - list.winehq.org

Louis Lenders : wmvcore: Add version resource.
by Alexandre Julliard 02 Mar '17

02 Mar '17

Module: wine Branch: master Commit: 55fa550a02991b94c2981a630746a9fd45f5dc84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55fa550a02991b94c2981a630… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Wed Mar 1 19:53:06 2017 +0100 wmvcore: Add version resource. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmvcore/Makefile.in | 2 ++ dlls/wmvcore/version.rc | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/dlls/wmvcore/Makefile.in b/dlls/wmvcore/Makefile.in index bec1032..ba3539b 100644 --- a/dlls/wmvcore/Makefile.in +++ b/dlls/wmvcore/Makefile.in @@ -4,3 +4,5 @@ IMPORTS = kernel32 C_SRCS = \ wmvcore_main.c \ writer.c + +RC_SRCS = version.rc diff --git a/dlls/wmvcore/version.rc b/dlls/wmvcore/version.rc new file mode 100644 index 0000000..445a399 --- /dev/null +++ b/dlls/wmvcore/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2017 Louis Lenders + * + * 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 + */ + +#define WINE_FILEDESCRIPTION_STR "Wine Media Playback dll" +#define WINE_FILENAME_STR "wmvcore.dll" +#define WINE_FILEVERSION 12,0,7601,17514 +#define WINE_FILEVERSION_STR "12.0.7601.17514" +#define WINE_PRODUCTVERSION 12,0,7601,17514 +#define WINE_PRODUCTVERSION_STR "12.0.7601.17514" + +#include "wine/wine_common_ver.rc"

1 0

Bruno Jesus : winmm: Cope with empty string in mciSendString.
by Alexandre Julliard 02 Mar '17

02 Mar '17

Module: wine Branch: master Commit: 4c46b3d0912c207fcc69956e6ceb5aa4f1e74e6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c46b3d0912c207fcc69956e6… Author: Bruno Jesus <bjesus(a)codeweavers.com> Date: Wed Mar 1 01:18:20 2017 -0300 winmm: Cope with empty string in mciSendString. Signed-off-by: Bruno Jesus <bjesus(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/mci.c | 3 +++ dlls/winmm/tests/mci.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index b8adea6..f772388 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -1343,6 +1343,9 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet, debugstr_w(lpstrCommand), lpstrRet, uRetLen, hwndCallback); if (lpstrRet && uRetLen) *lpstrRet = '\0'; + if (!lpstrCommand[0]) + return MCIERR_MISSING_COMMAND_STRING; + /* format is <command> <device> <optargs> */ if (!(verb = HeapAlloc(GetProcessHeap(), 0, (strlenW(lpstrCommand)+1) * sizeof(WCHAR)))) return MCIERR_OUT_OF_MEMORY; diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index 9ff6c58..52790c8 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -198,7 +198,7 @@ static void test_mciParser(HWND hwnd) buf[0]='z'; err = mciSendStringA("", buf, sizeof(buf), NULL); - todo_wine ok(err==MCIERR_MISSING_COMMAND_STRING,"empty string: %s\n", dbg_mcierr(err)); + ok(err==MCIERR_MISSING_COMMAND_STRING,"empty string: %s\n", dbg_mcierr(err)); ok(!buf[0], "error buffer %s\n", buf); buf[0]='d';

1 0

Thomas Faber : msacm32: Free session driver instance using the correct heap.
by Alexandre Julliard 02 Mar '17

02 Mar '17

Module: wine Branch: master Commit: 7966efda075c7d9f812c9c3a4af266e667627d20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7966efda075c7d9f812c9c3a4… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Wed Mar 1 11:48:16 2017 +0100 msacm32: Free session driver instance using the correct heap. Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msacm32/internal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msacm32/internal.c b/dlls/msacm32/internal.c index b3f6bf3..7bafcaa 100644 --- a/dlls/msacm32/internal.c +++ b/dlls/msacm32/internal.c @@ -1085,7 +1085,7 @@ LRESULT MSACM_CloseLocalDriver(PWINE_ACMLOCALDRIVERINST paldrv) MSACM_DRIVER_SendMessage(lpDrv0, DRV_CLOSE, 0L, 0L); lpDrv0->dwDriverID = 0; MSACM_RemoveFromList(lpDrv0); - HeapFree(GetProcessHeap(), 0, lpDrv0); + HeapFree(MSACM_hHeap, 0, lpDrv0); } HeapFree(MSACM_hHeap, 0, paldrv);

1 0

Jacek Caban : secur32: Added support for SECPKG_ATTR_ENDPOINT_BINDINGS in schannel.
by Alexandre Julliard 02 Mar '17

02 Mar '17

Module: wine Branch: master Commit: 0706ba1114dc5c6a24d1ae21334bc88415c0d359 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0706ba1114dc5c6a24d1ae213… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 2 13:45:53 2017 +0100 secur32: Added support for SECPKG_ATTR_ENDPOINT_BINDINGS in schannel. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel.c | 78 +++++++++++++++++++++++++++++++++++-------- dlls/secur32/tests/schannel.c | 42 +++++++++++++++++++++++ 2 files changed, 107 insertions(+), 13 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 71f219c..6914837 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -23,6 +23,7 @@ #include <stdarg.h> #include <errno.h> +#define NONAMELESSUNION #include "windef.h" #include "winbase.h" #include "winreg.h" @@ -961,6 +962,23 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextA( return ret; } +static SECURITY_STATUS ensure_remote_cert(struct schan_context *ctx) +{ + HCERTSTORE cert_store; + SECURITY_STATUS status; + + if(ctx->cert) + return SEC_E_OK; + + cert_store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); + if(!cert_store) + return GetLastError(); + + status = schan_imp_get_session_peer_certificate(ctx->session, cert_store, &ctx->cert); + CertCloseStore(cert_store, 0); + return status; +} + static SECURITY_STATUS SEC_ENTRY schan_QueryContextAttributesW( PCtxtHandle context_handle, ULONG attribute, PVOID buffer) { @@ -1001,20 +1019,11 @@ static SECURITY_STATUS SEC_ENTRY schan_QueryContextAttributesW( case SECPKG_ATTR_REMOTE_CERT_CONTEXT: { PCCERT_CONTEXT *cert = buffer; + SECURITY_STATUS status; - if (!ctx->cert) { - HCERTSTORE cert_store; - SECURITY_STATUS status; - - cert_store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); - if(!cert_store) - return GetLastError(); - - status = schan_imp_get_session_peer_certificate(ctx->session, cert_store, &ctx->cert); - CertCloseStore(cert_store, 0); - if(status != SEC_E_OK) - return status; - } + status = ensure_remote_cert(ctx); + if(status != SEC_E_OK) + return status; *cert = CertDuplicateCertificateContext(ctx->cert); return SEC_E_OK; @@ -1024,6 +1033,47 @@ static SECURITY_STATUS SEC_ENTRY schan_QueryContextAttributesW( SecPkgContext_ConnectionInfo *info = buffer; return schan_imp_get_connection_info(ctx->session, info); } + case SECPKG_ATTR_ENDPOINT_BINDINGS: + { + SecPkgContext_Bindings *bindings = buffer; + CCRYPT_OID_INFO *info; + ALG_ID hash_alg = CALG_SHA_256; + BYTE hash[1024]; + DWORD hash_size; + SECURITY_STATUS status; + char *p; + BOOL r; + + static const char prefix[] = "tls-server-end-point:"; + + status = ensure_remote_cert(ctx); + if(status != SEC_E_OK) + return status; + + /* RFC 5929 */ + info = CryptFindOIDInfo(CRYPT_OID_INFO_OID_KEY, ctx->cert->pCertInfo->SignatureAlgorithm.pszObjId, 0); + if(info && info->u.Algid != CALG_SHA1 && info->u.Algid != CALG_MD5) + hash_alg = info->u.Algid; + + hash_size = sizeof(hash); + r = CryptHashCertificate(0, hash_alg, 0, ctx->cert->pbCertEncoded, ctx->cert->cbCertEncoded, hash, &hash_size); + if(!r) + return GetLastError(); + + bindings->BindingsLength = sizeof(*bindings->Bindings) + sizeof(prefix)-1 + hash_size; + bindings->Bindings = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, bindings->BindingsLength); + if(!bindings->Bindings) + return SEC_E_INSUFFICIENT_MEMORY; + + bindings->Bindings->cbApplicationDataLength = sizeof(prefix)-1 + hash_size; + bindings->Bindings->dwApplicationDataOffset = sizeof(*bindings->Bindings); + + p = (char*)(bindings->Bindings+1); + memcpy(p, prefix, sizeof(prefix)-1); + p += sizeof(prefix)-1; + memcpy(p, hash, hash_size); + return SEC_E_OK; + } default: FIXME("Unhandled attribute %#x\n", attribute); @@ -1045,6 +1095,8 @@ static SECURITY_STATUS SEC_ENTRY schan_QueryContextAttributesA( return schan_QueryContextAttributesW(context_handle, attribute, buffer); case SECPKG_ATTR_CONNECTION_INFO: return schan_QueryContextAttributesW(context_handle, attribute, buffer); + case SECPKG_ATTR_ENDPOINT_BINDINGS: + return schan_QueryContextAttributesW(context_handle, attribute, buffer); default: FIXME("Unhandled attribute %#x\n", attribute); diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index a858488..b52510d 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -870,7 +870,49 @@ todo_wine status = pQueryContextAttributesA(&context, SECPKG_ATTR_REMOTE_CERT_CONTEXT, (void*)&cert); ok(status == SEC_E_OK, "QueryContextAttributesW(SECPKG_ATTR_REMOTE_CERT_CONTEXT) failed: %08x\n", status); if(status == SEC_E_OK) { + SecPkgContext_Bindings bindings = {0xdeadbeef, (void*)0xdeadbeef}; + test_remote_cert(cert); + + status = pQueryContextAttributesA(&context, SECPKG_ATTR_ENDPOINT_BINDINGS, &bindings); + ok(status == SEC_E_OK || broken(status == SEC_E_UNSUPPORTED_FUNCTION), + "QueryContextAttributesW(SECPKG_ATTR_ENDPOINT_BINDINGS) failed: %08x\n", status); + if(status == SEC_E_OK) { + static const char prefix[] = "tls-server-end-point:"; + const char *p; + BYTE hash[64]; + DWORD hash_size; + + ok(bindings.BindingsLength == sizeof(*bindings.Bindings) + sizeof(prefix)-1 + 32 /* hash size */, + "bindings.BindingsLength = %u\n", bindings.BindingsLength); + ok(!bindings.Bindings->dwInitiatorAddrType, "dwInitiatorAddrType = %x\n", bindings.Bindings->dwInitiatorAddrType); + ok(!bindings.Bindings->cbInitiatorLength, "cbInitiatorLength = %x\n", bindings.Bindings->cbInitiatorLength); + ok(!bindings.Bindings->dwInitiatorOffset, "dwInitiatorOffset = %x\n", bindings.Bindings->dwInitiatorOffset); + ok(!bindings.Bindings->dwAcceptorAddrType, "dwAcceptorAddrType = %x\n", bindings.Bindings->dwAcceptorAddrType); + ok(!bindings.Bindings->cbAcceptorLength, "cbAcceptorLength = %x\n", bindings.Bindings->cbAcceptorLength); + ok(!bindings.Bindings->dwAcceptorOffset, "dwAcceptorOffset = %x\n", bindings.Bindings->dwAcceptorOffset); + ok(sizeof(*bindings.Bindings) + bindings.Bindings->cbApplicationDataLength == bindings.BindingsLength, + "cbApplicationDataLength = %x\n", bindings.Bindings->cbApplicationDataLength); + ok(bindings.Bindings->dwApplicationDataOffset == sizeof(*bindings.Bindings), + "dwApplicationDataOffset = %x\n", bindings.Bindings->dwApplicationDataOffset); + p = (const char*)(bindings.Bindings+1); + ok(!memcmp(p, prefix, sizeof(prefix)-1), "missing prefix\n"); + p += sizeof(prefix)-1; + + hash_size = sizeof(hash); + ret = CryptHashCertificate(0, CALG_SHA_256, 0, cert->pbCertEncoded, cert->cbCertEncoded, hash, &hash_size); + if(ret) { + ok(hash_size == 32, "hash_size = %u\n", hash_size); + ok(!memcmp(hash, p, hash_size), "unexpected hash part\n"); + }else { + win_skip("SHA 256 hash not supported.\n"); + } + + FreeContextBuffer(bindings.Bindings); + }else { + win_skip("SECPKG_ATTR_ENDPOINT_BINDINGS not supported\n"); + } + CertFreeCertificateContext(cert); }

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 02 Mar '17

02 Mar '17

Module: wine Branch: master Commit: ded35e312c8f3f328d82674999b53bb053aba629 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ded35e312c8f3f328d8267499… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Mar 2 16:35:46 2017 +0200 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/po/fi.po b/po/fi.po index f786d63..e7a7059 100644 --- a/po/fi.po +++ b/po/fi.po @@ -12197,17 +12197,13 @@ msgid "Exports selected branch of the registry to a text file" msgstr "Vie rekisterin valitun haaran tekstitiedostoon" #: regedit.rc:187 -#, fuzzy -#| msgid "Confirm Value Delete" msgid "Confirm Key Delete" -msgstr "Vahvista arvon tuhoaminen" +msgstr "Vahvista avaimen tuhoaminen" #: regedit.rc:188 -#, fuzzy -#| msgid "Are you sure you want to delete the registry key '%1'?" msgid "" "Are you sure you want to delete the registry key '%1' and all of its subkeys?" -msgstr "Haluatko varmasti tuhota rekisteriavaimen '%1'?" +msgstr "Haluatko varmasti tuhota rekisteriavaimen '%1' ja sen aliavaimet?" #: regsvr32.rc:32 msgid ""

1 0

Lauri Kenttä : readme: Update Finnish translation.
by Alexandre Julliard 02 Mar '17

02 Mar '17

Module: wine Branch: master Commit: 9333f6e3300bb29a8012815433c0075ab1072bb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9333f6e3300bb29a801281543… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Mar 2 16:43:57 2017 +0200 readme: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- documentation/README.fi | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/documentation/README.fi b/documentation/README.fi index 5e03199..4109090 100644 --- a/documentation/README.fi +++ b/documentation/README.fi @@ -12,11 +12,10 @@ lisenssistä on englanniksi tiedostossa LICENSE. 2. PIKAOPAS -Kun Wine käännetään lähdekoodeistaan, on suositeltavaa käyttää Winen omaa -asennusohjelmaa, joka ajetaan seuraavalla komennolla Winen lähdekoodin -juurihakemistosta: +Aja Winen lähdekoodin juurihakemistossa seuraavat komennot: -./tools/wineinstall +./configure +make Ohjelmat ajetaan komennolla "wine ohjelma". Lisätietoja sekä apua ongelmien ratkaisemiseen on jäljempänä tässä tiedostossa, Winen man-sivuilla sekä @@ -81,8 +80,7 @@ Valinnaisia tukikirjastoja: 4. KÄÄNTÄMINEN -Aiemmin mainitun wineinstall-skriptin sijaan Winen voi kääntää myös -seuraavilla komennoilla: +Winen voi kääntää seuraavilla komennoilla: ./configure make @@ -95,6 +93,8 @@ kääntämiseen Unixissa. Komento './configure --help' näyttää asetuksia ja valintoja, joita käännösprosessiin voi lisätä. +Lisätietoja on osoitteessa https://wiki.winehq.org/Building_Wine + 5. ASENNUS Kun Wine on käännetty, komento "make install" asentaa Winen sekä sen man-sivut

1 0

Lauri Kenttä : readme: Update Swedish translation.
by Alexandre Julliard 02 Mar '17

02 Mar '17

Module: wine Branch: master Commit: 50a047b1bb370bb02ffbbe945454236f24d0ac7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=50a047b1bb370bb02ffbbe945… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Mar 2 16:44:11 2017 +0200 readme: Update Swedish translation. The actual updates concern the removal of wineinstall. Use the opportunity to convert to UTF-8 as well. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- documentation/README.sv | 174 ++++++++++++++++++++++++------------------------ 1 file changed, 88 insertions(+), 86 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=50a047b1bb370bb02ffbb…

1 0

Huw Davies : oledb32: Fix conversion of strings with embedded '\0' to DBTYPE_STR | DBTYPE_BYREF.
by Alexandre Julliard 01 Mar '17

01 Mar '17

Module: wine Branch: master Commit: aedd6e951c4753b166f6c42ffa47557cfdfd2c31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aedd6e951c4753b166f6c42ff… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 1 11:32:07 2017 +0000 oledb32: Fix conversion of strings with embedded '\0' to DBTYPE_STR | DBTYPE_BYREF. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/convert.c | 4 ++-- dlls/oledb32/tests/convert.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index e3e29e0..eadac76 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -876,13 +876,13 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, precision, scale, flags); if(hr != S_OK) return hr; - length = WideCharToMultiByte(CP_ACP, 0, b, -1, NULL, 0, NULL, NULL); + length = WideCharToMultiByte(CP_ACP, 0, b, SysStringLen(b) + 1, NULL, 0, NULL, NULL); *dst_len = length - 1; /* Doesn't include size for '\0' */ *dst_status = DBSTATUS_S_OK; *d = CoTaskMemAlloc(length); if(*d) - WideCharToMultiByte(CP_ACP, 0, b, -1, *d, length, NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, b, SysStringLen(b) + 1, *d, length, NULL, NULL); else hr = E_OUTOFMEMORY; SysFreeString(b); diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 663f78e..5d0fd17 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -2155,6 +2155,7 @@ static void test_converttobyrefstr(void) DBSTATUS dst_status; DBLENGTH dst_len; static const WCHAR ten[] = {'1','0',0}; + static const char withnull[] = "test\0ed"; BSTR b; VARIANT v; @@ -2232,6 +2233,37 @@ static void test_converttobyrefstr(void) ok(!lstrcmpA("10", dst), "got %s\n", dst); CoTaskMemFree(dst); + memcpy(src, withnull, sizeof(withnull)); + dst_len = 0x1234; + hr = IDataConvert_DataConvert(convert, DBTYPE_STR, DBTYPE_STR | DBTYPE_BYREF, sizeof(withnull), &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == 8, "got %ld\n", dst_len); + ok(!memcmp(withnull, dst, 8), "got %s\n", dst); + ok(dst[8] == 0, "got %02x\n", dst[8]); + CoTaskMemFree(dst); + + memcpy(src, withnull, sizeof(withnull)); + dst_len = 0x1234; + hr = IDataConvert_DataConvert(convert, DBTYPE_STR, DBTYPE_STR | DBTYPE_BYREF, 7, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == 7, "got %ld\n", dst_len); + ok(!memcmp(withnull, dst, 7), "got %s\n", dst); + ok(dst[7] == 0, "got %02x\n", dst[7]); + CoTaskMemFree(dst); + + memcpy(src, withnull, sizeof(withnull)); + dst_len = 0x1234; + hr = IDataConvert_DataConvert(convert, DBTYPE_STR, DBTYPE_STR | DBTYPE_BYREF, 6, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == 6, "got %ld\n", dst_len); + ok(!memcmp(withnull, dst, 6), "got %s\n", dst); + ok(dst[6] == 0, "got %02x\n", dst[6]); + CoTaskMemFree(dst); + + dst_len = 44; V_VT(&v) = VT_NULL; hr = IDataConvert_DataConvert(convert, DBTYPE_VARIANT, DBTYPE_STR | DBTYPE_BYREF, 0, &dst_len, &v, dst, sizeof(dst), 0, &dst_status, 0, 0, 0);

1 0

Piotr Caban : msvcp140: Add task_continuation_context constructor implementation.
by Alexandre Julliard 01 Mar '17

01 Mar '17

Module: wine Branch: master Commit: 10b36e3977edb214f5451fcaf6f9c316465c01e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10b36e3977edb214f5451fcaf… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 1 13:18:01 2017 +0100 msvcp140: Add task_continuation_context constructor implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 6 ++-- dlls/msvcp140/tests/msvcp140.c | 72 ++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/misc.c | 17 ++++++++++ 3 files changed, 92 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index ee31c77..9da2675 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -358,9 +358,9 @@ @ cdecl -arch=arm ??0ios_base(a)std@@IAA(a)XZ(ptr) ios_base_ctor @ thiscall -arch=i386 ??0ios_base(a)std@@IAE(a)XZ(ptr) ios_base_ctor @ cdecl -arch=win64 ??0ios_base(a)std@@IEAA(a)XZ(ptr) ios_base_ctor -@ stub -arch=arm ??0task_continuation_context(a)Concurrency@@AAA(a)XZ -@ stub -arch=i386 ??0task_continuation_context(a)Concurrency@@AAE(a)XZ -@ stub -arch=win64 ??0task_continuation_context(a)Concurrency@@AEAA(a)XZ +@ cdecl -arch=arm ??0task_continuation_context(a)Concurrency@@AAA(a)XZ(ptr) task_continuation_context_ctor +@ thiscall -arch=i386 ??0task_continuation_context(a)Concurrency@@AAE(a)XZ(ptr) task_continuation_context_ctor +@ cdecl -arch=win64 ??0task_continuation_context(a)Concurrency@@AEAA(a)XZ(ptr) task_continuation_context_ctor @ stub -arch=arm ??0time_base(a)std@@QAA(a)I@Z @ stub -arch=i386 ??0time_base(a)std@@QAE(a)I@Z @ stub -arch=win64 ??0time_base(a)std@@QEAA(a)_K@Z diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index 82e2b34..db241ca 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -21,7 +21,57 @@ #include "wine/test.h" #include "winbase.h" +#undef __thiscall +#ifdef __i386__ +#define __thiscall __stdcall +#else +#define __thiscall __cdecl +#endif + +/* Emulate a __thiscall */ +#ifdef __i386__ + +#include "pshpack1.h" +struct thiscall_thunk +{ + BYTE pop_eax; /* popl %eax (ret addr) */ + BYTE pop_edx; /* popl %edx (func) */ + BYTE pop_ecx; /* popl %ecx (this) */ + BYTE push_eax; /* pushl %eax */ + WORD jmp_edx; /* jmp *%edx */ +}; +#include "poppack.h" + +static void * (WINAPI *call_thiscall_func1)( void *func, void *this ); + +static void init_thiscall_thunk(void) +{ + struct thiscall_thunk *thunk = VirtualAlloc( NULL, sizeof(*thunk), + MEM_COMMIT, PAGE_EXECUTE_READWRITE ); + thunk->pop_eax = 0x58; /* popl %eax */ + thunk->pop_edx = 0x5a; /* popl %edx */ + thunk->pop_ecx = 0x59; /* popl %ecx */ + thunk->push_eax = 0x50; /* pushl %eax */ + thunk->jmp_edx = 0xe2ff; /* jmp *%edx */ + call_thiscall_func1 = (void *)thunk; +} + +#define call_func1(func,_this) call_thiscall_func1(func,_this) + +#else + +#define init_thiscall_thunk() +#define call_func1(func,_this) func(_this) + +#endif /* __i386__ */ + +typedef struct { + void *unk0; + BYTE unk1; +} task_continuation_context; + static unsigned int (__cdecl *p__Thrd_id)(void); +static task_continuation_context* (__thiscall *p_task_continuation_context_ctor)(task_continuation_context*); static HMODULE msvcp; #define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) @@ -37,6 +87,17 @@ static BOOL init(void) SET(p__Thrd_id, "_Thrd_id"); + if(sizeof(void*) == 8) { /* 64-bit initialization */ + SET(p_task_continuation_context_ctor, "??0task_continuation_context(a)Concurrency@@AEAA(a)XZ"); + } else { +#ifdef __arm__ + SET(p_task_continuation_context_ctor, "??0task_continuation_context(a)Concurrency@@AAA(a)XZ"); +#else + SET(p_task_continuation_context_ctor, "??0task_continuation_context(a)Concurrency@@AAE(a)XZ"); +#endif + } + + init_thiscall_thunk(); return TRUE; } @@ -82,10 +143,21 @@ static void test_vbtable_size_exports(void) } } +static void test_task_continuation_context(void) +{ + task_continuation_context tcc; + + memset(&tcc, 0xdead, sizeof(tcc)); + call_func1(p_task_continuation_context_ctor, &tcc); + ok(!tcc.unk0, "tcc.unk0 != NULL (%p)\n", tcc.unk0); + ok(!tcc.unk1, "tcc.unk1 != 0 (%x)\n", tcc.unk1); +} + START_TEST(msvcp140) { if(!init()) return; test_thrd(); test_vbtable_size_exports(); + test_task_continuation_context(); FreeLibrary(msvcp); } diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 703ed9f..e819699 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1360,3 +1360,20 @@ void __cdecl _Unlock_shared_ptr_spin_lock(void) shared_ptr_lock = 0; } #endif + +#if _MSVCP_VER >= 140 +typedef struct { + void *unk0; + BYTE unk1; +} task_continuation_context; + +/* ??0task_continuation_context(a)Concurrency@@AAE(a)XZ */ +/* ??0task_continuation_context(a)Concurrency@@AEAA(a)XZ */ +DEFINE_THISCALL_WRAPPER(task_continuation_context_ctor, 4) +task_continuation_context* __thiscall task_continuation_context_ctor(task_continuation_context *this) +{ + TRACE("(%p)\n", this); + memset(this, 0, sizeof(*this)); + return this; +} +#endif

1 0

Józef Kucia : wined3d: Handle raw thread group shared memory declarations.
by Alexandre Julliard 01 Mar '17

01 Mar '17

Module: wine Branch: master Commit: bd6ae2f459fd905a8e2a5143c08f3167e6ea527c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd6ae2f459fd905a8e2a5143c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 28 14:42:37 2017 +0100 wined3d: Handle raw thread group shared memory declarations. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 9 ++++++++- dlls/wined3d/shader.c | 27 +++++++++++++++++++++++++++ dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 10 ++++++++++ 4 files changed, 47 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 0fd463d..a034ba2 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -6833,6 +6833,7 @@ static GLuint shader_glsl_generate_compute_shader(const struct wined3d_context * const struct wined3d_gl_info *gl_info = context->gl_info; struct shader_glsl_ctx_priv priv_ctx; GLuint shader_id; + unsigned int i; shader_id = GL_EXTCALL(glCreateShader(GL_COMPUTE_SHADER)); @@ -6846,6 +6847,12 @@ static GLuint shader_glsl_generate_compute_shader(const struct wined3d_context * priv_ctx.string_buffers = string_buffers; shader_generate_glsl_declarations(context, buffer, shader, reg_maps, &priv_ctx); + for (i = 0; i < reg_maps->tgsm_count; ++i) + { + if (reg_maps->tgsm[i].size) + shader_addline(buffer, "shared uint cs_g%u[%u];\n", i, reg_maps->tgsm[i].size); + } + shader_addline(buffer, "layout(local_size_x = %u, local_size_y = %u, local_size_z = %u) in;\n", thread_group_size->x, thread_group_size->y, thread_group_size->z); @@ -9454,7 +9461,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DCL_TESSELLATOR_DOMAIN */ NULL, /* WINED3DSIH_DCL_TESSELLATOR_OUTPUT_PRIMITIVE */ NULL, /* WINED3DSIH_DCL_TESSELLATOR_PARTITIONING */ NULL, - /* WINED3DSIH_DCL_TGSM_RAW */ NULL, + /* WINED3DSIH_DCL_TGSM_RAW */ shader_glsl_nop, /* WINED3DSIH_DCL_TGSM_STRUCTURED */ NULL, /* WINED3DSIH_DCL_THREAD_GROUP */ shader_glsl_nop, /* WINED3DSIH_DCL_UAV_RAW */ shader_glsl_nop, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index fa61674..1b245d4 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1047,6 +1047,31 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st { reg_maps->temporary_count = ins.declaration.count; } + else if (ins.handler_idx == WINED3DSIH_DCL_TGSM_RAW) + { + unsigned int reg_idx = ins.declaration.tgsm_raw.reg.reg.idx[0].offset; + if (reg_idx >= MAX_TGSM_REGISTERS) + { + ERR("Invalid TGSM register index %u.\n", reg_idx); + break; + } + if (shader_version.type == WINED3D_SHADER_TYPE_COMPUTE) + { + struct wined3d_shader_tgsm *tgsm; + + if (!wined3d_array_reserve((void **)&reg_maps->tgsm, &reg_maps->tgsm_capacity, + reg_idx + 1, sizeof(*reg_maps->tgsm))) + return E_OUTOFMEMORY; + reg_maps->tgsm_count = reg_idx + 1; + tgsm = &reg_maps->tgsm[reg_idx]; + tgsm->size = ins.declaration.tgsm_raw.byte_count / 4; + } + else + { + FIXME("Invalid instruction %#x for shader type %#x.\n", + ins.handler_idx, shader_version.type); + } + } else if (ins.handler_idx == WINED3DSIH_DCL_THREAD_GROUP) { if (shader_version.type == WINED3D_SHADER_TYPE_COMPUTE) @@ -1522,6 +1547,8 @@ static void shader_cleanup_reg_maps(struct wined3d_shader_reg_maps *reg_maps) LIST_FOR_EACH_ENTRY_SAFE(reg, reg_next, &reg_maps->indexable_temps, struct wined3d_shader_indexable_temp, entry) HeapFree(GetProcessHeap(), 0, reg); list_init(&reg_maps->indexable_temps); + + HeapFree(GetProcessHeap(), 0, reg_maps->tgsm); } unsigned int shader_find_free_input_register(const struct wined3d_shader_reg_maps *reg_maps, unsigned int max) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 26aacc7..5cc0136 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -763,6 +763,8 @@ static void shader_sm5_read_dcl_tgsm_raw(struct wined3d_shader_instruction *ins, { shader_sm4_read_dst_param(priv, &tokens, WINED3D_DATA_FLOAT, &ins->declaration.tgsm_raw.reg); ins->declaration.tgsm_raw.byte_count = *tokens; + if (ins->declaration.tgsm_raw.byte_count % 4) + FIXME("Byte count %u is not multiple of 4.\n", ins->declaration.tgsm_raw.byte_count); } static void shader_sm5_read_dcl_tgsm_structured(struct wined3d_shader_instruction *ins, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 79b0d1a..3d06962 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -185,6 +185,7 @@ static inline enum complex_fixup get_complex_fixup(struct color_fixup_desc fixup #define MAX_SAMPLER_OBJECTS 16 #define MAX_SHADER_RESOURCE_VIEWS 128 #define MAX_UNORDERED_ACCESS_VIEWS 8 +#define MAX_TGSM_REGISTERS 8192 #define MAX_VERTEX_BLENDS 4 #define MAX_MULTISAMPLE_TYPES 8 @@ -915,6 +916,10 @@ struct wined3d_shader_reg_maps /* Whether or not loops are used in this shader, and nesting depth */ unsigned loop_depth; UINT min_rel_offset, max_rel_offset; + + struct wined3d_shader_tgsm *tgsm; + SIZE_T tgsm_capacity; + unsigned int tgsm_count; }; /* Keeps track of details for TEX_M#x# instructions which need to maintain @@ -998,6 +1003,11 @@ struct wined3d_shader_structured_resource unsigned int byte_stride; }; +struct wined3d_shader_tgsm +{ + unsigned int size; +}; + struct wined3d_shader_tgsm_raw { struct wined3d_shader_dst_param reg;

1 0