- wine-devel - winehq.org

[PATCH] kernel32: Add message resource for TRUST_E_NOSIGNATURE
by Alistair Leslie-Hughes 26 Feb '18

26 Feb '18

From: Louis Lenders <xerox.xerox2000x(a)gmail.com> Based on a patch by Austin English. Fixes https://bugs.winehq.org/show_bug.cgi?id=43041 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/kernel32/tests/format_msg.c | 4 ++++ dlls/kernel32/winerror.mc | 11 +++++++++++ 2 files changed, 15 insertions(+) diff --git a/dlls/kernel32/tests/format_msg.c b/dlls/kernel32/tests/format_msg.c index 7098805..290bce9 100644 --- a/dlls/kernel32/tests/format_msg.c +++ b/dlls/kernel32/tests/format_msg.c @@ -1559,6 +1559,10 @@ static void test_message_from_hmodule(void) MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), out, sizeof(out)/sizeof(CHAR), NULL); ok(ret != 0, "FormatMessageA returned 0\n"); + ret = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_FROM_HMODULE, h, TRUST_E_NOSIGNATURE, + MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), out, sizeof(out)/sizeof(CHAR), NULL); + ok(ret != 0, "FormatMessageA returned 0\n"); + /* Test a message string with an insertion without passing any variadic arguments. */ ret = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_FROM_HMODULE, h, 193 /* ERROR_BAD_EXE_FORMAT */, MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), out, sizeof(out)/sizeof(CHAR), NULL); diff --git a/dlls/kernel32/winerror.mc b/dlls/kernel32/winerror.mc index dc17f49..141af21 100644 --- a/dlls/kernel32/winerror.mc +++ b/dlls/kernel32/winerror.mc @@ -18,6 +18,10 @@ LanguageNames=(ENU=0x409:winerr) +SeverityNames=(CoError=0x2:STATUS_SEVERITY_COERROR) + +FacilityNames=(Trust=0xb:FACILITY_CERT) + MessageId=0 SymbolicName=ERROR_SUCCESS Language=ENU @@ -3748,3 +3752,10 @@ SymbolicName=WSAECONNREFUSED Language=ENU Connection refused. . +MessageId=0x100 +Severity=CoError +Facility=Trust +SymbolicName=TRUST_E_NOSIGNATURE +Language=ENU +No Signature found in file. +. -- 1.9.1

1 0

[PATCH] dmstyle/tests: Add IDirectMusicObject::ParseDescriptor() tests
by Michael Stefaniuc 26 Feb '18

26 Feb '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmstyle/tests/dmstyle.c | 200 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 200 insertions(+) diff --git a/dlls/dmstyle/tests/dmstyle.c b/dlls/dmstyle/tests/dmstyle.c index 664b208127..a9a89a7a77 100644 --- a/dlls/dmstyle/tests/dmstyle.c +++ b/dlls/dmstyle/tests/dmstyle.c @@ -22,10 +22,14 @@ #include <windef.h> #include <initguid.h> #include <wine/test.h> +#include <ole2.h> #include <dmusici.h> +#include <dmusicf.h> #define ARRAY_SIZE(a) (sizeof(a)/sizeof((a)[0])) +DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); + static BOOL missing_dmstyle(void) { IDirectMusicStyle *dms; @@ -339,6 +343,201 @@ static void test_track(void) } } +struct chunk { + FOURCC id; + DWORD size; + FOURCC type; +}; + +#define CHUNK_HDR_SIZE (sizeof(FOURCC) + sizeof(DWORD)) + +/* Generate a RIFF file format stream from an array of FOURCC ids. + RIFF and LIST need to be followed by the form type respectively list type, + followed by the chunks of the list and terminated with 0. */ +static IStream *gen_riff_stream(const FOURCC *ids) +{ + int level = -1; + DWORD *sizes[4]; /* Stack for the sizes of RIFF and LIST chunks */ + char riff[1024]; + char *p = riff; + struct chunk *ck; + IStream *stream; + LARGE_INTEGER zero = {0}; + + do { + ck = (struct chunk *)p; + ck->id = *ids++; + switch (ck->id) { + case 0: + *sizes[level] = p - (char *)sizes[level] - sizeof(DWORD); + level--; + break; + case FOURCC_LIST: + case FOURCC_RIFF: + level++; + sizes[level] = &ck->size; + ck->type = *ids++; + p += sizeof(*ck); + break; + case DMUS_FOURCC_GUID_CHUNK: + ck->size = sizeof(GUID_NULL); + p += CHUNK_HDR_SIZE; + memcpy(p, &GUID_NULL, sizeof(GUID_NULL)); + p += ck->size; + break; + case DMUS_FOURCC_VERSION_CHUNK: + { + DMUS_VERSION ver = {5, 8}; + + ck->size = sizeof(ver); + p += CHUNK_HDR_SIZE; + memcpy(p, &ver, sizeof(ver)); + p += ck->size; + break; + } + default: + { + /* Just convert the FOURCC id to a WCHAR string */ + WCHAR *s; + + ck->size = 5 * sizeof(WCHAR); + p += CHUNK_HDR_SIZE; + s = (WCHAR *)p; + s[0] = (char)(ck->id); + s[1] = (char)(ck->id >> 8); + s[2] = (char)(ck->id >> 16); + s[3] = (char)(ck->id >> 24); + s[4] = 0; + p += ck->size; + } + } + } while (level >= 0); + + ck = (struct chunk *)riff; + CreateStreamOnHGlobal(NULL, TRUE, &stream); + IStream_Write(stream, riff, ck->size + CHUNK_HDR_SIZE, NULL); + IStream_Seek(stream, zero, STREAM_SEEK_SET, NULL); + + return stream; +} + +static void test_parsedescriptor(void) +{ + IDirectMusicObject *dmo; + IStream *stream; + DMUS_OBJECTDESC desc = {0}; + HRESULT hr; + DWORD valid; + const WCHAR s_inam[] = {'I','N','A','M','\0'}; + const WCHAR s_unam[] = {'U','N','A','M','\0'}; + const FOURCC alldesc[] = + { + FOURCC_RIFF, DMUS_FOURCC_STYLE_FORM, DMUS_FOURCC_CATEGORY_CHUNK, FOURCC_LIST, + DMUS_FOURCC_UNFO_LIST, DMUS_FOURCC_UNAM_CHUNK, DMUS_FOURCC_UCOP_CHUNK, + DMUS_FOURCC_UCMT_CHUNK, DMUS_FOURCC_USBJ_CHUNK, 0, DMUS_FOURCC_VERSION_CHUNK, + DMUS_FOURCC_GUID_CHUNK, 0 + }; + const FOURCC dupes[] = + { + FOURCC_RIFF, DMUS_FOURCC_STYLE_FORM, DMUS_FOURCC_CATEGORY_CHUNK, DMUS_FOURCC_CATEGORY_CHUNK, + DMUS_FOURCC_VERSION_CHUNK, DMUS_FOURCC_VERSION_CHUNK, DMUS_FOURCC_GUID_CHUNK, + DMUS_FOURCC_GUID_CHUNK, FOURCC_LIST, DMUS_FOURCC_UNFO_LIST, DMUS_FOURCC_UNAM_CHUNK, 0, + FOURCC_LIST, DMUS_FOURCC_UNFO_LIST, mmioFOURCC('I','N','A','M'), 0, 0 + }; + FOURCC empty[] = {FOURCC_RIFF, DMUS_FOURCC_STYLE_FORM, 0}; + FOURCC inam[] = + { + FOURCC_RIFF, DMUS_FOURCC_STYLE_FORM, FOURCC_LIST, DMUS_FOURCC_UNFO_LIST, + mmioFOURCC('I','N','A','M'), 0, 0 + }; + + hr = CoCreateInstance(&CLSID_DirectMusicStyle, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicObject, (void **)&dmo); + ok(hr == S_OK, "DirectMusicStyle create failed: %08x, expected S_OK\n", hr); + + /* Nothing loaded */ + hr = IDirectMusicObject_GetDescriptor(dmo, &desc); + ok(hr == S_OK, "GetDescriptor failed: %08x, expected S_OK\n", hr); + ok(desc.dwValidData == DMUS_OBJ_CLASS /* XP */ || + broken(desc.dwValidData == (DMUS_OBJ_OBJECT | DMUS_OBJ_CLASS)), /* Vista and above */ + "Got valid data %#x, expected DMUS_OBJ_OBJECT\n", desc.dwValidData); + ok(IsEqualGUID(&desc.guidClass, &CLSID_DirectMusicStyle), + "Got class guid %s, expected CLSID_DirectMusicStyle\n", + wine_dbgstr_guid(&desc.guidClass)); + + /* Empty RIFF stream */ + stream = gen_riff_stream(empty); + memset(&desc, 0, sizeof(desc)); + hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); + ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); + ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#x, expected DMUS_OBJ_CLASS\n", + desc.dwValidData); + ok(IsEqualGUID(&desc.guidClass, &CLSID_DirectMusicStyle), + "Got class guid %s, expected CLSID_DirectMusicStyle\n", + wine_dbgstr_guid(&desc.guidClass)); + IStream_Release(stream); + + /* Wrong form */ + empty[1] = DMUS_FOURCC_CONTAINER_FORM; + stream = gen_riff_stream(empty); + hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); + todo_wine ok(hr == DMUS_E_CHUNKNOTFOUND, + "ParseDescriptor failed: %08x, expected DMUS_E_CHUNKNOTFOUND\n", hr); + + /* All desc chunks, DMUS_OBJ_CATEGORY not supported */ + stream = gen_riff_stream(alldesc); + memset(&desc, 0, sizeof(desc)); + hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); + ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); + valid = DMUS_OBJ_OBJECT|DMUS_OBJ_CLASS|DMUS_OBJ_NAME|DMUS_OBJ_VERSION; + todo_wine ok(desc.dwValidData == valid, "Got valid data %#x, expected %#x\n", + desc.dwValidData, valid); + ok(IsEqualGUID(&desc.guidClass, &CLSID_DirectMusicStyle), + "Got class guid %s, expected CLSID_DirectMusicStyle\n", + wine_dbgstr_guid(&desc.guidClass)); + ok(IsEqualGUID(&desc.guidObject, &GUID_NULL), "Got object guid %s, expected GUID_NULL\n", + wine_dbgstr_guid(&desc.guidClass)); + ok(!memcmp(desc.wszName, s_unam, sizeof(s_unam)), "Got name '%s', expected 'UNAM'\n", + wine_dbgstr_w(desc.wszName)); + IStream_Release(stream); + + /* UNFO list with INAM */ + inam[3] = DMUS_FOURCC_UNFO_LIST; + stream = gen_riff_stream(inam); + memset(&desc, 0, sizeof(desc)); + hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); + ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); + ok(desc.dwValidData == (DMUS_OBJ_CLASS | DMUS_OBJ_NAME), + "Got valid data %#x, expected DMUS_OBJ_CLASS | DMUS_OBJ_NAME\n", desc.dwValidData); + ok(!memcmp(desc.wszName, s_inam, sizeof(s_inam)), "Got name '%s', expected 'INAM'\n", + wine_dbgstr_w(desc.wszName)); + IStream_Release(stream); + + /* INFO list with INAM */ + inam[3] = DMUS_FOURCC_INFO_LIST; + stream = gen_riff_stream(inam); + memset(&desc, 0, sizeof(desc)); + hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); + ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); + ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#x, expected DMUS_OBJ_CLASS\n", + desc.dwValidData); + IStream_Release(stream); + + /* Duplicated chunks */ + stream = gen_riff_stream(dupes); + memset(&desc, 0, sizeof(desc)); + hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); + ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); + valid = DMUS_OBJ_OBJECT|DMUS_OBJ_CLASS|DMUS_OBJ_NAME|DMUS_OBJ_VERSION; + todo_wine ok(desc.dwValidData == valid, "Got valid data %#x, expected %#x\n", + desc.dwValidData, valid); + ok(!memcmp(desc.wszName, s_inam, sizeof(s_inam)), "Got name '%s', expected 'INAM'\n", + wine_dbgstr_w(desc.wszName)); + IStream_Release(stream); + + IDirectMusicObject_Release(dmo); +} + START_TEST(dmstyle) { CoInitialize(NULL); @@ -354,6 +553,7 @@ START_TEST(dmstyle) test_COM_track(); test_dmstyle(); test_track(); + test_parsedescriptor(); CoUninitialize(); } -- 2.14.3

1 0

[PATCH] ntoskrnl.exe: Use wrapper functions to forward several functions to ntdll
by Stefan Leichter 25 Feb '18

25 Feb '18

This patch fixes partly https://bugs.winehq.org/show_bug.cgi?id=37852 Signed-off-by: Stefan Leichter <sle85276(a)gmx.de> --- dlls/ntoskrnl.exe/ntoskrnl.c | 187 ++++++++++++++++++++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 58 +++++------ 2 files changed, 216 insertions(+), 29 deletions(-)

1 0

[PATCH website] Add Korean translation of News in 2015
by 김건우 25 Feb '18

25 Feb '18

Independent from two patches I sent before. They include all translated news, but this patch only have news in 2015.

1 0

[PATCH website] Add Korean translation of News in 2016
by 김건우 25 Feb '18

25 Feb '18

Independent from two patches I sent before. They include all translated news, but this patch only have news in 2016.

1 0

[PATCH website] Add Korean translation of News in 2017
by 김건우 25 Feb '18

25 Feb '18

Independent from two patches I sent before. They include all translated news, but this patch only have news in 2017.

1 0

[PATCH website] Add Korean translation of News in 2018
by 김건우 25 Feb '18

25 Feb '18

Independent from two patches I sent before. They include all translated news, but this patch only have news in 2018.

1 0

[PATCH 1/2] kernel32/tests: Add more tests for VerifyVersionInfo()
by Nikolay Sivov 25 Feb '18

25 Feb '18

