wine-commits March 2017

wine-commits@winehq.org

2 participants
717 discussions

Paul Gofman : ntdll/tests: Add test for NtFlushBuffersFile error conditions.
by Alexandre Julliard 02 Mar '17

02 Mar '17

Module: wine Branch: master Commit: 85aa2067b0d0b555e265267c9364858e334eaba0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85aa2067b0d0b555e265267c9… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed Mar 1 14:05:53 2017 +0300 ntdll/tests: Add test for NtFlushBuffersFile error conditions. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/file.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 18c3f63..bc1afdf 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -80,6 +80,7 @@ static NTSTATUS (WINAPI *pNtQueryDirectoryFile)(HANDLE,HANDLE,PIO_APC_ROUTINE,PV PVOID,ULONG,FILE_INFORMATION_CLASS,BOOLEAN,PUNICODE_STRING,BOOLEAN); static NTSTATUS (WINAPI *pNtQueryVolumeInformationFile)(HANDLE,PIO_STATUS_BLOCK,PVOID,ULONG,FS_INFORMATION_CLASS); static NTSTATUS (WINAPI *pNtQueryFullAttributesFile)(const OBJECT_ATTRIBUTES*, FILE_NETWORK_OPEN_INFORMATION*); +static NTSTATUS (WINAPI *pNtFlushBuffersFile)(HANDLE, IO_STATUS_BLOCK*); static inline BOOL is_signaled( HANDLE obj ) { @@ -4399,6 +4400,46 @@ static void test_ioctl(void) CloseHandle(file); } +static void test_flush_buffers_file(void) +{ + char path[MAX_PATH], buffer[MAX_PATH]; + HANDLE hfile, hfileread; + NTSTATUS status; + IO_STATUS_BLOCK io_status_block; + + GetTempPathA(MAX_PATH, path); + GetTempFileNameA(path, "foo", 0, buffer); + hfile = CreateFileA(buffer, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, + FILE_ATTRIBUTE_NORMAL, 0); + ok(hfile != INVALID_HANDLE_VALUE, "failed to create temp file.\n" ); + + hfileread = CreateFileA(buffer, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, 0, NULL); + ok(hfileread != INVALID_HANDLE_VALUE, "could not open temp file, error %d.\n", GetLastError()); + + status = pNtFlushBuffersFile(hfile, NULL); + todo_wine + ok(status == STATUS_ACCESS_VIOLATION, "expected STATUS_ACCESS_VIOLATION, got %#x.\n", status); + + status = pNtFlushBuffersFile(hfile, (IO_STATUS_BLOCK *)0xdeadbeaf); + todo_wine + ok(status == STATUS_ACCESS_VIOLATION, "expected STATUS_ACCESS_VIOLATION, got %#x.\n", status); + + status = pNtFlushBuffersFile(hfile, &io_status_block); + ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x.\n", status); + + status = pNtFlushBuffersFile(hfileread, &io_status_block); + todo_wine + ok(status == STATUS_ACCESS_DENIED, "expected STATUS_ACCESS_DENIED, got %#x.\n", status); + + status = pNtFlushBuffersFile(NULL, &io_status_block); + ok(status == STATUS_INVALID_HANDLE, "expected STATUS_INVALID_HANDLE, got %#x.\n", status); + + CloseHandle(hfileread); + CloseHandle(hfile); + DeleteFileA(buffer); +} + START_TEST(file) { HMODULE hkernel32 = GetModuleHandleA("kernel32.dll"); @@ -4436,6 +4477,7 @@ START_TEST(file) pNtQueryDirectoryFile = (void *)GetProcAddress(hntdll, "NtQueryDirectoryFile"); pNtQueryVolumeInformationFile = (void *)GetProcAddress(hntdll, "NtQueryVolumeInformationFile"); pNtQueryFullAttributesFile = (void *)GetProcAddress(hntdll, "NtQueryFullAttributesFile"); + pNtFlushBuffersFile = (void *)GetProcAddress(hntdll, "NtFlushBuffersFile"); test_read_write(); test_NtCreateFile(); @@ -4460,4 +4502,5 @@ START_TEST(file) test_query_volume_information_file(); test_query_attribute_information_file(); test_ioctl(); + test_flush_buffers_file(); }

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

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ä : 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

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

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

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

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

Nikolay Sivov : comctl32/propsheet: Implement PSPCB_ADDREF/ PSPCB_RELEASE notifications.
by Alexandre Julliard 02 Mar '17

02 Mar '17

Module: wine Branch: master Commit: 429705eaf33c9de76530007d8fecb818562064c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=429705eaf33c9de76530007d8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 1 22:47:21 2017 +0300 comctl32/propsheet: Implement PSPCB_ADDREF/PSPCB_RELEASE notifications. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/propsheet.c | 41 +++++++++++++++++++++++++++++++++++------ dlls/comctl32/tests/propsheet.c | 4 ---- 2 files changed, 35 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 88a44cd..0cfc799 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -2962,10 +2962,20 @@ HPROPSHEETPAGE WINAPI CreatePropertySheetPageA( if (lpPropSheetPage->dwSize < PROPSHEETPAGEA_V1_SIZE) return NULL; - ppsp = Alloc(sizeof(PROPSHEETPAGEW)); - memcpy(ppsp,lpPropSheetPage,min(lpPropSheetPage->dwSize,sizeof(PROPSHEETPAGEA))); + /* original data is used for callback notifications */ + if ((lpPropSheetPage->dwFlags & PSP_USECALLBACK) && lpPropSheetPage->pfnCallback) + { + ppsp = Alloc(2 * sizeof(*ppsp)); + memcpy(ppsp, lpPropSheetPage, min(lpPropSheetPage->dwSize, sizeof(PROPSHEETPAGEA))); + memcpy(ppsp + 1, lpPropSheetPage, min(lpPropSheetPage->dwSize, sizeof(PROPSHEETPAGEA))); + } + else + { + ppsp = Alloc(sizeof(*ppsp)); + memcpy(ppsp, lpPropSheetPage, min(lpPropSheetPage->dwSize, sizeof(PROPSHEETPAGEA))); + } - ppsp->dwFlags &= ~ PSP_INTERNAL_UNICODE; + ppsp->dwFlags &= ~PSP_INTERNAL_UNICODE; if ( !(ppsp->dwFlags & PSP_DLGINDIRECT) ) { @@ -3017,6 +3027,9 @@ HPROPSHEETPAGE WINAPI CreatePropertySheetPageA( else ppsp->pszHeaderSubTitle = NULL; + if ((ppsp->dwFlags & PSP_USECALLBACK) && ppsp->dwSize > PROPSHEETPAGEA_V1_SIZE && ppsp->pfnCallback) + ppsp->pfnCallback(0, PSPCB_ADDREF, ppsp + 1); + return (HPROPSHEETPAGE)ppsp; } @@ -3032,10 +3045,20 @@ HPROPSHEETPAGE WINAPI CreatePropertySheetPageW(LPCPROPSHEETPAGEW lpPropSheetPage if (lpPropSheetPage->dwSize < PROPSHEETPAGEW_V1_SIZE) return NULL; - ppsp = Alloc(sizeof(PROPSHEETPAGEW)); - memcpy(ppsp,lpPropSheetPage,min(lpPropSheetPage->dwSize,sizeof(PROPSHEETPAGEW))); + /* original data is used for callback notifications */ + if ((lpPropSheetPage->dwFlags & PSP_USECALLBACK) && lpPropSheetPage->pfnCallback) + { + ppsp = Alloc(2 * sizeof(*ppsp)); + memcpy(ppsp, lpPropSheetPage, min(lpPropSheetPage->dwSize, sizeof(PROPSHEETPAGEW))); + memcpy(ppsp + 1, lpPropSheetPage, min(lpPropSheetPage->dwSize, sizeof(PROPSHEETPAGEW))); + } + else + { + ppsp = Alloc(sizeof(*ppsp)); + memcpy(ppsp, lpPropSheetPage, min(lpPropSheetPage->dwSize, sizeof(PROPSHEETPAGEW))); + } - ppsp->dwFlags |= PSP_INTERNAL_UNICODE; + ppsp->dwFlags |= PSP_INTERNAL_UNICODE; if ( !(ppsp->dwFlags & PSP_DLGINDIRECT) ) { @@ -3067,6 +3090,9 @@ HPROPSHEETPAGE WINAPI CreatePropertySheetPageW(LPCPROPSHEETPAGEW lpPropSheetPage else ppsp->pszHeaderSubTitle = NULL; + if ((ppsp->dwFlags & PSP_USECALLBACK) && ppsp->dwSize > PROPSHEETPAGEW_V1_SIZE && ppsp->pfnCallback) + ppsp->pfnCallback(0, PSPCB_ADDREF, ppsp + 1); + return (HPROPSHEETPAGE)ppsp; } @@ -3088,6 +3114,9 @@ BOOL WINAPI DestroyPropertySheetPage(HPROPSHEETPAGE hPropPage) if (!psp) return FALSE; + if ((psp->dwFlags & PSP_USECALLBACK) && psp->pfnCallback) + psp->pfnCallback(0, PSPCB_RELEASE, psp + 1); + if (!(psp->dwFlags & PSP_DLGINDIRECT) && !IS_INTRESOURCE( psp->u.pszTemplate )) Free ((LPVOID)psp->u.pszTemplate); diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index 8a4e6d1..9405965 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -1080,7 +1080,6 @@ static void test_CreatePropertySheetPage(void) else { ok(hpsp != NULL, "Failed to create a page, size %u\n", page.u.pageA.dwSize); - todo_wine_if(page.u.pageA.dwSize > PROPSHEETPAGEA_V1_SIZE) ok(page.addref_called == (page.u.pageA.dwSize > PROPSHEETPAGEA_V1_SIZE) ? 1 : 0, "Expected ADDREF callback message\n"); } @@ -1089,7 +1088,6 @@ static void test_CreatePropertySheetPage(void) page.release_called = 0; ret = DestroyPropertySheetPage(hpsp); ok(ret, "Failed to destroy a page\n"); - todo_wine ok(page.release_called == 1, "Expected RELEASE callback message\n"); } } @@ -1111,7 +1109,6 @@ static void test_CreatePropertySheetPage(void) else { ok(hpsp != NULL, "Failed to create a page, size %u\n", page.u.pageW.dwSize); - todo_wine_if(page.u.pageW.dwSize > PROPSHEETPAGEW_V1_SIZE) ok(page.addref_called == (page.u.pageW.dwSize > PROPSHEETPAGEW_V1_SIZE) ? 1 : 0, "Expected ADDREF callback message\n"); } @@ -1120,7 +1117,6 @@ static void test_CreatePropertySheetPage(void) page.release_called = 0; ret = DestroyPropertySheetPage(hpsp); ok(ret, "Failed to destroy a page\n"); - todo_wine ok(page.release_called == 1, "Expected RELEASE callback message\n"); } }

1 0

Nikolay Sivov : comctl32/propsheet: Enforce minimal PROPSHEETPAGE structure size when creating a page.
by Alexandre Julliard 02 Mar '17

02 Mar '17

Module: wine Branch: master Commit: a3aa217f030cbc77614c56948615fdba1624fbdc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3aa217f030cbc77614c56948… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 1 22:47:20 2017 +0300 comctl32/propsheet: Enforce minimal PROPSHEETPAGE structure size when creating a page. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/propsheet.c | 12 ++++++++++-- dlls/comctl32/tests/propsheet.c | 2 -- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index a3a6a5c..88a44cd 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -2957,8 +2957,12 @@ static LPWSTR load_string( HINSTANCE instance, LPCWSTR str ) HPROPSHEETPAGE WINAPI CreatePropertySheetPageA( LPCPROPSHEETPAGEA lpPropSheetPage) { - PROPSHEETPAGEW* ppsp = Alloc(sizeof(PROPSHEETPAGEW)); + PROPSHEETPAGEW *ppsp; + if (lpPropSheetPage->dwSize < PROPSHEETPAGEA_V1_SIZE) + return NULL; + + ppsp = Alloc(sizeof(PROPSHEETPAGEW)); memcpy(ppsp,lpPropSheetPage,min(lpPropSheetPage->dwSize,sizeof(PROPSHEETPAGEA))); ppsp->dwFlags &= ~ PSP_INTERNAL_UNICODE; @@ -3023,8 +3027,12 @@ HPROPSHEETPAGE WINAPI CreatePropertySheetPageA( */ HPROPSHEETPAGE WINAPI CreatePropertySheetPageW(LPCPROPSHEETPAGEW lpPropSheetPage) { - PROPSHEETPAGEW* ppsp = Alloc(sizeof(PROPSHEETPAGEW)); + PROPSHEETPAGEW *ppsp; + + if (lpPropSheetPage->dwSize < PROPSHEETPAGEW_V1_SIZE) + return NULL; + ppsp = Alloc(sizeof(PROPSHEETPAGEW)); memcpy(ppsp,lpPropSheetPage,min(lpPropSheetPage->dwSize,sizeof(PROPSHEETPAGEW))); ppsp->dwFlags |= PSP_INTERNAL_UNICODE; diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index 0b1c45c..8a4e6d1 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -1076,7 +1076,6 @@ static void test_CreatePropertySheetPage(void) hpsp = CreatePropertySheetPageA(&page.u.pageA); if (page.u.pageA.dwSize < PROPSHEETPAGEA_V1_SIZE) - todo_wine ok(hpsp == NULL, "Expected failure, size %u\n", page.u.pageA.dwSize); else { @@ -1108,7 +1107,6 @@ static void test_CreatePropertySheetPage(void) hpsp = CreatePropertySheetPageW(&page.u.pageW); if (page.u.pageW.dwSize < PROPSHEETPAGEW_V1_SIZE) - todo_wine ok(hpsp == NULL, "Expected failure, size %u\n", page.u.pageW.dwSize); else {

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2017