New tests cases by Sebastian Lackner. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/kernel32/tests/version.c | 634 ++++++++++++++++++++++++++++++++---------- 1 file changed, 493 insertions(+), 141 deletions(-) diff --git a/dlls/kernel32/tests/version.c b/dlls/kernel32/tests/version.c index 7b1359878e..8360994de0 100644 --- a/dlls/kernel32/tests/version.c +++ b/dlls/kernel32/tests/version.c @@ -163,15 +163,445 @@ static void test_GetVersionEx(void) static void test_VerifyVersionInfo(void) { + enum srcversion_mode + { + SRCVERSION_ZERO = 0, + SRCVERSION_CURRENT = 1, + SRCVERSION_INC_MINOR = 2, + SRCVERSION_INC_SP_MINOR = 3, + SRCVERSION_INC_SP_MAJOR = 4, + SRCVERSION_DEC_SP_MAJOR = 5, + SRCVERSION_DEC_MAJOR = 6, + SRCVERSION_INC_BUILD = 7, + SRCVERSION_REQUIRES_SP = 0x1000, + }; + + struct verify_version_test + { + DWORD verifymask; /* Type mask for VerifyVersionInfo() */ + DWORD srcinfo; /* The way current version info is modified. */ + DWORD err; /* Error code on failure, 0 on success. */ + + DWORD typemask1; + DWORD condition1; + DWORD typemask2; + DWORD condition2; + DWORD typemask3; + DWORD condition3; + DWORD typemask4; + DWORD condition4; + + BOOL todo; + } verify_version_tests[] = + { + { + VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, + SRCVERSION_INC_MINOR, + 0, + + VER_MAJORVERSION, VER_EQUAL, + VER_MINORVERSION, VER_LESS, + 0, 0, + 0, 0, + TRUE, + }, + { + VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, + SRCVERSION_INC_MINOR, + ERROR_OLD_WIN_VERSION, + + VER_MAJORVERSION, VER_GREATER_EQUAL, + VER_MINORVERSION, VER_LESS, + }, + { + VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, + SRCVERSION_CURRENT, + 0, + + VER_MAJORVERSION, VER_GREATER_EQUAL, + VER_MINORVERSION, VER_LESS, + }, + { + VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, + SRCVERSION_CURRENT, + 0, + + VER_MAJORVERSION, VER_GREATER_EQUAL, + VER_MINORVERSION, VER_AND, + }, + { + VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, + SRCVERSION_INC_MINOR, + 0, + + VER_MAJORVERSION, VER_LESS_EQUAL, + VER_MINORVERSION, VER_LESS, + }, + { + VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, + SRCVERSION_INC_MINOR, + ERROR_OLD_WIN_VERSION, + + VER_MAJORVERSION, VER_AND, + VER_MINORVERSION, VER_LESS, + }, + { + VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, + SRCVERSION_INC_MINOR, + ERROR_OLD_WIN_VERSION, + + VER_MAJORVERSION, VER_OR, + VER_MINORVERSION, VER_LESS, + }, + { + VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, + SRCVERSION_INC_SP_MINOR, + ERROR_OLD_WIN_VERSION, + + VER_MINORVERSION, VER_EQUAL, + VER_SERVICEPACKMINOR, VER_LESS, + }, + { + VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, + SRCVERSION_INC_SP_MINOR, + ERROR_OLD_WIN_VERSION, + + VER_MAJORVERSION, VER_EQUAL, + VER_SERVICEPACKMINOR, VER_LESS, + }, + { + VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, + SRCVERSION_INC_SP_MAJOR, + ERROR_OLD_WIN_VERSION, + + VER_MAJORVERSION, VER_EQUAL, + VER_SERVICEPACKMAJOR, VER_EQUAL, + }, + { + VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, + SRCVERSION_INC_SP_MINOR, + 0, + + VER_SERVICEPACKMAJOR, VER_EQUAL, + VER_SERVICEPACKMINOR, VER_LESS, + 0, 0, + 0, 0, + TRUE, + }, + { + VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, + SRCVERSION_INC_SP_MINOR, + ERROR_OLD_WIN_VERSION, + + VER_SERVICEPACKMAJOR, VER_EQUAL, + VER_SERVICEPACKMINOR, VER_LESS, + }, + { + VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, + SRCVERSION_INC_SP_MINOR, + 0, + + VER_MINORVERSION, VER_EQUAL, + VER_SERVICEPACKMAJOR, VER_EQUAL, + VER_SERVICEPACKMINOR, VER_LESS, + 0, 0, + TRUE, + }, + { + VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, + SRCVERSION_INC_SP_MINOR, + ERROR_OLD_WIN_VERSION, + + VER_MINORVERSION, VER_EQUAL, + VER_SERVICEPACKMAJOR, VER_EQUAL, + VER_SERVICEPACKMINOR, VER_LESS, + }, + { + VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, + SRCVERSION_INC_SP_MINOR, + 0, + + VER_MAJORVERSION, VER_EQUAL, + VER_MINORVERSION, VER_EQUAL, + VER_SERVICEPACKMAJOR, VER_EQUAL, + VER_SERVICEPACKMINOR, VER_LESS, + TRUE, + }, + { + VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, + SRCVERSION_INC_SP_MINOR, + ERROR_OLD_WIN_VERSION, + + VER_MAJORVERSION, VER_EQUAL, + VER_MINORVERSION, VER_GREATER_EQUAL, + VER_SERVICEPACKMAJOR, VER_EQUAL, + VER_SERVICEPACKMINOR, VER_LESS, + }, + { + VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, + SRCVERSION_INC_SP_MAJOR, + 0, + + VER_MAJORVERSION, VER_LESS_EQUAL, + VER_SERVICEPACKMAJOR, VER_GREATER, + }, + { + VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, + SRCVERSION_INC_SP_MAJOR, + ERROR_OLD_WIN_VERSION, + + VER_MAJORVERSION, VER_EQUAL, + VER_SERVICEPACKMAJOR, VER_LESS, + }, + { + VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, + SRCVERSION_INC_SP_MAJOR, + ERROR_OLD_WIN_VERSION, + + VER_MINORVERSION, VER_EQUAL, + VER_SERVICEPACKMAJOR, VER_LESS, + }, + { + VER_MAJORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, + SRCVERSION_INC_SP_MAJOR, + 0, + + VER_MAJORVERSION, VER_EQUAL, + VER_SERVICEPACKMAJOR, VER_LESS, + 0, 0, + 0, 0, + TRUE, + }, + { + VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, + SRCVERSION_INC_SP_MAJOR, + ERROR_OLD_WIN_VERSION, + + VER_MAJORVERSION, VER_EQUAL, + VER_SERVICEPACKMAJOR, VER_LESS, + }, + { + VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, + SRCVERSION_INC_SP_MAJOR, + 0, + + VER_MAJORVERSION, VER_EQUAL, + VER_MINORVERSION, VER_EQUAL, + VER_SERVICEPACKMAJOR, VER_LESS, + 0, 0, + TRUE + }, + { + VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, + SRCVERSION_INC_SP_MAJOR, + ERROR_OLD_WIN_VERSION, + + VER_MAJORVERSION, VER_GREATER_EQUAL, + VER_SERVICEPACKMAJOR, VER_LESS, + }, + { + VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, + SRCVERSION_DEC_MAJOR, + 0, + + VER_MAJORVERSION, VER_GREATER_EQUAL, + VER_SERVICEPACKMAJOR, VER_LESS, + }, + { + VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, + SRCVERSION_CURRENT, + 0, + + VER_MAJORVERSION, VER_GREATER_EQUAL, + VER_SERVICEPACKMAJOR, VER_LESS, + }, + { + VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, + SRCVERSION_INC_SP_MAJOR, + ERROR_OLD_WIN_VERSION, + + VER_MAJORVERSION, VER_GREATER_EQUAL, + VER_MINORVERSION, VER_EQUAL, + VER_SERVICEPACKMAJOR, VER_LESS, + }, + { + VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, + SRCVERSION_INC_SP_MAJOR, + ERROR_OLD_WIN_VERSION, + + VER_MAJORVERSION, VER_GREATER_EQUAL, + VER_MINORVERSION, VER_GREATER_EQUAL, + VER_SERVICEPACKMAJOR, VER_LESS_EQUAL, + }, + { + VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, + SRCVERSION_INC_SP_MAJOR, + ERROR_OLD_WIN_VERSION, + + VER_MAJORVERSION, VER_GREATER_EQUAL, + VER_SERVICEPACKMAJOR, VER_AND, + }, + { + VER_MAJORVERSION | VER_MINORVERSION, + SRCVERSION_ZERO, + 0, + + VER_MAJORVERSION, VER_GREATER_EQUAL, + }, + { + VER_MAJORVERSION | VER_MINORVERSION | VER_BUILDNUMBER, + SRCVERSION_ZERO, + ERROR_OLD_WIN_VERSION, + + VER_MAJORVERSION, VER_GREATER_EQUAL, + }, + { + VER_SUITENAME, + SRCVERSION_ZERO, + 0, + + VER_SUITENAME, VER_AND, + }, + { + VER_SUITENAME, + SRCVERSION_ZERO, + 0, + + VER_SUITENAME, VER_OR, + }, + { + VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, + SRCVERSION_INC_SP_MINOR, + ERROR_OLD_WIN_VERSION, + + VER_MINORVERSION, VER_GREATER_EQUAL, + }, + { + VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, + SRCVERSION_INC_SP_MAJOR, + 0, + + VER_MINORVERSION, VER_LESS, + }, + { + VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, + SRCVERSION_INC_SP_MAJOR, + 0, + + VER_MINORVERSION, VER_LESS_EQUAL, + }, + { + VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, + SRCVERSION_INC_SP_MAJOR, + ERROR_OLD_WIN_VERSION, + + VER_MINORVERSION, VER_EQUAL, + }, + { + VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, + SRCVERSION_INC_SP_MAJOR, + ERROR_OLD_WIN_VERSION, + + VER_MINORVERSION, VER_GREATER_EQUAL, + }, + { + VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, + SRCVERSION_INC_MINOR, + ERROR_OLD_WIN_VERSION, + + VER_MINORVERSION, VER_GREATER_EQUAL, + }, + { + VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, + SRCVERSION_INC_MINOR, + ERROR_OLD_WIN_VERSION, + + VER_MINORVERSION, VER_GREATER_EQUAL, + }, + { + VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, + SRCVERSION_CURRENT, + 0, + + VER_MINORVERSION, VER_GREATER_EQUAL, + }, + { + VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, + SRCVERSION_INC_BUILD, + ERROR_OLD_WIN_VERSION, + + VER_MINORVERSION, VER_GREATER_EQUAL, + }, + { + VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, + SRCVERSION_INC_BUILD, + 0, + + VER_MINORVERSION, VER_GREATER_EQUAL, + }, + { + VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, + SRCVERSION_DEC_SP_MAJOR | SRCVERSION_REQUIRES_SP, + 0, + + VER_MINORVERSION, VER_GREATER, + }, + { + VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, + SRCVERSION_DEC_SP_MAJOR | SRCVERSION_REQUIRES_SP, + 0, + + VER_MINORVERSION, VER_GREATER_EQUAL, + }, + { + VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, + SRCVERSION_DEC_SP_MAJOR | SRCVERSION_REQUIRES_SP, + ERROR_OLD_WIN_VERSION, + + VER_MAJORVERSION, VER_EQUAL, + VER_SERVICEPACKMAJOR, VER_GREATER, + }, + { + VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, + SRCVERSION_DEC_SP_MAJOR | SRCVERSION_REQUIRES_SP, + 0, + + VER_MAJORVERSION, VER_GREATER_EQUAL, + VER_MINORVERSION, VER_EQUAL, + VER_SERVICEPACKMAJOR, VER_GREATER, + }, + { + VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, + SRCVERSION_DEC_SP_MAJOR | SRCVERSION_REQUIRES_SP, + 0, + + VER_MAJORVERSION, VER_GREATER_EQUAL, + VER_MINORVERSION, VER_LESS_EQUAL, + VER_SERVICEPACKMAJOR, VER_GREATER, + }, + { + VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, + SRCVERSION_DEC_SP_MAJOR | SRCVERSION_REQUIRES_SP, + 0, + + VER_MAJORVERSION, VER_GREATER_EQUAL, + VER_MINORVERSION, VER_AND, + VER_SERVICEPACKMAJOR, VER_GREATER, + }, + { + VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, + SRCVERSION_DEC_SP_MAJOR | SRCVERSION_REQUIRES_SP, + ERROR_OLD_WIN_VERSION, + + VER_SERVICEPACKMAJOR, VER_GREATER, + VER_SERVICEPACKMINOR, VER_EQUAL, + }, + }; + OSVERSIONINFOEXA info; + DWORD servicepack; + unsigned int i; BOOL ret; - DWORD servicepack, error; - - if(!pVerifyVersionInfoA || !pVerSetConditionMask) - { - win_skip("Needed functions not available\n"); - return; - } /* Before we start doing some tests we should check what the version of * the ServicePack is. Tests on a box with no ServicePack will fail otherwise. @@ -179,13 +609,15 @@ static void test_VerifyVersionInfo(void) info.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEXA); GetVersionExA((OSVERSIONINFOA *)&info); servicepack = info.wServicePackMajor; + if (servicepack == 0) + skip("There is no ServicePack on this system. Some tests will be skipped.\n"); /* Win8.1+ returns Win8 version in GetVersionEx when there's no app manifest targeting 8.1 */ if (info.dwMajorVersion == 6 && info.dwMinorVersion == 2) { RTL_OSVERSIONINFOEXW rtlinfo; rtlinfo.dwOSVersionInfoSize = sizeof(RTL_OSVERSIONINFOEXW); - ok(SUCCEEDED(pRtlGetVersion(&rtlinfo)), "RtlGetVersion failed\n"); + ok(!pRtlGetVersion(&rtlinfo), "RtlGetVersion failed\n"); if (rtlinfo.dwMajorVersion != 6 || rtlinfo.dwMinorVersion != 2) { @@ -194,34 +626,65 @@ static void test_VerifyVersionInfo(void) } } - memset(&info, 0, sizeof(info)); + for (i = 0; i < sizeof(verify_version_tests)/sizeof(verify_version_tests[0]); i++) + { + struct verify_version_test *test = &verify_version_tests[i]; + DWORD srcinfo = test->srcinfo; + ULONGLONG mask; - ret = pVerifyVersionInfoA(&info, VER_MAJORVERSION | VER_MINORVERSION, - pVerSetConditionMask(0, VER_MAJORVERSION, VER_GREATER_EQUAL)); - ok(ret, "VerifyVersionInfoA failed with error %d\n", GetLastError()); + if (servicepack == 0 && srcinfo & SRCVERSION_REQUIRES_SP) + continue; + srcinfo &= ~SRCVERSION_REQUIRES_SP; - SetLastError(0xdeadbeef); - ret = pVerifyVersionInfoA(&info, VER_BUILDNUMBER | VER_MAJORVERSION | - VER_MINORVERSION/* | VER_PLATFORMID | VER_SERVICEPACKMAJOR | - VER_SERVICEPACKMINOR | VER_SUITENAME | VER_PRODUCT_TYPE */, - pVerSetConditionMask(0, VER_MAJORVERSION, VER_GREATER_EQUAL)); - error = GetLastError(); - ok(!ret, "VerifyVersionInfoA succeeded\n"); - ok(error == ERROR_OLD_WIN_VERSION, - "VerifyVersionInfoA should have failed with ERROR_OLD_WIN_VERSION instead of %d\n", error); + info.dwOSVersionInfoSize = sizeof(info); + GetVersionExA((OSVERSIONINFOA *)&info); - /* tests special handling of VER_SUITENAME */ + switch (srcinfo) + { + case SRCVERSION_ZERO: + memset(&info, 0, sizeof(info)); + break; + case SRCVERSION_INC_MINOR: + info.dwMinorVersion++; + break; + case SRCVERSION_INC_SP_MINOR: + info.wServicePackMinor++; + break; + case SRCVERSION_INC_SP_MAJOR: + info.wServicePackMajor++; + break; + case SRCVERSION_DEC_SP_MAJOR: + info.wServicePackMajor--; + break; + case SRCVERSION_DEC_MAJOR: + info.dwMajorVersion--; + break; + case SRCVERSION_INC_BUILD: + info.dwBuildNumber++; + break; + default: + ; + } - ret = pVerifyVersionInfoA(&info, VER_SUITENAME, - pVerSetConditionMask(0, VER_SUITENAME, VER_AND)); - ok(ret, "VerifyVersionInfoA failed with error %d\n", GetLastError()); + mask = VerSetConditionMask(0, test->typemask1, test->condition1); + if (test->typemask2) + mask = VerSetConditionMask(mask, test->typemask2, test->condition2); + if (test->typemask3) + mask = VerSetConditionMask(mask, test->typemask3, test->condition3); + if (test->typemask4) + mask = VerSetConditionMask(mask, test->typemask4, test->condition4); - ret = pVerifyVersionInfoA(&info, VER_SUITENAME, - pVerSetConditionMask(0, VER_SUITENAME, VER_OR)); - ok(ret, "VerifyVersionInfoA failed with error %d\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = VerifyVersionInfoA(&info, test->verifymask, mask); + todo_wine_if(test->todo) + { + ok(test->err ? !ret : ret, "%u: unexpected return value %d.\n", i, ret); + if (!ret) + ok(GetLastError() == test->err, "%u: unexpected error code %d, expected %d.\n", i, GetLastError(), test->err); + } + } /* test handling of version numbers */ - /* v3.10 is always less than v4.x even * if the minor version is tested */ info.dwMajorVersion = 3; @@ -245,124 +708,13 @@ static void test_VerifyVersionInfo(void) VER_MAJORVERSION, VER_GREATER_EQUAL)); ok(ret, "VerifyVersionInfoA failed with error %d\n", GetLastError()); - info.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEXA); - GetVersionExA((OSVERSIONINFOA *)&info); - info.wServicePackMinor++; - SetLastError(0xdeadbeef); - ret = pVerifyVersionInfoA(&info, VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, - pVerSetConditionMask(0, VER_MINORVERSION, VER_GREATER_EQUAL)); - error = GetLastError(); - ok(!ret, "VerifyVersionInfoA succeeded\n"); - ok(error == ERROR_OLD_WIN_VERSION || broken(error == ERROR_BAD_ARGUMENTS) /* some wink2 */, - "VerifyVersionInfoA should have failed with ERROR_OLD_WIN_VERSION instead of %d\n", error); - - if (servicepack == 0) - { - skip("There is no ServicePack on this system\n"); - } - else - { - info.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEXA); - GetVersionExA((OSVERSIONINFOA *)&info); - info.wServicePackMajor--; - ret = pVerifyVersionInfoA(&info, VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, - pVerSetConditionMask(0, VER_MINORVERSION, VER_GREATER)); - ok(ret || broken(!ret) /* some win2k */, "VerifyVersionInfoA failed with error %d\n", GetLastError()); - - info.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEXA); - GetVersionExA((OSVERSIONINFOA *)&info); - info.wServicePackMajor--; - ret = pVerifyVersionInfoA(&info, VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, - pVerSetConditionMask(0, VER_MINORVERSION, VER_GREATER_EQUAL)); - ok(ret || broken(!ret) /* some win2k */, "VerifyVersionInfoA failed with error %d\n", GetLastError()); - } - - info.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEXA); - GetVersionExA((OSVERSIONINFOA *)&info); - info.wServicePackMajor++; - ret = pVerifyVersionInfoA(&info, VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, - pVerSetConditionMask(0, VER_MINORVERSION, VER_LESS)); - ok(ret || broken(!ret) /* some win2k */, "VerifyVersionInfoA failed with error %d\n", GetLastError()); - - info.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEXA); - GetVersionExA((OSVERSIONINFOA *)&info); - info.wServicePackMajor++; - ret = pVerifyVersionInfoA(&info, VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, - pVerSetConditionMask(0, VER_MINORVERSION, VER_LESS_EQUAL)); - ok(ret || broken(!ret) /* some win2k */, "VerifyVersionInfoA failed with error %d\n", GetLastError()); - - info.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEXA); - GetVersionExA((OSVERSIONINFOA *)&info); - info.wServicePackMajor--; - SetLastError(0xdeadbeef); - ret = pVerifyVersionInfoA(&info, VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, - pVerSetConditionMask(0, VER_MINORVERSION, VER_EQUAL)); - error = GetLastError(); - ok(!ret, "VerifyVersionInfoA succeeded\n"); - ok(error == ERROR_OLD_WIN_VERSION || broken(error == ERROR_BAD_ARGUMENTS) /* some win2k */, - "VerifyVersionInfoA should have failed with ERROR_OLD_WIN_VERSION instead of %d\n", error); - - /* test the failure hierarchy for the four version fields */ - - info.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEXA); - GetVersionExA((OSVERSIONINFOA *)&info); - info.wServicePackMajor++; - SetLastError(0xdeadbeef); - ret = pVerifyVersionInfoA(&info, VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, - pVerSetConditionMask(0, VER_MINORVERSION, VER_GREATER_EQUAL)); - error = GetLastError(); - ok(!ret, "VerifyVersionInfoA succeeded\n"); - ok(error == ERROR_OLD_WIN_VERSION || broken(error == ERROR_BAD_ARGUMENTS) /* some win2k */, - "VerifyVersionInfoA should have failed with ERROR_OLD_WIN_VERSION instead of %d\n", error); - - info.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEXA); - GetVersionExA((OSVERSIONINFOA *)&info); - info.dwMinorVersion++; - SetLastError(0xdeadbeef); - ret = pVerifyVersionInfoA(&info, VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, - pVerSetConditionMask(0, VER_MINORVERSION, VER_GREATER_EQUAL)); - error = GetLastError(); - ok(!ret, "VerifyVersionInfoA succeeded\n"); - ok(error == ERROR_OLD_WIN_VERSION || broken(error == ERROR_BAD_ARGUMENTS) /* some win2k */, - "VerifyVersionInfoA should have failed with ERROR_OLD_WIN_VERSION instead of %d\n", error); - - info.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEXA); - GetVersionExA((OSVERSIONINFOA *)&info); - info.dwMajorVersion++; - SetLastError(0xdeadbeef); - ret = pVerifyVersionInfoA(&info, VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, - pVerSetConditionMask(0, VER_MINORVERSION, VER_GREATER_EQUAL)); - error = GetLastError(); - ok(!ret, "VerifyVersionInfoA succeeded\n"); - ok(error == ERROR_OLD_WIN_VERSION || broken(error == ERROR_BAD_ARGUMENTS) /* some win2k */, - "VerifyVersionInfoA should have failed with ERROR_OLD_WIN_VERSION instead of %d\n", error); - - ret = pVerifyVersionInfoA(&info, VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, - pVerSetConditionMask(0, VER_MINORVERSION, VER_GREATER_EQUAL)); - ok(ret || broken(!ret) /* some win2k */, "VerifyVersionInfoA failed with error %d\n", GetLastError()); - - info.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEXA); - GetVersionExA((OSVERSIONINFOA *)&info); - info.dwBuildNumber++; - SetLastError(0xdeadbeef); - ret = pVerifyVersionInfoA(&info, VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, - pVerSetConditionMask(0, VER_MINORVERSION, VER_GREATER_EQUAL)); - error = GetLastError(); - ok(!ret, "VerifyVersionInfoA succeeded\n"); - ok(error == ERROR_OLD_WIN_VERSION || broken(error == ERROR_BAD_ARGUMENTS) /* some win2k */, - "VerifyVersionInfoA should have failed with ERROR_OLD_WIN_VERSION instead of %d\n", error); - - ret = pVerifyVersionInfoA(&info, VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, - pVerSetConditionMask(0, VER_MINORVERSION, VER_GREATER_EQUAL)); - ok(ret || broken(!ret) /* some win2k */, "VerifyVersionInfoA failed with error %d\n", GetLastError()); - /* test bad dwOSVersionInfoSize */ info.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEXA); GetVersionExA((OSVERSIONINFOA *)&info); info.dwOSVersionInfoSize = 0; ret = pVerifyVersionInfoA(&info, VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, pVerSetConditionMask(0, VER_MAJORVERSION, VER_GREATER_EQUAL)); - ok(ret || broken(!ret) /* some win2k */, "VerifyVersionInfoA failed with error %d\n", GetLastError()); + ok(ret, "VerifyVersionInfoA failed with error %d\n", GetLastError()); } START_TEST(version) -- 2.16.1

1 1

[PATCH 1/2] kernel32: Add GetEnabledXStateFeatures() stub
by Nikolay Sivov 25 Feb '18

25 Feb '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- .../api-ms-win-core-xstate-l2-1-0.spec | 2 +- dlls/kernel32/cpu.c | 9 +++++++++ dlls/kernel32/kernel32.spec | 2 +- dlls/kernelbase/kernelbase.spec | 2 +- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-core-xstate-l2-1-0/api-ms-win-core-xstate-l2-1-0.spec b/dlls/api-ms-win-core-xstate-l2-1-0/api-ms-win-core-xstate-l2-1-0.spec index 0f9438dc85..f051097819 100644 --- a/dlls/api-ms-win-core-xstate-l2-1-0/api-ms-win-core-xstate-l2-1-0.spec +++ b/dlls/api-ms-win-core-xstate-l2-1-0/api-ms-win-core-xstate-l2-1-0.spec @@ -1,5 +1,5 @@ @ stub CopyContext -@ stub GetEnabledXStateFeatures +@ stdcall -ret64 -arch=i386,x86_64 GetEnabledXStateFeatures() kernel32.GetEnabledXStateFeatures @ stub GetXStateFeaturesMask @ stub InitializeContext @ stub LocateXStateFeature diff --git a/dlls/kernel32/cpu.c b/dlls/kernel32/cpu.c index 2e0e79f8e8..ec1fd0f90d 100644 --- a/dlls/kernel32/cpu.c +++ b/dlls/kernel32/cpu.c @@ -327,3 +327,12 @@ DWORD WINAPI GetActiveProcessorCount(WORD group) FIXME("semi-stub, returning %u\n", cpus); return cpus; } + +/*********************************************************************** + * GetEnabledXStateFeatures (KERNEL32.@) + */ +DWORD64 WINAPI GetEnabledXStateFeatures(void) +{ + FIXME("\n"); + return 0; +} diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 11379201a9..c431ecbfb7 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -657,7 +657,7 @@ # @ stub GetDurationFormat # @ stub GetDurationFormatEx @ stdcall GetDynamicTimeZoneInformation(ptr) -# @ stub GetEnabledXStateFeatures +@ stdcall -ret64 -arch=i386,x86_64 GetEnabledXStateFeatures() @ stdcall GetEnvironmentStrings() GetEnvironmentStringsA @ stdcall GetEnvironmentStringsA() @ stdcall GetEnvironmentStringsW() diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index eb6edbe5f7..a834bbeb4d 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -491,7 +491,7 @@ # @ stub GetEffectivePackageStatusForUser # @ stub GetEightBitStringToUnicodeSizeRoutine # @ stub GetEightBitStringToUnicodeStringRoutine -# @ stub GetEnabledXStateFeatures +@ stdcall -ret64 -arch=i386,x86_64 GetEnabledXStateFeatures() kernel32.GetEnabledXStateFeatures @ stdcall GetEnvironmentStrings() kernel32.GetEnvironmentStrings @ stdcall GetEnvironmentStringsA() kernel32.GetEnvironmentStringsA @ stdcall GetEnvironmentStringsW() kernel32.GetEnvironmentStringsW -- 2.16.1

1 1

[PATCH] uxtheme: Use global memory allocation helpers
by Nikolay Sivov 25 Feb '18

25 Feb '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/uxtheme/buffer.c | 5 +++-- dlls/uxtheme/msstyles.c | 23 ++++++++++++----------- dlls/uxtheme/uxini.c | 5 +++-- 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/dlls/uxtheme/buffer.c b/dlls/uxtheme/buffer.c index 664515c278..32d341cb7f 100644 --- a/dlls/uxtheme/buffer.c +++ b/dlls/uxtheme/buffer.c @@ -32,6 +32,7 @@ #include "uxtheme.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(uxtheme); @@ -48,7 +49,7 @@ static void free_paintbuffer(struct paintbuffer *buffer) { DeleteObject(buffer->bitmap); DeleteDC(buffer->memorydc); - HeapFree(GetProcessHeap(), 0, buffer); + heap_free(buffer); } static struct paintbuffer *get_buffer_obj(HPAINTBUFFER handle) @@ -98,7 +99,7 @@ HPAINTBUFFER WINAPI BeginBufferedPaint(HDC targetdc, const RECT *rect, if (params) FIXME("painting parameters are ignored\n"); - buffer = HeapAlloc(GetProcessHeap(), 0, sizeof(*buffer)); + buffer = heap_alloc(sizeof(*buffer)); buffer->targetdc = targetdc; buffer->rect = *rect; buffer->memorydc = CreateCompatibleDC(targetdc); diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c index e471c3cc0c..fe91494afd 100644 --- a/dlls/uxtheme/msstyles.c +++ b/dlls/uxtheme/msstyles.c @@ -36,6 +36,7 @@ #include "wine/unicode.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(uxtheme); @@ -175,7 +176,7 @@ HRESULT MSSTYLES_OpenThemeFile(LPCWSTR lpThemeFile, LPCWSTR pszColorName, LPCWST goto invalid_theme; } - *tf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(THEME_FILE)); + *tf = heap_alloc_zero(sizeof(THEME_FILE)); (*tf)->hTheme = hTheme; GetFullPathNameW(lpThemeFile, MAX_PATH, (*tf)->szThemeFile, NULL); @@ -214,13 +215,13 @@ void MSSTYLES_CloseThemeFile(PTHEME_FILE tf) while(ps->properties) { PTHEME_PROPERTY prop = ps->properties; ps->properties = prop->next; - HeapFree(GetProcessHeap(), 0, prop); + heap_free(prop); } pcls->partstate = ps->next; - HeapFree(GetProcessHeap(), 0, ps); + heap_free(ps); } - HeapFree(GetProcessHeap(), 0, pcls); + heap_free(pcls); } } while (tf->images) @@ -228,9 +229,9 @@ void MSSTYLES_CloseThemeFile(PTHEME_FILE tf) PTHEME_IMAGE img = tf->images; tf->images = img->next; DeleteObject (img->image); - HeapFree (GetProcessHeap(), 0, img); + heap_free(img); } - HeapFree(GetProcessHeap(), 0, tf); + heap_free(tf); } } } @@ -450,7 +451,7 @@ static PTHEME_CLASS MSSTYLES_AddClass(PTHEME_FILE tf, LPCWSTR pszAppName, LPCWST PTHEME_CLASS cur = MSSTYLES_FindClass(tf, pszAppName, pszClassName); if(cur) return cur; - cur = HeapAlloc(GetProcessHeap(), 0, sizeof(THEME_CLASS)); + cur = heap_alloc(sizeof(*cur)); cur->hTheme = tf->hTheme; lstrcpyW(cur->szAppName, pszAppName); lstrcpyW(cur->szClassName, pszClassName); @@ -507,7 +508,7 @@ static PTHEME_PARTSTATE MSSTYLES_AddPartState(PTHEME_CLASS tc, int iPartId, int PTHEME_PARTSTATE cur = MSSTYLES_FindPartState(tc, iPartId, iStateId, NULL); if(cur) return cur; - cur = HeapAlloc(GetProcessHeap(), 0, sizeof(THEME_PARTSTATE)); + cur = heap_alloc(sizeof(*cur)); cur->iPartId = iPartId; cur->iStateId = iStateId; cur->properties = NULL; @@ -624,7 +625,7 @@ static PTHEME_PROPERTY MSSTYLES_AddProperty(PTHEME_PARTSTATE ps, int iPropertyPr /* Should duplicate properties overwrite the original, or be ignored? */ if(cur) return cur; - cur = HeapAlloc(GetProcessHeap(), 0, sizeof(THEME_PROPERTY)); + cur = heap_alloc(sizeof(*cur)); cur->iPrimitiveType = iPropertyPrimitive; cur->iPropertyId = iPropertyId; cur->lpValue = lpValue; @@ -665,7 +666,7 @@ static PTHEME_PROPERTY MSSTYLES_AddMetric(PTHEME_FILE tf, int iPropertyPrimitive /* Should duplicate properties overwrite the original, or be ignored? */ if(cur) return cur; - cur = HeapAlloc(GetProcessHeap(), 0, sizeof(THEME_PROPERTY)); + cur = heap_alloc(sizeof(*cur)); cur->iPrimitiveType = iPropertyPrimitive; cur->iPropertyId = iPropertyId; cur->lpValue = lpValue; @@ -1140,7 +1141,7 @@ HBITMAP MSSTYLES_LoadBitmap (PTHEME_CLASS tc, LPCWSTR lpFilename, BOOL* hasAlpha img = img->next; } /* Not found? Load from resources */ - img = HeapAlloc (GetProcessHeap(), 0, sizeof (THEME_IMAGE)); + img = heap_alloc(sizeof(*img)); img->image = LoadImageW(tc->hTheme, szFile, IMAGE_BITMAP, 0, 0, LR_CREATEDIBSECTION); prepare_alpha (img->image, hasAlpha); img->hasAlpha = *hasAlpha; diff --git a/dlls/uxtheme/uxini.c b/dlls/uxtheme/uxini.c index a2dfabfd0d..1581ff469a 100644 --- a/dlls/uxtheme/uxini.c +++ b/dlls/uxtheme/uxini.c @@ -27,6 +27,7 @@ #include "winnls.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(uxtheme); @@ -75,7 +76,7 @@ PUXINI_FILE UXINI_LoadINI(HMODULE hTheme, LPCWSTR lpName) { } dwIniSize = SizeofResource(hTheme, hrsc) / sizeof(WCHAR); - uf = HeapAlloc(GetProcessHeap(), 0, sizeof(UXINI_FILE)); + uf = heap_alloc(sizeof(*uf)); uf->lpIni = lpThemesIni; uf->lpCurLoc = lpThemesIni; uf->lpEnd = lpThemesIni + dwIniSize; @@ -92,7 +93,7 @@ PUXINI_FILE UXINI_LoadINI(HMODULE hTheme, LPCWSTR lpName) { */ void UXINI_CloseINI(PUXINI_FILE uf) { - HeapFree(GetProcessHeap(), 0, uf); + heap_free(uf); } /********************************************************************** -- 2.16.1

1 0

[PATCH 1/2] explorerframe: Use global memory allocation helpers
by Nikolay Sivov 25 Feb '18

25 Feb '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/explorerframe/nstc.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/explorerframe/nstc.c b/dlls/explorerframe/nstc.c index 15d2f2629b..37e1a553a4 100644 --- a/dlls/explorerframe/nstc.c +++ b/dlls/explorerframe/nstc.c @@ -33,6 +33,7 @@ #include "wine/list.h" #include "wine/debug.h" +#include "wine/heap.h" #include "explorerframe_main.h" @@ -861,9 +862,8 @@ static ULONG WINAPI NSTC2_fnRelease(INameSpaceTreeControl2* iface) if(!ref) { TRACE("Freeing.\n"); - HeapFree(GetProcessHeap(), 0, This); + heap_free(This); EFRAME_UnlockModule(); - return 0; } return ref; @@ -1001,7 +1001,7 @@ static HRESULT WINAPI NSTC2_fnInsertRoot(INameSpaceTreeControl2* iface, TRACE("%p, %d, %p, %x, %x, %p\n", This, iIndex, psiRoot, grfEnumFlags, grfRootStyle, pif); - new_root = HeapAlloc(GetProcessHeap(), 0, sizeof(nstc_root)); + new_root = heap_alloc(sizeof(*new_root)); if(!new_root) return E_OUTOFMEMORY; @@ -1025,7 +1025,7 @@ static HRESULT WINAPI NSTC2_fnInsertRoot(INameSpaceTreeControl2* iface, if(!new_root->htreeitem) { WARN("Failed to add the root.\n"); - HeapFree(GetProcessHeap(), 0, new_root); + heap_free(new_root); return E_FAIL; } @@ -1093,7 +1093,7 @@ static HRESULT WINAPI NSTC2_fnRemoveRoot(INameSpaceTreeControl2* iface, events_OnItemDeleted(This, root->psi, TRUE); SendMessageW(This->hwnd_tv, TVM_DELETEITEM, 0, (LPARAM)root->htreeitem); list_remove(&root->entry); - HeapFree(GetProcessHeap(), 0, root); + heap_free(root); return S_OK; } else @@ -1135,7 +1135,7 @@ static HRESULT WINAPI NSTC2_fnGetRootItems(INameSpaceTreeControl2* iface, if(!count) return E_INVALIDARG; - array = HeapAlloc(GetProcessHeap(), 0, sizeof(LPITEMIDLIST)*count); + array = heap_alloc(sizeof(LPITEMIDLIST)*count); i = 0; LIST_FOR_EACH_ENTRY(root, &This->roots, nstc_root, entry) @@ -1149,7 +1149,7 @@ static HRESULT WINAPI NSTC2_fnGetRootItems(INameSpaceTreeControl2* iface, for(i = 0; i < count; i++) ILFree(array[i]); - HeapFree(GetProcessHeap(), 0, array); + heap_free(array); return hr; } @@ -1610,7 +1610,7 @@ HRESULT NamespaceTreeControl_Constructor(IUnknown *pUnkOuter, REFIID riid, void EFRAME_LockModule(); - nstc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(NSTC2Impl)); + nstc = heap_alloc_zero(sizeof(*nstc)); if (!nstc) return E_OUTOFMEMORY; -- 2.16.1

1 1

[PATCH] avifil32: Remove some redundant statements
by Nikolay Sivov 25 Feb '18

25 Feb '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/avifil32/editstream.c | 1 - dlls/avifil32/getframe.c | 1 - dlls/avifil32/tmpfile.c | 1 - 3 files changed, 3 deletions(-) diff --git a/dlls/avifil32/editstream.c b/dlls/avifil32/editstream.c index 2e0fa2fd60..a4df6283eb 100644 --- a/dlls/avifil32/editstream.c +++ b/dlls/avifil32/editstream.c @@ -282,7 +282,6 @@ static ULONG WINAPI IAVIEditStream_fnRelease(IAVIEditStream*iface) } HeapFree(GetProcessHeap(), 0, This); - return 0; } return ref; } diff --git a/dlls/avifil32/getframe.c b/dlls/avifil32/getframe.c index c8580a8230..be4a2a9abf 100644 --- a/dlls/avifil32/getframe.c +++ b/dlls/avifil32/getframe.c @@ -134,7 +134,6 @@ static ULONG WINAPI IGetFrame_fnRelease(IGetFrame *iface) } HeapFree(GetProcessHeap(), 0, iface); - return 0; } return ref; diff --git a/dlls/avifil32/tmpfile.c b/dlls/avifil32/tmpfile.c index ee7e772b5e..6d199c7b95 100644 --- a/dlls/avifil32/tmpfile.c +++ b/dlls/avifil32/tmpfile.c @@ -94,7 +94,6 @@ static ULONG WINAPI ITmpFile_fnRelease(IAVIFile *iface) } HeapFree(GetProcessHeap(), 0, This); - return 0; } return ref; -- 2.16.1

1 0

GSoC
by Abhishek Kumar 25 Feb '18

25 Feb '18

Myself Abhishek,I want to contribute to wine towards the making explorer.exe more useful.i install wine 3.2 on mac os 10.13 and not able to do cut,copy,paste operation on files and folder.So please help Thank You

2 1

explorer.exe
by Abhishek Kumar 25 Feb '18

25 Feb '18

I am not able to perform paste operation on mac os sierra.i also not working proprerly

2 1

[PATCH 2/3] ws2_32/tests: Add ioctlsocket(FIONREAD) tests with listening socket.
by Akihiro Sagawa 25 Feb '18

25 Feb '18

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/ws2_32/tests/sock.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+)

2 1

[PATCH 3/3] ws2_32: Fix ioctlsocket(FIONREAD) with listening socket.
by Akihiro Sagawa 25 Feb '18

25 Feb '18

Fixes Bug 32802. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/ws2_32/socket.c | 12 ++++++++++++ dlls/ws2_32/tests/sock.c | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-)

1 0

po: Update Polish translation
by Marcin Mikołajczak 24 Feb '18

24 Feb '18

1 0

[PATCH v2] ping: Implement -l, -w, -n using IcmpSendEcho
by Isira Seneviratne 24 Feb '18

24 Feb '18

1 0

[PATCH v2] ping: Implement -l, -w, -n using IcmpSendEcho
by Isira Seneviratne 24 Feb '18

24 Feb '18

1 0

[PATCH] quartz: Don't create the advise thread during the clock teardown
by Michael Stefaniuc 23 Feb '18

23 Feb '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- Fixes bug #44255. All the glory goes to Focht as there was zero brainZ involved on my side. dlls/quartz/systemclock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/systemclock.c b/dlls/quartz/systemclock.c index a3e1504768..1638e1117e 100644 --- a/dlls/quartz/systemclock.c +++ b/dlls/quartz/systemclock.c @@ -229,7 +229,7 @@ static ULONG WINAPI SystemClockImpl_Release(IReferenceClock* iface) { ULONG ref = InterlockedDecrement(&This->ref); TRACE("(%p): ReleaseRef to %d\n", This, ref); if (ref == 0) { - if (SystemClockPostMessageToAdviseThread(This, ADVISE_EXIT)) { + if (This->adviseThreadActive && SystemClockPostMessageToAdviseThread(This, ADVISE_EXIT)) { WaitForSingleObject(This->adviseThread, INFINITE); CloseHandle(This->adviseThread); } -- 2.14.3

1 0

[PATCH] mshtml/tests: Use GetModuleHandleA instead of LoadLibraryA.
by Andrey Gusev 23 Feb '18

23 Feb '18

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/mshtml/tests/protocol.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/tests/protocol.c b/dlls/mshtml/tests/protocol.c index 6376f3f671..ebaa6305dd 100644 --- a/dlls/mshtml/tests/protocol.c +++ b/dlls/mshtml/tests/protocol.c @@ -603,7 +603,7 @@ static void test_res_protocol(void) test_res_url("/Test/res.html"); test_res_url("/test/dir/dir2/res.html"); - if(GetProcAddress(LoadLibraryA("urlmon.dll"), "CreateUri")) { + if(GetProcAddress(GetModuleHandleA("urlmon.dll"), "CreateUri")) { test_res_url("/test/dir/dir2/res.html?query_part"); test_res_url("/test/dir/dir2/res.html#hash_part"); test_res_url("/#123"); -- 2.13.6

2 1

[PATCH v2] ieframe/tests: Mark an IE test as todo on x64 and ARM
by Alex Henrie 23 Feb '18

23 Feb '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/ieframe/tests/ie.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/ieframe/tests/ie.c b/dlls/ieframe/tests/ie.c index cb901d7763..37845dc374 100644 --- a/dlls/ieframe/tests/ie.c +++ b/dlls/ieframe/tests/ie.c @@ -261,6 +261,9 @@ static void test_InternetExplorer(void) return; hres = IUnknown_QueryInterface(unk, &IID_IWebBrowser2, (void**)&wb); +#ifndef __i386__ +todo_wine +#endif ok(hres == S_OK, "Could not get IWebBrowser2 interface: %08x\n", hres); if (hres != S_OK) { IUnknown_Release(unk); -- 2.16.1

2 1

GSoC idea: Drop test workarounds
by Alex Henrie 23 Feb '18

23 Feb '18

Could we have a student systematically remove test workarounds for Windows <= 2000? I've recently taken care of several of them, but there are many more that only serve to confuse people and increase compilation time. -Alex

4 4

[PATCH] comctl32: Preserve tooltip size set by TTN_SHOW.
by Roman Pišl 23 Feb '18

23 Feb '18

Fixes https://bugs.winehq.org/show_bug.cgi?id=14336. Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> --- dlls/comctl32/tooltips.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index 12f2d4b81c..c0c020b7fc 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -634,7 +634,13 @@ TOOLTIPS_Show (TOOLTIPS_INFO *infoPtr, BOOL track_activate) TRACE("%s\n", debugstr_w(infoPtr->szTipText)); - TOOLTIPS_CalcTipSize (infoPtr, &size); + GetWindowRect(infoPtr->hwndSelf, &rect); + size.cx = rect.right - rect.left; + size.cy = rect.bottom - rect.top; + if (size.cx <= 0 || size.cy <= 0) + { + TOOLTIPS_CalcTipSize (infoPtr, &size); + } TRACE("size %d x %d\n", size.cx, size.cy); if (track_activate && (toolPtr->uFlags & TTF_TRACK)) -- 2.16.1

2 1

[PATCH] Implement ping -l, -w, -n using IcmpSendEcho
by Isira Seneviratne 23 Feb '18

23 Feb '18

3 2

[PATCH] shlwapi: Don't attempt to un-expand ComputerName in PathUnExpandEnvStrings.
by Thomas Faber 23 Feb '18

23 Feb '18

From: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> --- dlls/shlwapi/path.c | 2 -- dlls/shlwapi/tests/path.c | 18 ++++++++++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/shlwapi/path.c b/dlls/shlwapi/path.c index 89a3572b1611..ae05381b6684 100644 --- a/dlls/shlwapi/path.c +++ b/dlls/shlwapi/path.c @@ -4105,7 +4105,6 @@ BOOL WINAPI PathUnExpandEnvStringsA(LPCSTR path, LPSTR buffer, UINT buf_len) static const WCHAR allusersprofileW[] = {'%','A','L','L','U','S','E','R','S','P','R','O','F','I','L','E','%',0}; static const WCHAR appdataW[] = {'%','A','P','P','D','A','T','A','%',0}; -static const WCHAR computernameW[] = {'%','C','O','M','P','U','T','E','R','N','A','M','E','%',0}; static const WCHAR programfilesW[] = {'%','P','r','o','g','r','a','m','F','i','l','e','s','%',0}; static const WCHAR systemrootW[] = {'%','S','y','s','t','e','m','R','o','o','t','%',0}; static const WCHAR systemdriveW[] = {'%','S','y','s','t','e','m','D','r','i','v','e','%',0}; @@ -4142,7 +4141,6 @@ BOOL WINAPI PathUnExpandEnvStringsW(LPCWSTR path, LPWSTR buffer, UINT buf_len) struct envvars_map envvars[] = { { allusersprofileW, sizeof(allusersprofileW)/sizeof(WCHAR) }, { appdataW, sizeof(appdataW)/sizeof(WCHAR) }, - { computernameW, sizeof(computernameW)/sizeof(WCHAR) }, { programfilesW, sizeof(programfilesW)/sizeof(WCHAR) }, { systemrootW, sizeof(systemrootW)/sizeof(WCHAR) }, { systemdriveW, sizeof(systemdriveW)/sizeof(WCHAR) }, diff --git a/dlls/shlwapi/tests/path.c b/dlls/shlwapi/tests/path.c index 57fdfdd6c2bd..91c66b7ef315 100644 --- a/dlls/shlwapi/tests/path.c +++ b/dlls/shlwapi/tests/path.c @@ -1463,10 +1463,11 @@ static void test_PathUnExpandEnvStrings(void) static const WCHAR sysrootW[] = {'%','S','y','s','t','e','m','R','o','o','t','%',0}; static const WCHAR sysdriveW[] = {'%','S','y','s','t','e','m','D','r','i','v','e','%',0}; static const WCHAR nonpathW[] = {'p','a','t','h',0}; + static const WCHAR computernameW[] = {'C','O','M','P','U','T','E','R','N','A','M','E',0}; static const char sysrootA[] = "%SystemRoot%"; static const char sysdriveA[] = "%SystemDrive%"; - WCHAR pathW[MAX_PATH], buffW[MAX_PATH], sysdrvW[3]; - char path[MAX_PATH], buff[MAX_PATH], sysdrvA[3], envvarA[10]; + WCHAR pathW[MAX_PATH], buffW[MAX_PATH], sysdrvW[3], envvarW[30]; + char path[MAX_PATH], buff[MAX_PATH], sysdrvA[3], envvarA[30]; BOOL ret; UINT len; @@ -1476,6 +1477,19 @@ static void test_PathUnExpandEnvStrings(void) return; } + /* The value of ComputerName is not a path */ + ret = GetEnvironmentVariableA("COMPUTERNAME", envvarA, sizeof(envvarA)); + ok(ret, "got %d\n", ret); + SetLastError(0xdeadbeef); + ret = pPathUnExpandEnvStringsA(envvarA, buff, sizeof(buff)); + ok(!ret && GetLastError() == 0xdeadbeef, "got %d, error %d\n", ret, GetLastError()); + + ret = GetEnvironmentVariableW(computernameW, envvarW, sizeof(envvarW)/sizeof(WCHAR)); + ok(ret, "got %d\n", ret); + SetLastError(0xdeadbeef); + ret = pPathUnExpandEnvStringsW(envvarW, buffW, sizeof(buffW)/sizeof(WCHAR)); + ok(!ret && GetLastError() == 0xdeadbeef, "got %d, error %d\n", ret, GetLastError()); + /* something that can't be represented with env var */ strcpy(path, "somepath_name"); strcpy(buff, "xx"); -- 2.16.2

1 0

[PATCH v2 00/10] winevulkan
by Roderick Colenbrander 23 Feb '18

23 Feb '18

Hi all, This is an updated version of my first wave of Vulkan patches. Thanks to Henri and Jozef for their feedback. I incorporated your changes and made a few other cosmetic changes. Thanks, Roderick Roderick Colenbrander (10): vulkan: Add initial Wine vulkan header. winevulkan: Add stub ICD. winevulkan: Implement vk_icdNegotiateICDInterfaceVersion. winevulkan: Implement global Vulkan function stubs and loading. winevulkan: Define vulkan driver interface. winex11: Add Vulkan stubs. winex11: Implement vkEnumerateInstanceExtensionProperties. winevulkan/winex11: Implement vkCreateInstance. winevulkan: Add instance funcs stubs. winevulkan: Implement vkDestroyInstance. configure.ac | 10 + dlls/gdi32/Makefile.in | 3 +- dlls/gdi32/dibdrv/dc.c | 2 + dlls/gdi32/driver.c | 6 + dlls/gdi32/enhmfdrv/dc.c | 1 + dlls/gdi32/enhmfdrv/init.c | 1 + dlls/gdi32/freetype.c | 1 + dlls/gdi32/gdi32.spec | 3 + dlls/gdi32/mfdrv/init.c | 1 + dlls/gdi32/path.c | 1 + dlls/gdi32/vulkan.c | 41 + dlls/wineandroid.drv/init.c | 1 + dlls/winemac.drv/gdi.c | 1 + dlls/wineps.drv/init.c | 1 + dlls/winevulkan/Makefile.in | 8 + dlls/winevulkan/version.rc | 27 + dlls/winevulkan/vulkan.c | 224 ++++ dlls/winevulkan/vulkan_private.h | 57 + dlls/winevulkan/vulkan_thunks.c | 101 ++ dlls/winevulkan/vulkan_thunks.h | 12 + dlls/winevulkan/winevulkan.spec | 2 + dlls/winex11.drv/Makefile.in | 1 + dlls/winex11.drv/init.c | 16 + dlls/winex11.drv/vulkan.c | 152 +++ dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/xrender.c | 1 + include/config.h.in | 3 + include/wine/gdi_driver.h | 5 +- include/wine/vulkan.h | 2743 ++++++++++++++++++++++++++++++++++++++ include/wine/vulkan_driver.h | 23 + 30 files changed, 3447 insertions(+), 2 deletions(-) create mode 100644 dlls/gdi32/vulkan.c create mode 100644 dlls/winevulkan/Makefile.in create mode 100644 dlls/winevulkan/version.rc create mode 100644 dlls/winevulkan/vulkan.c create mode 100644 dlls/winevulkan/vulkan_private.h create mode 100644 dlls/winevulkan/vulkan_thunks.c create mode 100644 dlls/winevulkan/vulkan_thunks.h create mode 100644 dlls/winevulkan/winevulkan.spec create mode 100644 dlls/winex11.drv/vulkan.c create mode 100644 include/wine/vulkan.h create mode 100644 include/wine/vulkan_driver.h -- 2.14.3

4 18

[PATCH] user32: Add a timeout when sending WM_WINE_DESTROYWINDOW
by Andrew Eikum 23 Feb '18

23 Feb '18

Without this change, the test will deadlock in DestroyWindow waiting for the other thread to process the WM_WINE_DESTROYWINDOW message. Note that this adds about 1 second of runtime to the test, waiting for the SendMessage to time out. Windows does not time out like this. Another option would be to use PostMessage, but that seems like a larger change. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/user32/tests/win.c | 98 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/user32/win.c | 4 +- 2 files changed, 100 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 96a2467da0..b8fa44878c 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -10433,6 +10433,103 @@ if (!is_wine) /* FIXME: remove once Wine is fixed */ DestroyWindow(owner); } +static struct destroy_data +{ + HWND main_wnd; + HWND thread_wnd; + HANDLE evt; + DWORD main_tid; +} destroy_data; + +static LRESULT WINAPI destroy_thread_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +{ + switch (msg) + { + case WM_DESTROY: + PostQuitMessage(0); + break; + } + return DefWindowProcA(hwnd, msg, wparam, lparam); +} + +static DWORD CALLBACK destroy_thread(void *user) +{ + MSG msg; + + destroy_data.thread_wnd = CreateWindowExA(0, "destroy_test_thread", + "destroy test thread", WS_CHILD, 100, 100, 100, 100, + destroy_data.main_wnd, 0, GetModuleHandleA(NULL), NULL); + ok(destroy_data.thread_wnd != NULL, "CreateWindowEx failed with error %d\n", GetLastError()); + if (!destroy_data.thread_wnd) + return 0; + + PostThreadMessageW(destroy_data.main_tid, WM_USER, 0, 0); + + while (GetMessageA(&msg, 0, 0, 0)) + { + TranslateMessage(&msg); + DispatchMessageA(&msg); + } + + PostThreadMessageW(destroy_data.main_tid, WM_USER + 1, 0, 0); + WaitForSingleObject(destroy_data.evt, INFINITE); + + return 0; +} + +static void test_destroy_quit(void) +{ + MSG msg; + WNDCLASSA wnd_classA; + ATOM ret; + HANDLE thread; + + destroy_data.main_tid = GetCurrentThreadId(); + destroy_data.evt = CreateEventW(NULL, FALSE, FALSE, NULL); + + memset(&wnd_classA, 0, sizeof(wnd_classA)); + wnd_classA.lpszClassName = "destroy_test_main"; + wnd_classA.lpfnWndProc = DefWindowProcA; + ret = RegisterClassA(&wnd_classA); + ok(ret, "RegisterClass failed with error %d\n", GetLastError()); + + memset(&wnd_classA, 0, sizeof(wnd_classA)); + wnd_classA.lpszClassName = "destroy_test_thread"; + wnd_classA.lpfnWndProc = destroy_thread_wndproc; + ret = RegisterClassA(&wnd_classA); + ok(ret, "RegisterClass failed with error %d\n", GetLastError()); + + destroy_data.main_wnd = CreateWindowExA(0, "destroy_test_main", + "destroy test main", WS_OVERLAPPED | WS_CAPTION, 100, 100, 100, 100, + 0, 0, GetModuleHandleA(NULL), NULL); + ok(destroy_data.main_wnd != NULL, "CreateWindowEx failed with error %d\n", GetLastError()); + if (!destroy_data.main_wnd) + { + CloseHandle(destroy_data.evt); + return; + } + + thread = CreateThread(NULL, 0, &destroy_thread, 0, 0, NULL); + + while (GetMessageA(&msg, 0, 0, 0)) + { + TranslateMessage(&msg); + DispatchMessageA(&msg); + if (msg.message == WM_USER) + { + DestroyWindow(destroy_data.main_wnd); + } + else if (msg.message == WM_USER + 1) + { + SetEvent(destroy_data.evt); + break; + } + } + + WaitForSingleObject(thread, INFINITE); + CloseHandle(thread); +} + START_TEST(win) { char **argv; @@ -10583,6 +10680,7 @@ START_TEST(win) test_desktop(); test_hide_window(); test_minimize_window(hwndMain); + test_destroy_quit(); /* add the tests above this line */ if (hhook) UnhookWindowsHookEx(hhook); diff --git a/dlls/user32/win.c b/dlls/user32/win.c index b13032bd6e..939903e053 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -971,7 +971,7 @@ LRESULT WIN_DestroyWindow( HWND hwnd ) for (i = 0; list[i]; i++) { if (WIN_IsCurrentThread( list[i] )) WIN_DestroyWindow( list[i] ); - else SendMessageW( list[i], WM_WINE_DESTROYWINDOW, 0, 0 ); + else SendMessageTimeoutW( list[i], WM_WINE_DESTROYWINDOW, 0, 0, SMTO_ABORTIFHUNG, 1000, NULL ); } HeapFree( GetProcessHeap(), 0, list ); } @@ -1047,7 +1047,7 @@ static void destroy_thread_window( HWND hwnd ) for (i = 0; list[i]; i++) { if (WIN_IsCurrentThread( list[i] )) destroy_thread_window( list[i] ); - else SendMessageW( list[i], WM_WINE_DESTROYWINDOW, 0, 0 ); + else SendMessageTimeoutW( list[i], WM_WINE_DESTROYWINDOW, 0, 0, SMTO_ABORTIFHUNG, 1000, NULL ); } HeapFree( GetProcessHeap(), 0, list ); } -- 2.16.2

3 5

[PATCH 5/5] usp10/tests: Cleanup test_ScriptTextOut3().
by Henri Verbeet 23 Feb '18

23 Feb '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/usp10/tests/usp10.c | 78 ++++++++++++++++++++---------------------------- 1 file changed, 33 insertions(+), 45 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 450c8ad..cfa51b3 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -2791,14 +2791,11 @@ static void test_ScriptTextOut3(HDC hdc) HRESULT hr; int cInChars; - int cMaxItems; SCRIPT_ITEM pItem[255]; int pcItems; WCHAR TestItem1[] = {' ','\r', 0}; SCRIPT_CACHE psc; - int cChars; - int cMaxGlyphs; unsigned short pwOutGlyphs1[256]; WORD pwLogClust[256]; SCRIPT_VISATTR psva[256]; @@ -2808,48 +2805,39 @@ static void test_ScriptTextOut3(HDC hdc) ABC pABC[256]; RECT rect; - /* This is to ensure that nonexistent glyphs are translated into a valid glyph number */ - cInChars = 2; - cMaxItems = 255; - hr = ScriptItemize(TestItem1, cInChars, cMaxItems, NULL, NULL, pItem, &pcItems); - ok (hr == S_OK, "ScriptItemize should return S_OK, returned %08x\n", hr); - /* This test is for the interim operation of ScriptItemize where only one SCRIPT_ITEM is * - * returned. */ - ok (pcItems > 0, "The number of SCRIPT_ITEMS should be greater than 0\n"); - if (pcItems > 0) - ok (pItem[0].iCharPos == 0 && pItem[2].iCharPos == cInChars, - "Start pos not = 0 (%d) or end pos not = %d (%d)\n", - pItem[0].iCharPos, cInChars, pItem[2].iCharPos); - - /* It would appear that we have a valid SCRIPT_ANALYSIS and can continue - * ie. ScriptItemize has succeeded and that pItem has been set */ - cInChars = 2; - if (hr == S_OK) { - psc = NULL; /* must be null on first call */ - cChars = cInChars; - cMaxGlyphs = 256; - hr = ScriptShape(hdc, &psc, TestItem1, cChars, - cMaxGlyphs, &pItem[0].a, - pwOutGlyphs1, pwLogClust, psva, &pcGlyphs); - ok (hr == S_OK, "ScriptShape should return S_OK not (%08x)\n", hr); - ok (psc != NULL, "psc should not be null and have SCRIPT_CACHE buffer address\n"); - ok (pcGlyphs == cChars, "Chars in (%d) should equal Glyphs out (%d)\n", cChars, pcGlyphs); - if (hr ==0) { - /* Note hdc is needed as glyph info is not yet in psc */ - hr = ScriptPlace(hdc, &psc, pwOutGlyphs1, pcGlyphs, psva, &pItem[0].a, piAdvance, - pGoffset, pABC); - ok (hr == S_OK, "Should return S_OK not (%08x)\n", hr); - - /* Test Rect Rgn is acceptable */ - SetRect(&rect, 10, 10, 40, 20); - hr = ScriptTextOut(hdc, &psc, 0, 0, 0, &rect, &pItem[0].a, NULL, 0, pwOutGlyphs1, pcGlyphs, - piAdvance, NULL, pGoffset); - ok (hr == S_OK, "ScriptTextOut should return S_OK not (%08x)\n", hr); - } - /* Clean up and go */ - ScriptFreeCache(&psc); - ok( psc == NULL, "Expected psc to be NULL, got %p\n", psc); - } + /* This is to ensure that non-existent glyphs are translated into a valid + * glyph number. */ + cInChars = lstrlenW(TestItem1); + hr = ScriptItemize(TestItem1, cInChars, ARRAY_SIZE(pItem), NULL, NULL, pItem, &pcItems); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + /* This test is for the interim operation of ScriptItemize() where only + * one SCRIPT_ITEM is returned. */ + ok(pcItems == 2, "Got unexpected item count %d.\n", pcItems); + ok(pItem[0].iCharPos == 0, "Got unexpected character position %d.\n", pItem[0].iCharPos); + ok(pItem[1].iCharPos == 1, "Got unexpected character position %d.\n", pItem[0].iCharPos); + ok(pItem[2].iCharPos == cInChars, "Got unexpected character position %d, expected %d.\n", + pItem[2].iCharPos, cInChars); + + psc = NULL; + hr = ScriptShape(hdc, &psc, TestItem1, cInChars, ARRAY_SIZE(pwOutGlyphs1), + &pItem[0].a, pwOutGlyphs1, pwLogClust, psva, &pcGlyphs); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(!!psc, "Got unexpected psc %p.\n", psc); + ok(pcGlyphs == cInChars, "Got unexpected glyph count %d, expected %d.\n", pcGlyphs, cInChars); + + /* Note hdc is needed as glyph info is not yet in psc. */ + hr = ScriptPlace(hdc, &psc, pwOutGlyphs1, pcGlyphs, + psva, &pItem[0].a, piAdvance, pGoffset, pABC); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + /* Test Rect Rgn is acceptable. */ + SetRect(&rect, 10, 10, 40, 20); + hr = ScriptTextOut(hdc, &psc, 0, 0, 0, &rect, &pItem[0].a, NULL, 0, + pwOutGlyphs1, pcGlyphs, piAdvance, NULL, pGoffset); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + ScriptFreeCache(&psc); + ok(!psc, "Got unexpected psc %p.\n", psc); } #define test_item_ScriptXtoX(a,b,c,d,e,f) (winetest_set_location(__FILE__,__LINE__), 0) ? 0 : _test_item_ScriptXtoX(a,b,c,d,e,f) -- 2.1.4

2 1

[PATCH 1/6] wined3d: Add helper function to construct debug strings.
by Józef Kucia 23 Feb '18

23 Feb '18

Hardcoded buffer sizes are error-prone. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/utils.c | 75 ++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 55 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 4e1da1ce009b..a9db5e072919 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4148,12 +4148,44 @@ const char *debug_d3ddevicetype(enum wined3d_device_type device_type) } } +struct debug_buffer +{ + char str[200]; /* wine_dbg_sprintf() limits string size to 200 */ + char *ptr; + int size; +}; + +static void init_debug_buffer(struct debug_buffer *buffer, const char *default_string) +{ + strcpy(buffer->str, default_string); + buffer->ptr = buffer->str; + buffer->size = ARRAY_SIZE(buffer->str); +} + +static BOOL debug_append(struct debug_buffer *buffer, const char *str, const char *separator) +{ + int size; + + if (!separator || buffer->ptr == buffer->str) + separator = ""; + size = snprintf(buffer->ptr, buffer->size, "%s%s", separator, str); + if (size == -1 || size >= buffer->size) + { + buffer->size = 0; + return FALSE; + } + + buffer->ptr += size; + buffer->size -= size; + return TRUE; +} + const char *wined3d_debug_resource_access(DWORD access) { - char buf[125]; + struct debug_buffer buffer; - buf[0] = '\0'; -#define ACCESS_TO_STR(x) if (access & x) { strcat(buf, " | "#x); access &= ~x; } + init_debug_buffer(&buffer, "0"); +#define ACCESS_TO_STR(x) if (access & x) { debug_append(&buffer, #x, " | "); access &= ~x; } ACCESS_TO_STR(WINED3D_RESOURCE_ACCESS_GPU); ACCESS_TO_STR(WINED3D_RESOURCE_ACCESS_CPU); ACCESS_TO_STR(WINED3D_RESOURCE_ACCESS_MAP_R); @@ -4162,15 +4194,15 @@ const char *wined3d_debug_resource_access(DWORD access) if (access) FIXME("Unrecognised access flag(s) %#x.\n", access); - return buf[0] ? wine_dbg_sprintf("%s", &buf[3]) : "0"; + return wine_dbg_sprintf("%s", buffer.str); } const char *debug_d3dusage(DWORD usage) { - char buf[552]; + struct debug_buffer buffer; - buf[0] = '\0'; -#define WINED3DUSAGE_TO_STR(u) if (usage & u) { strcat(buf, " | "#u); usage &= ~u; } + init_debug_buffer(&buffer, "0"); +#define WINED3DUSAGE_TO_STR(x) if (usage & x) { debug_append(&buffer, #x, " | "); usage &= ~x; } WINED3DUSAGE_TO_STR(WINED3DUSAGE_RENDERTARGET); WINED3DUSAGE_TO_STR(WINED3DUSAGE_DEPTHSTENCIL); WINED3DUSAGE_TO_STR(WINED3DUSAGE_WRITEONLY); @@ -4191,17 +4223,18 @@ const char *debug_d3dusage(DWORD usage) WINED3DUSAGE_TO_STR(WINED3DUSAGE_STATICDECL); WINED3DUSAGE_TO_STR(WINED3DUSAGE_OVERLAY); #undef WINED3DUSAGE_TO_STR - if (usage) FIXME("Unrecognized usage flag(s) %#x\n", usage); + if (usage) + FIXME("Unrecognized usage flag(s) %#x.\n", usage); - return buf[0] ? wine_dbg_sprintf("%s", &buf[3]) : "0"; + return wine_dbg_sprintf("%s", buffer.str); } -const char *debug_d3dusagequery(DWORD usagequery) +const char *debug_d3dusagequery(DWORD usage) { - char buf[238]; + struct debug_buffer buffer; - buf[0] = '\0'; -#define WINED3DUSAGEQUERY_TO_STR(u) if (usagequery & u) { strcat(buf, " | "#u); usagequery &= ~u; } + init_debug_buffer(&buffer, "0"); +#define WINED3DUSAGEQUERY_TO_STR(x) if (usage & x) { debug_append(&buffer, #x, " | "); usage &= ~x; } WINED3DUSAGEQUERY_TO_STR(WINED3DUSAGE_QUERY_FILTER); WINED3DUSAGEQUERY_TO_STR(WINED3DUSAGE_QUERY_GENMIPMAP); WINED3DUSAGEQUERY_TO_STR(WINED3DUSAGE_QUERY_LEGACYBUMPMAP); @@ -4211,9 +4244,10 @@ const char *debug_d3dusagequery(DWORD usagequery) WINED3DUSAGEQUERY_TO_STR(WINED3DUSAGE_QUERY_VERTEXTEXTURE); WINED3DUSAGEQUERY_TO_STR(WINED3DUSAGE_QUERY_WRAPANDMIP); #undef WINED3DUSAGEQUERY_TO_STR - if (usagequery) FIXME("Unrecognized usage query flag(s) %#x\n", usagequery); + if (usage) + FIXME("Unrecognized usage query flag(s) %#x.\n", usage); - return buf[0] ? wine_dbg_sprintf("%s", &buf[3]) : "0"; + return wine_dbg_sprintf("%s", buffer.str); } const char *debug_d3ddeclmethod(enum wined3d_decl_method method) @@ -6014,9 +6048,9 @@ int wined3d_ffp_vertex_program_key_compare(const void *key, const struct wine_rb const char *wined3d_debug_location(DWORD location) { + struct debug_buffer buffer; const char *prefix = ""; const char *suffix = ""; - char buf[294]; if (wined3d_popcount(location) > 16) { @@ -6025,8 +6059,8 @@ const char *wined3d_debug_location(DWORD location) suffix = ")"; } - buf[0] = '\0'; -#define LOCATION_TO_STR(u) if (location & u) { strcat(buf, " | "#u); location &= ~u; } + init_debug_buffer(&buffer, "0"); +#define LOCATION_TO_STR(x) if (location & x) { debug_append(&buffer, #x, " | "); location &= ~x; } LOCATION_TO_STR(WINED3D_LOCATION_DISCARDED); LOCATION_TO_STR(WINED3D_LOCATION_SYSMEM); LOCATION_TO_STR(WINED3D_LOCATION_USER_MEMORY); @@ -6037,9 +6071,10 @@ const char *wined3d_debug_location(DWORD location) LOCATION_TO_STR(WINED3D_LOCATION_RB_MULTISAMPLE); LOCATION_TO_STR(WINED3D_LOCATION_RB_RESOLVED); #undef LOCATION_TO_STR - if (location) FIXME("Unrecognized location flag(s) %#x.\n", location); + if (location) + FIXME("Unrecognized location flag(s) %#x.\n", location); - return wine_dbg_sprintf("%s%s%s", prefix, buf[0] ? &buf[3] : "0", suffix); + return wine_dbg_sprintf("%s%s%s", prefix, buffer.str, suffix); } /* Print a floating point value with the %.8e format specifier, always using -- 2.13.6

5 16

[PATCH] shell32: Partially implement IShellDispatch::BrowseForFolder()
by Nikolay Sivov 23 Feb '18

23 Feb '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- For https://bugs.winehq.org/show_bug.cgi?id=44578 dlls/shell32/shelldispatch.c | 76 +++++++++++++++++++++++++++++++++----------- 1 file changed, 57 insertions(+), 19 deletions(-) diff --git a/dlls/shell32/shelldispatch.c b/dlls/shell32/shelldispatch.c index 2dd52a61c1..66635547ed 100644 --- a/dlls/shell32/shelldispatch.c +++ b/dlls/shell32/shelldispatch.c @@ -1674,7 +1674,7 @@ static HRESULT Folder_Constructor(IShellFolder2 *folder, LPITEMIDLIST pidl, Fold This->Folder3_iface.lpVtbl = &FolderImpl_Vtbl; This->ref = 1; This->folder = folder; - This->pidl = pidl; + This->pidl = ILClone(pidl); hr = SHBindToParent(pidl, &IID_IShellFolder2, (void **)&parent, &last_part); IShellFolder2_GetDisplayNameOf(parent, last_part, SHGDN_FORPARSING, &strret); @@ -1820,11 +1820,33 @@ static HRESULT WINAPI ShellDispatch_get_Parent(IShellDispatch6 *iface, IDispatch return S_OK; } -static HRESULT WINAPI ShellDispatch_NameSpace(IShellDispatch6 *iface, - VARIANT dir, Folder **ret) +static HRESULT create_folder_for_pidl(LPITEMIDLIST pidl, Folder **ret) { IShellFolder2 *folder; IShellFolder *desktop; + HRESULT hr; + + *ret = NULL; + + if (FAILED(hr = SHGetDesktopFolder(&desktop))) + return hr; + + if (_ILIsDesktop(pidl)) + hr = IShellFolder_QueryInterface(desktop, &IID_IShellFolder2, (void **)&folder); + else + hr = IShellFolder_BindToObject(desktop, pidl, NULL, &IID_IShellFolder2, (void **)&folder); + + IShellFolder_Release(desktop); + + if (FAILED(hr)) + return S_FALSE; + + return Folder_Constructor(folder, pidl, ret); +} + +static HRESULT WINAPI ShellDispatch_NameSpace(IShellDispatch6 *iface, + VARIANT dir, Folder **ret) +{ LPITEMIDLIST pidl; HRESULT hr; @@ -1854,29 +1876,45 @@ static HRESULT WINAPI ShellDispatch_NameSpace(IShellDispatch6 *iface, return S_FALSE; } - if (FAILED(hr = SHGetDesktopFolder(&desktop))) - return hr; - - if (_ILIsDesktop(pidl)) - hr = IShellFolder_QueryInterface(desktop, &IID_IShellFolder2, (void **)&folder); - else - hr = IShellFolder_BindToObject(desktop, pidl, NULL, &IID_IShellFolder2, (void **)&folder); - - IShellFolder_Release(desktop); + hr = create_folder_for_pidl(pidl, ret); + ILFree(pidl); - if (FAILED(hr)) - return S_FALSE; + return hr; +} - return Folder_Constructor(folder, pidl, ret); +static BOOL is_optional_argument(const VARIANT *arg) +{ + return V_VT(arg) == VT_ERROR && V_ERROR(arg) == DISP_E_PARAMNOTFOUND; } static HRESULT WINAPI ShellDispatch_BrowseForFolder(IShellDispatch6 *iface, - LONG Hwnd, BSTR Title, LONG Options, VARIANT RootFolder, Folder **ppsdf) + LONG hwnd, BSTR title, LONG options, VARIANT rootfolder, Folder **folder) { - FIXME("(%p,%x,%s,%x,%s,%p)\n", iface, Hwnd, debugstr_w(Title), Options, debugstr_variant(&RootFolder), ppsdf); + PIDLIST_ABSOLUTE selection; + BROWSEINFOW bi = { 0 }; + HRESULT hr; - *ppsdf = NULL; - return E_NOTIMPL; + TRACE("(%p,%x,%s,%x,%s,%p)\n", iface, hwnd, debugstr_w(title), options, debugstr_variant(&rootfolder), folder); + + *folder = NULL; + + if (!is_optional_argument(&rootfolder)) + FIXME("root folder is ignored\n"); + + bi.hwndOwner = LongToHandle(hwnd); + bi.lpszTitle = title; + bi.ulFlags = options; + + selection = SHBrowseForFolderW(&bi); + if (selection) + { + hr = create_folder_for_pidl(selection, folder); + ILFree(selection); + } + else + hr = S_FALSE; + + return hr; } static HRESULT WINAPI ShellDispatch_Windows(IShellDispatch6 *iface, -- 2.16.1

1 0

[PATCH 1/2] winspool: Accept a backend printer handle when creating a printer handle [resend]
by Detlef Riekenberg 23 Feb '18

23 Feb '18

Needed to reduce the patchsize for moving AddPrinter a bit We need to move AddPrinter to allow importing CUPS printers centralized in the spooler service (bug 3507, bug 10358) -- bye bye ... Detlef Signed-off-by: Detlef Riekenberg <wine.dev(a)web.de> --- dlls/winspool.drv/info.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 9c24256..d28ca89 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -1444,7 +1444,7 @@ static void free_printer_entry( opened_printer_t *printer ) * ToDo: * - pDefault is ignored */ -static HANDLE get_opened_printer_entry(LPWSTR name, LPPRINTER_DEFAULTSW pDefault) +static HANDLE get_opened_printer_entry(LPWSTR name, LPPRINTER_DEFAULTSW pDefault, HANDLE backend_printer) { UINT_PTR handle = nb_printer_handles, i; jobqueue_t *queue = NULL; @@ -1513,10 +1513,15 @@ static HANDLE get_opened_printer_entry(LPWSTR name, LPPRINTER_DEFAULTSW pDefault } /* get a printer handle from the backend */ - if (! backend->fpOpenPrinter(name, &printer->backend_printer, pDefault)) { - handle = 0; - goto end; + if (!backend_printer) + { + if (! backend->fpOpenPrinter(name, &printer->backend_printer, pDefault)) { + handle = 0; + goto end; + } } + else + printer->backend_printer = backend_printer; /* clone the base name. This is NULL for the printserver */ printer->printername = strdupW(printername); @@ -2547,7 +2552,7 @@ BOOL WINAPI OpenPrinterW(LPWSTR lpPrinterName,HANDLE *phPrinter, LPPRINTER_DEFAU } /* Get the unique handle of the printer or Printserver */ - *phPrinter = get_opened_printer_entry(lpPrinterName, pDefault); + *phPrinter = get_opened_printer_entry(lpPrinterName, pDefault, NULL); if (*phPrinter && WINSPOOL_GetOpenedPrinterRegKey( *phPrinter, &key ) == ERROR_SUCCESS) { -- 2.7.4

2 2

kernel32/tests: Close process / thread handles.
by Thomas Faber 23 Feb '18

23 Feb '18

From: Mark Jansen <mark.jansen(a)reactos.org> Signed-off-by: Mark Jansen <mark.jansen(a)reactos.org> Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> --- dlls/kernel32/tests/process.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 59df58a45961..cbca00eada85 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -618,6 +618,8 @@ static void test_Startup(void) ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); /* child process has changed result file, so let profile functions know about it */ WritePrivateProfileStringA(NULL, NULL, NULL, resfile); + CloseHandle(info.hThread); + CloseHandle(info.hProcess); GetStartupInfoA(&si); okChildInt("StartupInfoA", "cb", startup.cb); @@ -656,6 +658,8 @@ static void test_Startup(void) ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); /* child process has changed result file, so let profile functions know about it */ WritePrivateProfileStringA(NULL, NULL, NULL, resfile); + CloseHandle(info.hThread); + CloseHandle(info.hProcess); okChildInt("StartupInfoA", "cb", startup.cb); okChildString("StartupInfoA", "lpDesktop", startup.lpDesktop); @@ -694,6 +698,8 @@ static void test_Startup(void) ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); /* child process has changed result file, so let profile functions know about it */ WritePrivateProfileStringA(NULL, NULL, NULL, resfile); + CloseHandle(info.hThread); + CloseHandle(info.hProcess); okChildInt("StartupInfoA", "cb", startup.cb); okChildString("StartupInfoA", "lpDesktop", si.lpDesktop); @@ -732,6 +738,8 @@ static void test_Startup(void) ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); /* child process has changed result file, so let profile functions know about it */ WritePrivateProfileStringA(NULL, NULL, NULL, resfile); + CloseHandle(info.hThread); + CloseHandle(info.hProcess); okChildInt("StartupInfoA", "cb", startup.cb); okChildString("StartupInfoA", "lpDesktop", startup.lpDesktop); @@ -770,6 +778,8 @@ static void test_Startup(void) ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); /* child process has changed result file, so let profile functions know about it */ WritePrivateProfileStringA(NULL, NULL, NULL, resfile); + CloseHandle(info.hThread); + CloseHandle(info.hProcess); okChildInt("StartupInfoA", "cb", startup.cb); okChildString("StartupInfoA", "lpDesktop", startup.lpDesktop); @@ -810,6 +820,8 @@ static void test_Startup(void) ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); /* child process has changed result file, so let profile functions know about it */ WritePrivateProfileStringA(NULL, NULL, NULL, resfile); + CloseHandle(info.hThread); + CloseHandle(info.hProcess); okChildInt("StartupInfoA", "cb", startup.cb); okChildString("StartupInfoA", "lpDesktop", startup.lpDesktop); @@ -848,6 +860,8 @@ static void test_Startup(void) ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); /* child process has changed result file, so let profile functions know about it */ WritePrivateProfileStringA(NULL, NULL, NULL, resfile); + CloseHandle(info.hThread); + CloseHandle(info.hProcess); okChildInt("StartupInfoA", "cb", startup.cb); okChildString("StartupInfoA", "lpDesktop", startup.lpDesktop); @@ -888,6 +902,8 @@ static void test_CommandLine(void) ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); /* child process has changed result file, so let profile functions know about it */ WritePrivateProfileStringA(NULL, NULL, NULL, resfile); + CloseHandle(info.hThread); + CloseHandle(info.hProcess); okChildInt("Arguments", "argcA", 5); okChildString("Arguments", "argvA4", "C:\\Program Files\\my nice app.exe"); @@ -909,6 +925,8 @@ static void test_CommandLine(void) ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); /* child process has changed result file, so let profile functions know about it */ WritePrivateProfileStringA(NULL, NULL, NULL, resfile); + CloseHandle(info.hThread); + CloseHandle(info.hProcess); okChildInt("Arguments", "argcA", 7); okChildString("Arguments", "argvA4", "a\"b\\"); @@ -930,6 +948,8 @@ static void test_CommandLine(void) ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); /* child process has changed result file, so let profile functions know about it */ WritePrivateProfileStringA(NULL, NULL, NULL, resfile); + CloseHandle(info.hThread); + CloseHandle(info.hProcess); sprintf(buffer, "./%s", exename); okChildString("Arguments", "argvA0", buffer); release_memory(); @@ -945,6 +965,8 @@ static void test_CommandLine(void) ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); /* child process has changed result file, so let profile functions know about it */ WritePrivateProfileStringA(NULL, NULL, NULL, resfile); + CloseHandle(info.hThread); + CloseHandle(info.hProcess); sprintf(buffer, ".\\%s", exename); okChildString("Arguments", "argvA0", buffer); release_memory(); @@ -965,6 +987,8 @@ static void test_CommandLine(void) ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); /* child process has changed result file, so let profile functions know about it */ WritePrivateProfileStringA(NULL, NULL, NULL, resfile); + CloseHandle(info.hThread); + CloseHandle(info.hProcess); if (p) sprintf(buffer, "..%s/%s", p, exename); else sprintf(buffer, "./%s", exename); okChildString("Arguments", "argvA0", buffer); @@ -988,6 +1012,8 @@ static void test_CommandLine(void) ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); /* child process has changed result file, so let profile functions know about it */ WritePrivateProfileStringA(NULL, NULL, NULL, resfile); + CloseHandle(info.hThread); + CloseHandle(info.hProcess); sprintf(buffer, "tests/process.c dump %s", resfile); okChildString("Arguments", "argvA0", "dummy"); okChildString("Arguments", "CommandLineA", buffer2); @@ -1085,6 +1111,8 @@ static void test_Directory(void) ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); /* child process has changed result file, so let profile functions know about it */ WritePrivateProfileStringA(NULL, NULL, NULL, resfile); + CloseHandle(info.hThread); + CloseHandle(info.hProcess); okChildIString("Misc", "CurrDirA", windir); release_memory(); @@ -1093,6 +1121,8 @@ static void test_Directory(void) /* search PATH for the exe if directory is NULL */ ok(CreateProcessA(NULL, cmdline, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info), "CreateProcess\n"); ok(TerminateProcess(info.hProcess, 0), "Child process termination\n"); + CloseHandle(info.hThread); + CloseHandle(info.hProcess); /* if any directory is provided, don't search PATH, error on bad directory */ SetLastError(0xdeadbeef); -- 2.16.2

1 0

Andrew Comminos Work
by CARLOS RODRIGUEZ 23 Feb '18

23 Feb '18

Leaves this article with andrew comminos work refer impact AZDO extensions on wine Approaching One Driver Overhead - Andrew Comminos' Blog | | | | Approaching One Driver Overhead - Andrew Comminos' Blog | | | Thanks

1 0

[PATCH] ntdll: Don't fail in NtUnmapViewOfSection when trying to unmap builtin view.
by Alistair Leslie-Hughes 23 Feb '18

23 Feb '18

From: Sebastian Lackner <sebastian(a)fds-team.de> Fixes a regression introduced in a557934c76c0e0bed6b73e5c8f79a0df059ff2de. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ntdll/virtual.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index d26be98bb5..106dab26d4 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -3164,7 +3164,11 @@ NTSTATUS WINAPI NtUnmapViewOfSection( HANDLE process, PVOID addr ) if (!status) delete_view( view ); else FIXME( "failed to unmap %p %x\n", view->base, status ); } - else delete_view( view ); + else + { + delete_view( view ); + status = STATUS_SUCCESS; + } } server_leave_uninterrupted_section( &csVirtual, &sigset ); return status; -- 2.16.1

1 0

[PATCH] crypt32/tests: Add CryptBinaryToStringW test
by Alistair Leslie-Hughes 23 Feb '18

23 Feb '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/crypt32/tests/base64.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/dlls/crypt32/tests/base64.c b/dlls/crypt32/tests/base64.c index 2e7e488..5329c6d 100644 --- a/dlls/crypt32/tests/base64.c +++ b/dlls/crypt32/tests/base64.c @@ -25,6 +25,7 @@ #include <winerror.h> #include <wincrypt.h> +#include "wine/heap.h" #include "wine/test.h" #define CERT_HEADER "-----BEGIN CERTIFICATE-----\r\n" @@ -47,6 +48,8 @@ static BOOL (WINAPI *pCryptBinaryToStringA)(const BYTE *pbBinary, static BOOL (WINAPI *pCryptStringToBinaryA)(LPCSTR pszString, DWORD cchString, DWORD dwFlags, BYTE *pbBinary, DWORD *pcbBinary, DWORD *pdwSkip, DWORD *pdwFlags); +static BOOL (WINAPI *pCryptBinaryToStringW)(const BYTE *pbBinary, + DWORD cbBinary, DWORD dwFlags, LPWSTR pszString, DWORD *pcchString); static BOOL (WINAPI *pCryptStringToBinaryW)(LPCWSTR pszString, DWORD cchString, DWORD dwFlags, BYTE *pbBinary, DWORD *pcbBinary, DWORD *pdwSkip, DWORD *pdwFlags); @@ -552,12 +555,34 @@ static void testStringToBinaryA(void) } } +static void testBinaryToStringW(void) +{ + BYTE *data; + int size = 16656; + DWORD out = 0; + BOOL ret; + + if (!pCryptBinaryToStringW) + { + win_skip("CryptBinaryToStringW is not available\n"); + return; + } + + data = heap_alloc_zero(size); + ret = pCryptBinaryToStringW(data, size, CRYPT_STRING_BASE64, NULL, &out); + ok(ret, "CryptBinaryToStringW failed: %d\n", GetLastError()); + todo_wine ok(out == 22903, "return size returned: %d\n", out); + + heap_free(data); +} + START_TEST(base64) { HMODULE lib = GetModuleHandleA("crypt32"); pCryptBinaryToStringA = (void *)GetProcAddress(lib, "CryptBinaryToStringA"); pCryptStringToBinaryA = (void *)GetProcAddress(lib, "CryptStringToBinaryA"); + pCryptBinaryToStringW = (void *)GetProcAddress(lib, "CryptBinaryToStringW"); pCryptStringToBinaryW = (void *)GetProcAddress(lib, "CryptStringToBinaryW"); if (pCryptBinaryToStringA) @@ -569,4 +594,6 @@ START_TEST(base64) testStringToBinaryA(); else win_skip("CryptStringToBinaryA is not available\n"); + + testBinaryToStringW(); } -- 1.9.1

2 2

[PATCH 4/5] wined3d: Explicitly calculate the sub-resource layer in raw_blitter_blit().
by Henri Verbeet 23 Feb '18

23 Feb '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index b2df8f9..9c0d039 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2587,6 +2587,7 @@ static DWORD raw_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit const struct wined3d_gl_info *gl_info = context->gl_info; unsigned int src_sub_resource_idx, dst_sub_resource_idx; struct wined3d_texture *src_texture, *dst_texture; + unsigned int src_layer, dst_layer; struct wined3d_blitter *next; GLuint src_name, dst_name; DWORD location; @@ -2625,6 +2626,7 @@ static DWORD raw_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit if (!wined3d_texture_load_location(src_texture, src_sub_resource_idx, context, location)) ERR("Failed to load the source sub-resource into %s.\n", wined3d_debug_location(location)); src_name = wined3d_texture_get_texture_name(src_texture, context, location == WINED3D_LOCATION_TEXTURE_SRGB); + src_layer = src_sub_resource_idx / src_texture->level_count; location = dst_location & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB); if (!location) @@ -2641,12 +2643,12 @@ static DWORD raw_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit ERR("Failed to load the destination sub-resource into %s.\n", wined3d_debug_location(location)); } dst_name = wined3d_texture_get_texture_name(dst_texture, context, location == WINED3D_LOCATION_TEXTURE_SRGB); + dst_layer = dst_sub_resource_idx / dst_texture->level_count; GL_EXTCALL(glCopyImageSubData(src_name, src_texture->target, src_surface->texture_level, - src_rect->left, src_rect->top, src_surface->texture_layer, - dst_name, dst_texture->target, dst_surface->texture_level, - dst_rect->left, dst_rect->top, dst_surface->texture_layer, - src_rect->right - src_rect->left, src_rect->bottom - src_rect->top, 1)); + src_rect->left, src_rect->top, src_layer, dst_name, dst_texture->target, dst_surface->texture_level, + dst_rect->left, dst_rect->top, dst_layer, src_rect->right - src_rect->left, + src_rect->bottom - src_rect->top, 1)); checkGLcall("copy image data"); wined3d_texture_validate_location(dst_texture, dst_sub_resource_idx, location); -- 2.1.4

1 0

[PATCH 3/5] wined3d: Explicitly calculate the sub-resource layer in wined3d_surface_upload_data().
by Henri Verbeet 23 Feb '18

23 Feb '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 0d09c2f..b2df8f9 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -783,6 +783,7 @@ void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct w struct wined3d_texture *texture = surface->container; UINT update_w = src_rect->right - src_rect->left; UINT update_h = src_rect->bottom - src_rect->top; + unsigned int layer; GLenum target; TRACE("surface %p, gl_info %p, format %s, src_rect %s, src_pitch %u, dst_point %s, srgb %#x, data {%#x:%p}.\n", @@ -808,6 +809,7 @@ void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct w } target = wined3d_texture_get_sub_resource_target(texture, sub_resource_idx); + layer = sub_resource_idx / texture->level_count; if (format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED) { @@ -830,7 +832,7 @@ void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct w TRACE("Uploading compressed data, target %#x, level %u, layer %u, x %d, y %d, w %u, h %u, " "format %#x, image_size %#x, addr %p.\n", - target, surface->texture_level, surface->texture_layer, dst_point->x, dst_point->y, + target, surface->texture_level, layer, dst_point->x, dst_point->y, update_w, update_h, internal, dst_slice_pitch, addr); if (dst_row_pitch == src_pitch) @@ -838,7 +840,7 @@ void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct w if (target == GL_TEXTURE_2D_ARRAY) { GL_EXTCALL(glCompressedTexSubImage3D(target, surface->texture_level, dst_point->x, dst_point->y, - surface->texture_layer, update_w, update_h, 1, internal, dst_slice_pitch, addr)); + layer, update_w, update_h, 1, internal, dst_slice_pitch, addr)); } else { @@ -858,7 +860,7 @@ void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct w if (target == GL_TEXTURE_2D_ARRAY) { GL_EXTCALL(glCompressedTexSubImage3D(target, surface->texture_level, dst_point->x, y, - surface->texture_layer, update_w, format->block_height, 1, internal, dst_row_pitch, addr)); + layer, update_w, format->block_height, 1, internal, dst_row_pitch, addr)); } else { @@ -881,14 +883,14 @@ void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct w TRACE("Uploading data, target %#x, level %u, layer %u, x %d, y %d, w %u, h %u, " "format %#x, type %#x, addr %p.\n", - target, surface->texture_level, surface->texture_layer, - dst_point->x, dst_point->y, update_w, update_h, format->glFormat, format->glType, addr); + target, surface->texture_level, layer, dst_point->x, dst_point->y, + update_w, update_h, format->glFormat, format->glType, addr); gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_ROW_LENGTH, src_pitch / format->byte_count); if (target == GL_TEXTURE_2D_ARRAY) { GL_EXTCALL(glTexSubImage3D(target, surface->texture_level, dst_point->x, dst_point->y, - surface->texture_layer, update_w, update_h, 1, format->glFormat, format->glType, addr)); + layer, update_w, update_h, 1, format->glFormat, format->glType, addr)); } else { -- 2.1.4

1 0

[PATCH 2/5] wined3d: Explicitly calculate the sub-resource layer in surface_download_data().
by Henri Verbeet 23 Feb '18

23 Feb '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 657127f..0d09c2f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -748,7 +748,8 @@ static void surface_download_data(struct wined3d_surface *surface, const struct } else if (temporary_mem) { - void *src_data = temporary_mem + surface->texture_layer * sub_resource->size; + unsigned int layer = sub_resource_idx / texture->level_count; + void *src_data = temporary_mem + layer * sub_resource->size; if (data.buffer_object) { GL_EXTCALL(glBindBuffer(GL_PIXEL_PACK_BUFFER, data.buffer_object)); -- 2.1.4

1 0

[PATCH 1/5] wined3d: Pass a texture and sub-resource index to surface_get_blt_info().
by Henri Verbeet 23 Feb '18

23 Feb '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index d4da824..657127f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -60,10 +60,19 @@ static inline void cube_coords_float(const RECT *r, UINT w, UINT h, struct float f->b = ((r->bottom * 2.0f) / h) - 1.0f; } -static void surface_get_blt_info(GLenum target, const RECT *rect, GLsizei w, GLsizei h, struct blt_info *info) +static void texture2d_get_blt_info(const struct wined3d_texture *texture, + unsigned int sub_resource_idx, const RECT *rect, struct blt_info *info) { struct wined3d_vec3 *coords = info->texcoords; struct float_rect f; + unsigned int level; + GLenum target; + GLsizei w, h; + + level = sub_resource_idx % texture->level_count; + w = wined3d_texture_get_level_pow2_width(texture, level); + h = wined3d_texture_get_level_pow2_height(texture, level); + target = wined3d_texture_get_sub_resource_target(texture, sub_resource_idx); switch (target) { @@ -182,14 +191,8 @@ void draw_textured_quad(struct wined3d_texture *texture, unsigned int sub_resour { const struct wined3d_gl_info *gl_info = context->gl_info; struct blt_info info; - unsigned int level; - GLenum target; - level = sub_resource_idx % texture->level_count; - target = wined3d_texture_get_sub_resource_target(texture, sub_resource_idx); - surface_get_blt_info(target, src_rect, - wined3d_texture_get_level_pow2_width(texture, level), - wined3d_texture_get_level_pow2_height(texture, level), &info); + texture2d_get_blt_info(texture, sub_resource_idx, src_rect, &info); gl_info->gl_ops.gl.p_glEnable(info.bind_target); checkGLcall("glEnable(bind_target)"); -- 2.1.4

1 0

[PATCH] testbot: A small fix and optimization for Collection::IsEmpty().
by Francois Gouget 23 Feb '18

23 Feb '18

Even after loading the collection $self->{Items} could be undefined if no row matched the filters. There is no need to extract the list of keys in order to determine whether the collection is empty. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/Collection.pm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/testbot/lib/ObjectModel/Collection.pm b/testbot/lib/ObjectModel/Collection.pm index 86dee057f..7fa977cda 100644 --- a/testbot/lib/ObjectModel/Collection.pm +++ b/testbot/lib/ObjectModel/Collection.pm @@ -420,7 +420,9 @@ sub IsEmpty($) $self->Load(); } - return scalar(keys %{$self->{Items}}) == 0; + # Even though scalar(hash) does not return the number of items in Perl 5.20 + # it returns 0 for an empty hash. + return !$self->{Items} || scalar(%{$self->{Items}}) == 0; } sub CombineKey($@) -- 2.16.1

1 0

[PATCH] testbot: Show which VM is blocking the revert in _DumpHostVMs().
by Francois Gouget 23 Feb '18

23 Feb '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Jobs.pm | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index ae1e4ecde..3eba27bc2 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -1069,7 +1069,22 @@ sub _DumpHostVMs($$$$) $VM = $Sched->{VMs}->GetItem($VMKey); next if ($VM->GetHost() ne $HostKey); - push @VMInfo, join(":", "$VMKey(". $VM->Status .")", $NeededVMs->{$VMKey}->[0], $NeededVMs->{$VMKey}->[1], $NeededVMs->{$VMKey}->[2]); + my $NeededVM = $NeededVMs->{$VMKey}; + my $Dep = ""; + if ($NeededVM->[3]) + { + foreach my $DepVM (@{$NeededVM->[3]}) + { + if ($DepVM->Status !~ /^(?:reverting|sleeping|running)$/) + { + $Dep = ":". $DepVM->Name; + last; + } + } + $Dep .= "/". scalar(@{$NeededVM->[3]}); + } + push @VMInfo, join(":", "$VMKey(". $VM->Status ."$Dep)", + $NeededVM->[0], $NeededVM->[1], $NeededVM->[2]); } my $PrettyHost = ($PrettyHostNames ? $PrettyHostNames->{$HostKey} : "") || $HostKey; -- 2.16.1

1 0

[PATCH] imagehlp/tests: MSVC compatibility fixes.
by Thomas Faber 22 Feb '18

22 Feb '18

From: Mark Jansen <mark.jansen(a)reactos.org> Signed-off-by: Mark Jansen <mark.jansen(a)reactos.org> Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> --- dlls/imagehlp/tests/image.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/imagehlp/tests/image.c b/dlls/imagehlp/tests/image.c index 3416c10fe315..65f59700e37f 100644 --- a/dlls/imagehlp/tests/image.c +++ b/dlls/imagehlp/tests/image.c @@ -56,7 +56,7 @@ struct Imports { } ibn; char dllname[0x10]; }; -#define EXIT_PROCESS (VA_START+RVA_IDATA+FIELD_OFFSET(struct Imports, thunks[0])) +#define EXIT_PROCESS (VA_START+RVA_IDATA+FIELD_OFFSET(struct Imports, thunks)) static struct _PeImage { IMAGE_DOS_HEADER dos_header; @@ -70,9 +70,9 @@ static struct _PeImage { char __alignment3[FILE_TOTAL-FILE_IDATA-sizeof(struct Imports)]; } bin = { /* dos header */ - {IMAGE_DOS_SIGNATURE, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, 0, 0, {}, FILE_PE_START}, + {IMAGE_DOS_SIGNATURE, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {0}, 0, 0, {0}, FILE_PE_START}, /* alignment before PE header */ - {}, + {0}, /* nt headers */ {IMAGE_NT_SIGNATURE, /* basic headers - 3 sections, no symbols, EXE file */ @@ -99,7 +99,7 @@ static struct _PeImage { 0, 0, 0, IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE} }, /* alignment before first section */ - {}, + {0}, /* .text section */ { 0x31, 0xC0, /* xor eax, eax */ @@ -122,7 +122,7 @@ static struct _PeImage { "KERNEL32.DLL" }, /* final alignment */ - {} + {0} }; #include <poppack.h> @@ -219,7 +219,8 @@ static const struct expected_blob b1[] = { {FILE_IDATA-FILE_TEXT, &bin.text_section}, {sizeof(bin.idata_section.descriptors[0].u.OriginalFirstThunk), &bin.idata_section.descriptors[0].u.OriginalFirstThunk}, - {FIELD_OFFSET(struct Imports, thunks)-FIELD_OFFSET(struct Imports, descriptors[0].Name), + {FIELD_OFFSET(struct Imports, thunks)- + (FIELD_OFFSET(struct Imports, descriptors)+FIELD_OFFSET(IMAGE_IMPORT_DESCRIPTOR, Name)), &bin.idata_section.descriptors[0].Name}, {FILE_TOTAL-FILE_IDATA-FIELD_OFFSET(struct Imports, ibn), &bin.idata_section.ibn} -- 2.16.2

1 0

[PATCH 4/4] mshtml: Set SCRIPTPROP_INVOKEVERSIONING based on document mode value.
by Jacek Caban 22 Feb '18

22 Feb '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmldoc.c | 5 ++--- dlls/mshtml/htmlwindow.c | 4 +--- dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/mutation.c | 19 +++++++++++++++---- dlls/mshtml/script.c | 22 +--------------------- 5 files changed, 21 insertions(+), 31 deletions(-)

1 0

[PATCH 3/4] mshtml: Properly handle conditional comments in IE9+ modes.
by Jacek Caban 22 Feb '18

22 Feb '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/mutation.c | 22 ++++++++-------------- dlls/mshtml/tests/documentmode.js | 8 ++------ 2 files changed, 10 insertions(+), 20 deletions(-)

1 0

[PATCH 2/4] mshtml: Properly support custom event listeners in XMLHttpRequest object.
by Jacek Caban 22 Feb '18

22 Feb '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/tests/events.js | 12 ++++++++++++ dlls/mshtml/xmlhttprequest.c | 4 +--- 2 files changed, 13 insertions(+), 3 deletions(-)

1 0

[PATCH 1/4] mshtml: Register load, error and abort events directly in event target.
by Jacek Caban 22 Feb '18

22 Feb '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmldoc.c | 2 +- dlls/mshtml/htmlelem.c | 11 +--------- dlls/mshtml/htmlevent.c | 53 +++++++++++++++++++++++++++++---------------- dlls/mshtml/htmlevent.h | 2 +- dlls/mshtml/htmlwindow.c | 2 +- dlls/mshtml/tests/events.js | 40 ++++++++++++++++++++++++++++++++++ 6 files changed, 78 insertions(+), 32 deletions(-)

1 0

[PATCH v2 1/5] winegstreamer: Stop creating the filter if gstreamer fails to render.
by Zebediah Figura 22 Feb '18

22 Feb '18

Otherwise the push_data() thread will run and try to use resources we never allocated. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winegstreamer/gstdemux.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index a19c64f..b48648c 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1103,7 +1103,6 @@ static void unknown_type(GstElement *bin, GstPad *pad, GstCaps *caps, gpointer u static HRESULT GST_Connect(GSTInPin *pPin, IPin *pConnectPin, ALLOCATOR_PROPERTIES *props) { GSTImpl *This = (GSTImpl*)pPin->pin.pinInfo.pFilter; - HRESULT hr; int ret, i; LONGLONG avail, duration; GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE( @@ -1163,19 +1162,20 @@ static HRESULT GST_Connect(GSTInPin *pPin, IPin *pConnectPin, ALLOCATOR_PROPERTI WaitForSingleObject(This->event, -1); gst_element_get_state(This->container, NULL, NULL, -1); - if (!This->cStreams) { + if (!This->cStreams) + { FIXME("GStreamer could not find any streams\n"); - hr = E_FAIL; - } else { - gst_pad_query_duration(This->ppPins[0]->their_src, GST_FORMAT_TIME, &duration); - for (i = 0; i < This->cStreams; ++i) { - This->ppPins[i]->seek.llDuration = This->ppPins[i]->seek.llStop = duration / 100; - This->ppPins[i]->seek.llCurrent = 0; - if (!This->ppPins[i]->seek.llDuration) - This->ppPins[i]->seek.dwCapabilities = 0; - WaitForSingleObject(This->ppPins[i]->caps_event, -1); - } - hr = S_OK; + return E_FAIL; + } + + gst_pad_query_duration(This->ppPins[0]->their_src, GST_FORMAT_TIME, &duration); + for (i = 0; i < This->cStreams; ++i) + { + This->ppPins[i]->seek.llDuration = This->ppPins[i]->seek.llStop = duration / 100; + This->ppPins[i]->seek.llCurrent = 0; + if (!This->ppPins[i]->seek.llDuration) + This->ppPins[i]->seek.dwCapabilities = 0; + WaitForSingleObject(This->ppPins[i]->caps_event, INFINITE); } *props = This->props; @@ -1191,7 +1191,7 @@ static HRESULT GST_Connect(GSTInPin *pPin, IPin *pConnectPin, ALLOCATOR_PROPERTI gst_pad_set_active(This->my_src, 1); This->nextofs = This->nextpullofs = 0; - return hr; + return S_OK; } static inline GSTOutPin *impl_from_IMediaSeeking( IMediaSeeking *iface ) -- 2.7.4

2 9

[Patch website v2] Add Korean translations of News resend
by 김건우 22 Feb '18

22 Feb '18

2 1

[PATCH 1/5] winegstreamer: Stop creating the filter if gstreamer fails to render.
by Zebediah Figura 22 Feb '18

22 Feb '18

Otherwise the push_data() thread will run and try to use resources we never allocated. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winegstreamer/gstdemux.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index a19c64f..ea61ed5 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1103,7 +1103,6 @@ static void unknown_type(GstElement *bin, GstPad *pad, GstCaps *caps, gpointer u static HRESULT GST_Connect(GSTInPin *pPin, IPin *pConnectPin, ALLOCATOR_PROPERTIES *props) { GSTImpl *This = (GSTImpl*)pPin->pin.pinInfo.pFilter; - HRESULT hr; int ret, i; LONGLONG avail, duration; GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE( @@ -1165,7 +1164,7 @@ static HRESULT GST_Connect(GSTInPin *pPin, IPin *pConnectPin, ALLOCATOR_PROPERTI if (!This->cStreams) { FIXME("GStreamer could not find any streams\n"); - hr = E_FAIL; + return E_FAIL; } else { gst_pad_query_duration(This->ppPins[0]->their_src, GST_FORMAT_TIME, &duration); for (i = 0; i < This->cStreams; ++i) { @@ -1175,7 +1174,6 @@ static HRESULT GST_Connect(GSTInPin *pPin, IPin *pConnectPin, ALLOCATOR_PROPERTI This->ppPins[i]->seek.dwCapabilities = 0; WaitForSingleObject(This->ppPins[i]->caps_event, -1); } - hr = S_OK; } *props = This->props; @@ -1191,7 +1189,7 @@ static HRESULT GST_Connect(GSTInPin *pPin, IPin *pConnectPin, ALLOCATOR_PROPERTI gst_pad_set_active(This->my_src, 1); This->nextofs = This->nextpullofs = 0; - return hr; + return S_OK; } static inline GSTOutPin *impl_from_IMediaSeeking( IMediaSeeking *iface ) -- 2.7.4

2 6

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-devel