March 2018 - Wine-Commits - list.winehq.org

Anton Baskanov : amstream: Implement CheckMediaType for AMDirectDrawStream based on code form mediastreamfilter.c.
by Alexandre Julliard March 1, 2018

March 1, 2018

Module: wine Branch: master Commit: 5b03813d9d8a41714a175d94a8ca56d38694acc1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b03813d9d8a41714a175d94… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Fri Feb 16 23:43:36 2018 +0700 amstream: Implement CheckMediaType for AMDirectDrawStream based on code form mediastreamfilter.c. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/mediastream.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c index d6f5eaf..6aad625 100644 --- a/dlls/amstream/mediastream.c +++ b/dlls/amstream/mediastream.c @@ -511,9 +511,24 @@ static HRESULT WINAPI DirectDrawMediaStreamInputPin_CheckMediaType(BasePin *base { DirectDrawMediaStreamInputPin *This = impl_from_DirectDrawMediaStreamInputPin_IPin(&base->IPin_iface); - FIXME("(%p)->(%p) stub!\n", This, media_type); + TRACE("(%p)->(%p)\n", This, media_type); - return E_NOTIMPL; + if (IsEqualGUID(&media_type->majortype, &MEDIATYPE_Video)) + { + if (IsEqualGUID(&media_type->subtype, &MEDIASUBTYPE_RGB1) || + IsEqualGUID(&media_type->subtype, &MEDIASUBTYPE_RGB4) || + IsEqualGUID(&media_type->subtype, &MEDIASUBTYPE_RGB8) || + IsEqualGUID(&media_type->subtype, &MEDIASUBTYPE_RGB565) || + IsEqualGUID(&media_type->subtype, &MEDIASUBTYPE_RGB555) || + IsEqualGUID(&media_type->subtype, &MEDIASUBTYPE_RGB24) || + IsEqualGUID(&media_type->subtype, &MEDIASUBTYPE_RGB32)) + { + TRACE("Video sub-type %s matches\n", debugstr_guid(&media_type->subtype)); + return S_OK; + } + } + + return S_FALSE; } static LONG WINAPI DirectDrawMediaStreamInputPin_GetMediaTypeVersion(BasePin *base)

1 0

Michael Stefaniuc : dswave/tests: Add IDirectMusicObject::ParseDescriptor( ) tests.
by Alexandre Julliard March 1, 2018

March 1, 2018

Module: wine Branch: master Commit: 1d3f08ece009abfcdb1612695ef2b2d6b3a3a5e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d3f08ece009abfcdb161269… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Feb 28 00:05:00 2018 +0100 dswave/tests: Add IDirectMusicObject::ParseDescriptor() tests. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dswave/tests/dswave.c | 191 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 191 insertions(+) diff --git a/dlls/dswave/tests/dswave.c b/dlls/dswave/tests/dswave.c index 531afb5..be36fd2 100644 --- a/dlls/dswave/tests/dswave.c +++ b/dlls/dswave/tests/dswave.c @@ -22,8 +22,11 @@ #include <windef.h> #include <initguid.h> #include <wine/test.h> +#include <ole2.h> #include <dmusici.h> +#include <dmusicf.h> +DEFINE_GUID(GUID_NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); DEFINE_GUID(IID_IDirectMusicWavePRIVATE, 0x69e934e4, 0x97f1, 0x4f1d, 0x88, 0xe8, 0xf2, 0xac, 0x88, 0x67, 0x13, 0x27); @@ -97,6 +100,193 @@ static void test_COM(void) while (IDirectMusicObject_Release(dmo)); } +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) +{ + static const LARGE_INTEGER zero; + 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; + + 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; + } + case mmioFOURCC('I','N','A','M'): + ck->size = 5; + p += CHUNK_HDR_SIZE; + strcpy(p, "INAM"); + 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; + const WCHAR s_inam[] = {'I','N','A','M','\0'}; + const FOURCC alldesc[] = + { + FOURCC_RIFF, mmioFOURCC('W','A','V','E'), 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, mmioFOURCC('W','A','V','E'), 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_INFO_LIST, + mmioFOURCC('I','N','A','M'), 0, FOURCC_LIST, DMUS_FOURCC_INFO_LIST, + mmioFOURCC('I','N','A','M'), 0, 0 + }; + FOURCC empty[] = {FOURCC_RIFF, mmioFOURCC('W','A','V','E'), 0}; + FOURCC inam[] = + { + FOURCC_RIFF, mmioFOURCC('W','A','V','E'), FOURCC_LIST, DMUS_FOURCC_UNFO_LIST, + mmioFOURCC('I','N','A','M'), 0, 0 + }; + + hr = CoCreateInstance(&CLSID_DirectSoundWave, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicObject, (void **)&dmo); + ok(hr == S_OK, "DirectSoundWave create failed: %08x, expected S_OK\n", hr); + + /* Nothing loaded */ + hr = IDirectMusicObject_GetDescriptor(dmo, &desc); + todo_wine ok(hr == E_INVALIDARG, "GetDescriptor failed: %08x, expected E_INVALIDARG\n", hr); + todo_wine ok(!desc.dwValidData, "Got valid data %#x, expected 0\n", desc.dwValidData); + + /* 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); + todo_wine ok(!desc.dwValidData, "Got valid data %#x, expected 0\n", desc.dwValidData); + 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, only DMUS_OBJ_OBJECT and DMUS_OBJ_VERSION 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); + todo_wine ok(desc.dwValidData == (DMUS_OBJ_OBJECT | DMUS_OBJ_VERSION), + "Got valid data %#x, expected DMUS_OBJ_OBJECT | DMUS_OBJ_VERSION\n", desc.dwValidData); + ok(IsEqualGUID(&desc.guidObject, &GUID_NULL), "Got object guid %s, expected GUID_NULL\n", + wine_dbgstr_guid(&desc.guidClass)); + ok(desc.vVersion.dwVersionMS == 5 && desc.vVersion.dwVersionLS == 8, + "Got version %u.%u, expected 5.8\n", desc.vVersion.dwVersionMS, + desc.vVersion.dwVersionLS); + 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); + todo_wine ok(!desc.dwValidData, "Got valid data %#x, expected 0\n", desc.dwValidData); + 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); + todo_wine ok(desc.dwValidData == DMUS_OBJ_NAME, "Got valid data %#x, expected DMUS_OBJ_NAME\n", + desc.dwValidData); + todo_wine ok(!memcmp(desc.wszName, s_inam, sizeof(s_inam)), "Got name '%s', expected 'INAM'\n", + wine_dbgstr_w(desc.wszName)); + 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); + todo_wine ok(desc.dwValidData == (DMUS_OBJ_OBJECT | DMUS_OBJ_NAME | DMUS_OBJ_VERSION), + "Got valid data %#x, expected DMUS_OBJ_OBJECT | DMUS_OBJ_NAME | DMUS_OBJ_VERSION\n", + desc.dwValidData); + todo_wine 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); +} + static void test_dswave(void) { IDirectMusicObject *dmo; @@ -140,6 +330,7 @@ START_TEST(dswave) } test_COM(); test_dswave(); + test_parsedescriptor(); CoUninitialize(); }

1 0

Dmitry Timoshkov : advapi32: Initialize more fields in LsaQueryInformationPolicy( PolicyDnsDomainInformation).
by Alexandre Julliard March 1, 2018

March 1, 2018

Module: wine Branch: master Commit: 09cd27871b926c0b521d80f66446d984ecc2e60d URL: https://source.winehq.org/git/wine.git/?a=commit;h=09cd27871b926c0b521d80f6… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Mar 1 16:25:52 2018 +0800 advapi32: Initialize more fields in LsaQueryInformationPolicy(PolicyDnsDomainInformation). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/tests/sysinfo.c | 7 +++---- dlls/advapi32/lsa.c | 36 +++++++++++++++++++++++++++++------- 2 files changed, 32 insertions(+), 11 deletions(-) diff --git a/dlls/adsldp/tests/sysinfo.c b/dlls/adsldp/tests/sysinfo.c index 1e3939f..09f2484 100644 --- a/dlls/adsldp/tests/sysinfo.c +++ b/dlls/adsldp/tests/sysinfo.c @@ -160,9 +160,8 @@ static void test_sysinfo(void) ok(hr == S_OK, "got %#x\n", hr); IDispatch_Release(dispatch); - hr = IADsADSystemInfo_get_UserName(sysinfo, &bstr); -todo_wine - ok(hr == S_OK || hr == HRESULT_FROM_WIN32(ERROR_NONE_MAPPED), "got %#x\n", hr); + hr = IADsADSystemInfo_get_ComputerName(sysinfo, &bstr); + ok(hr == S_OK || hr == HRESULT_FROM_WIN32(ERROR_CANT_ACCESS_DOMAIN_INFO), "got %#x\n", hr); if (hr != S_OK) { skip("Computer is not part of a domain, skipping the tests\n"); @@ -171,7 +170,7 @@ todo_wine } SysFreeString(bstr); - hr = IADsADSystemInfo_get_ComputerName(sysinfo, &bstr); + hr = IADsADSystemInfo_get_UserName(sysinfo, &bstr); ok(hr == S_OK, "got %#x\n", hr); if (hr == S_OK) SysFreeString(bstr); diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c index bfd879b..6f51f9d 100644 --- a/dlls/advapi32/lsa.c +++ b/dlls/advapi32/lsa.c @@ -763,16 +763,38 @@ NTSTATUS WINAPI LsaQueryInformationPolicy( break; case PolicyDnsDomainInformation: /* 12 (0xc) */ { - /* Only the domain name is valid for the local computer. - * All other fields are zero. - */ - PPOLICY_DNS_DOMAIN_INFO pinfo; + struct di + { + POLICY_DNS_DOMAIN_INFO info; + SID sid; + WCHAR domain_name[MAX_COMPUTERNAME_LENGTH + 1]; + WCHAR dns_domain_name[MAX_COMPUTERNAME_LENGTH + 1]; + WCHAR dns_forest_name[MAX_COMPUTERNAME_LENGTH + 1]; + }; + DWORD dwSize; + struct di *xdi; - pinfo = ADVAPI_GetDomainName(sizeof(*pinfo), offsetof(POLICY_DNS_DOMAIN_INFO, Name)); + xdi = heap_alloc_zero(sizeof(*xdi)); + if (!xdi) return STATUS_NO_MEMORY; - TRACE("setting domain to %s\n", debugstr_w(pinfo->Name.Buffer)); + dwSize = MAX_COMPUTERNAME_LENGTH + 1; + if (GetComputerNameW(xdi->domain_name, &dwSize)) + { + xdi->info.Name.Buffer = xdi->domain_name; + xdi->info.Name.Length = dwSize * sizeof(WCHAR); + xdi->info.Name.MaximumLength = (dwSize + 1) * sizeof(WCHAR); + TRACE("setting Name to %s\n", debugstr_w(xdi->info.Name.Buffer)); + } - *Buffer = pinfo; + /* FIXME: also set DnsDomainName and DnsForestName */ + + if (ADVAPI_GetComputerSid(&xdi->sid)) + { + xdi->info.Sid = &xdi->sid; + TRACE("setting SID to %s\n", debugstr_sid(&xdi->sid)); + } + + *Buffer = xdi; } break; case PolicyAuditLogInformation:

1 0

Alexandre Julliard : ntoskrnl.exe: Add a helper function for accessing registers.
by Alexandre Julliard March 1, 2018

March 1, 2018

Module: wine Branch: master Commit: 0cbb5d0a146ebb2a80712cab7e2c1530edad9a6d URL: https://source.winehq.org/git/wine.git/?a=commit;h=0cbb5d0a146ebb2a80712cab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 1 17:11:12 2018 +0100 ntoskrnl.exe: Add a helper function for accessing registers. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/instr.c | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/dlls/ntoskrnl.exe/instr.c b/dlls/ntoskrnl.exe/instr.c index 48f16f2..2822aac 100644 --- a/dlls/ntoskrnl.exe/instr.c +++ b/dlls/ntoskrnl.exe/instr.c @@ -117,12 +117,29 @@ static void store_reg_byte( CONTEXT *context, BYTE regmodrm, const BYTE *addr ) } } +static DWORD *get_reg_address( CONTEXT *context, BYTE rm ) +{ + switch (rm & 7) + { + case 0: return &context->Eax; + case 1: return &context->Ecx; + case 2: return &context->Edx; + case 3: return &context->Ebx; + case 4: return &context->Esp; + case 5: return &context->Ebp; + case 6: return &context->Esi; + case 7: return &context->Edi; + } + return NULL; +} + + /*********************************************************************** * INSTR_GetOperandAddr * * Return the address of an instruction operand (from the mod/rm byte). */ -static BYTE *INSTR_GetOperandAddr( CONTEXT *context, BYTE *instr, +static void *INSTR_GetOperandAddr( CONTEXT *context, BYTE *instr, int long_addr, int segprefix, int *len ) { int mod, rm, base = 0, index = 0, ss = 0, off; @@ -135,20 +152,7 @@ static BYTE *INSTR_GetOperandAddr( CONTEXT *context, BYTE *instr, rm = mod & 7; mod >>= 6; - if (mod == 3) - { - switch(rm) - { - case 0: return (BYTE *)&context->Eax; - case 1: return (BYTE *)&context->Ecx; - case 2: return (BYTE *)&context->Edx; - case 3: return (BYTE *)&context->Ebx; - case 4: return (BYTE *)&context->Esp; - case 5: return (BYTE *)&context->Ebp; - case 6: return (BYTE *)&context->Esi; - case 7: return (BYTE *)&context->Edi; - } - } + if (mod == 3) return get_reg_address( context, rm ); if (long_addr) { @@ -254,7 +258,7 @@ static BYTE *INSTR_GetOperandAddr( CONTEXT *context, BYTE *instr, base &= 0xffff; } /* FIXME: we assume that all segments have a base of 0 */ - return (BYTE *)(base + (index << ss)); + return (void *)(base + (index << ss)); #undef GET_VAL }

1 0

Józef Kucia : kernel32: Treat Vulkan environment variables as special variables.
by Alexandre Julliard March 1, 2018

March 1, 2018

Module: wine Branch: master Commit: 665ce1c5eb3bcc579fd4a58e5ce1631051dfe61e URL: https://source.winehq.org/git/wine.git/?a=commit;h=665ce1c5eb3bcc579fd4a58e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 1 17:04:58 2018 +0100 kernel32: Treat Vulkan environment variables as special variables. We do not want to inherit Vulkan environment variables from the Unix environment, e.g. VK_ICD_FILENAMES confuses Windows Vulkan loader. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 0a3fd70..b883087 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -136,7 +136,8 @@ static inline BOOL is_special_env_var( const char *var ) !strncmp( var, "HOME=", sizeof("HOME=")-1 ) || !strncmp( var, "TEMP=", sizeof("TEMP=")-1 ) || !strncmp( var, "TMP=", sizeof("TMP=")-1 ) || - !strncmp( var, "QT_", sizeof("QT_")-1 )); + !strncmp( var, "QT_", sizeof("QT_")-1 ) || + !strncmp( var, "VK_", sizeof("VK_")-1 )); }

1 0

Michael Müller : ntdll: Implement ProcessPriorityClass in NtQueryInformationProcess.
by Alexandre Julliard March 1, 2018

March 1, 2018

Module: wine Branch: master Commit: ab3c0a3e0a7b8f9fc1eb703b2e4f2133ef3ebf0d URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab3c0a3e0a7b8f9fc1eb703b… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Feb 28 19:22:31 2018 -0600 ntdll: Implement ProcessPriorityClass in NtQueryInformationProcess. Allows Process Hacker to show process priority. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/process.c | 29 ++++++++++++++++++++++++++++- dlls/ntdll/tests/info.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 40034b4..835d7e6 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -205,7 +205,6 @@ NTSTATUS WINAPI NtQueryInformationProcess( UNIMPLEMENTED_INFO_CLASS(ProcessWorkingSetWatch); UNIMPLEMENTED_INFO_CLASS(ProcessUserModeIOPL); UNIMPLEMENTED_INFO_CLASS(ProcessEnableAlignmentFaultFixup); - UNIMPLEMENTED_INFO_CLASS(ProcessPriorityClass); UNIMPLEMENTED_INFO_CLASS(ProcessWx86Information); UNIMPLEMENTED_INFO_CLASS(ProcessPriorityBoost); UNIMPLEMENTED_INFO_CLASS(ProcessDeviceMap); @@ -545,6 +544,34 @@ NTSTATUS WINAPI NtQueryInformationProcess( else ret = STATUS_INFO_LENGTH_MISMATCH; break; + case ProcessPriorityClass: + len = sizeof(PROCESS_PRIORITY_CLASS); + if (ProcessInformationLength == len) + { + if (!ProcessInformation) + ret = STATUS_ACCESS_VIOLATION; + else if (!ProcessHandle) + ret = STATUS_INVALID_HANDLE; + else + { + PROCESS_PRIORITY_CLASS *priority = ProcessInformation; + + SERVER_START_REQ(get_process_info) + { + req->handle = wine_server_obj_handle( ProcessHandle ); + if ((ret = wine_server_call( req )) == STATUS_SUCCESS) + { + priority->PriorityClass = reply->priority; + /* FIXME: Not yet supported by the wineserver */ + priority->Foreground = FALSE; + } + } + SERVER_END_REQ; + } + } + else + ret = STATUS_INFO_LENGTH_MISMATCH; + break; default: FIXME("(%p,info_class=%d,%p,0x%08x,%p) Unknown information class\n", ProcessHandle,ProcessInformationClass, diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 1f1c675..54321e5 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -1334,6 +1334,40 @@ static void test_query_process_debug_port(int argc, char **argv) ok(ret, "CloseHandle failed, last error %#x.\n", GetLastError()); } +static void test_query_process_priority(void) +{ + PROCESS_PRIORITY_CLASS priority[2]; + ULONG ReturnLength; + DWORD orig_priority; + NTSTATUS status; + BOOL ret; + + status = pNtQueryInformationProcess(NULL, ProcessPriorityClass, NULL, sizeof(priority[0]), NULL); + ok(status == STATUS_ACCESS_VIOLATION || broken(status == STATUS_INVALID_HANDLE) /* w2k3 */, + "Expected STATUS_ACCESS_VIOLATION, got %08x\n", status); + + status = pNtQueryInformationProcess(NULL, ProcessPriorityClass, &priority, sizeof(priority[0]), NULL); + ok(status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08x\n", status); + + status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessPriorityClass, &priority, 1, &ReturnLength); + ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); + + status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessPriorityClass, &priority, sizeof(priority), &ReturnLength); + ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); + + orig_priority = GetPriorityClass(GetCurrentProcess()); + ret = SetPriorityClass(GetCurrentProcess(), BELOW_NORMAL_PRIORITY_CLASS); + ok(ret, "Failed to set priority class: %u\n", GetLastError()); + + status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessPriorityClass, &priority, sizeof(priority[0]), &ReturnLength); + ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + ok(priority[0].PriorityClass == PROCESS_PRIOCLASS_BELOW_NORMAL, + "Expected PROCESS_PRIOCLASS_BELOW_NORMAL, got %u\n", priority[0].PriorityClass); + + ret = SetPriorityClass(GetCurrentProcess(), orig_priority); + ok(ret, "Failed to reset priority class: %u\n", GetLastError()); +} + static void test_query_process_handlecount(void) { NTSTATUS status; @@ -2192,6 +2226,10 @@ START_TEST(info) trace("Starting test_process_debug_port()\n"); test_query_process_debug_port(argc, argv); + /* 0x12 ProcessPriorityClass */ + trace("Starting test_query_process_priority()\n"); + test_query_process_priority(); + /* 0x14 ProcessHandleCount */ trace("Starting test_query_process_handlecount()\n"); test_query_process_handlecount();

1 0

Nikolay Sivov : comctl32/button: Do not select old font back after painting.
by Alexandre Julliard March 1, 2018

March 1, 2018

Module: wine Branch: master Commit: 81e698da27ab5aaccfa09a3bb38d628e84c49367 URL: https://source.winehq.org/git/wine.git/?a=commit;h=81e698da27ab5aaccfa09a3b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 1 14:38:33 2018 +0300 comctl32/button: Do not select old font back after painting. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 5 ++--- dlls/comctl32/tests/button.c | 35 ++++++++++++++++++++++++++++++++++- 2 files changed, 36 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index d7a47cb..9869585 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -1220,7 +1220,7 @@ static void OB_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action ) DRAWITEMSTRUCT dis; LONG_PTR id = GetWindowLongPtrW( infoPtr->hwnd, GWLP_ID ); HWND parent; - HFONT hFont, hPrevFont = 0; + HFONT hFont; HRGN hrgn; dis.CtlType = ODT_BUTTON; @@ -1235,7 +1235,7 @@ static void OB_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action ) dis.itemData = 0; GetClientRect( infoPtr->hwnd, &dis.rcItem ); - if ((hFont = infoPtr->font)) hPrevFont = SelectObject( hDC, hFont ); + if ((hFont = infoPtr->font)) SelectObject( hDC, hFont ); parent = GetParent(infoPtr->hwnd); if (!parent) parent = infoPtr->hwnd; SendMessageW( parent, WM_CTLCOLORBTN, (WPARAM)hDC, (LPARAM)infoPtr->hwnd ); @@ -1243,7 +1243,6 @@ static void OB_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action ) hrgn = set_control_clipping( hDC, &dis.rcItem ); SendMessageW( GetParent(infoPtr->hwnd), WM_DRAWITEM, id, (LPARAM)&dis ); - if (hPrevFont) SelectObject(hDC, hPrevFont); SelectClipRgn( hDC, hrgn ); if (hrgn) DeleteObject( hrgn ); } diff --git a/dlls/comctl32/tests/button.c b/dlls/comctl32/tests/button.c index 45a390d..b3bc23d 100644 --- a/dlls/comctl32/tests/button.c +++ b/dlls/comctl32/tests/button.c @@ -519,11 +519,12 @@ static void test_button_messages(void) setfocus_seq, killfocus_seq, setstyle_seq, setstate_seq, setstate_seq, setcheck_ignored_seq }, }; + LOGFONTA logfont = { 0 }; const struct message *seq; + HFONT zfont, hfont2; unsigned int i; HWND hwnd, parent; DWORD dlg_code; - HFONT zfont; BOOL todo; /* selection with VK_SPACE should capture button window */ @@ -540,10 +541,19 @@ static void test_button_messages(void) 100, 100, 200, 200, 0, 0, 0, NULL); ok(parent != 0, "Failed to create parent window\n"); + logfont.lfHeight = -12; + logfont.lfWeight = FW_NORMAL; + strcpy(logfont.lfFaceName, "Tahoma"); + + hfont2 = CreateFontIndirectA(&logfont); + ok(hfont2 != NULL, "Failed to create Tahoma font\n"); + for (i = 0; i < sizeof(button)/sizeof(button[0]); i++) { + HFONT prevfont, hfont; MSG msg; DWORD style, state; + HDC hdc; trace("%d: button test sequence\n", i); hwnd = create_button(button[i].style, parent); @@ -686,9 +696,32 @@ static void test_button_messages(void) else ok(style == button[i].style, "expected style %04x got %04x\n", button[i].style, style); + /* Test that original font is not selected back after painting */ + hfont = (HFONT)SendMessageA(hwnd, WM_GETFONT, 0, 0); + ok(hfont == NULL, "Unexpected control font.\n"); + + SendMessageA(hwnd, WM_SETFONT, (WPARAM)GetStockObject(SYSTEM_FONT), 0); + + hdc = CreateCompatibleDC(0); + + prevfont = SelectObject(hdc, hfont2); + SendMessageA(hwnd, WM_PRINTCLIENT, (WPARAM)hdc, 0); + ok(hfont2 != GetCurrentObject(hdc, OBJ_FONT) || broken(hfont2 == GetCurrentObject(hdc, OBJ_FONT)) /* WinXP */, + "button[%u]: unexpected font selected after WM_PRINTCLIENT\n", i); + SelectObject(hdc, prevfont); + + prevfont = SelectObject(hdc, hfont2); + SendMessageA(hwnd, WM_PAINT, (WPARAM)hdc, 0); + ok(hfont2 != GetCurrentObject(hdc, OBJ_FONT) || broken(hfont2 == GetCurrentObject(hdc, OBJ_FONT)) /* WinXP */, + "button[%u]: unexpected font selected after WM_PAINT\n", i); + SelectObject(hdc, prevfont); + + DeleteDC(hdc); + DestroyWindow(hwnd); } + DeleteObject(hfont2); DestroyWindow(parent); hwnd = create_button(BS_PUSHBUTTON, NULL);

1 0

Alexandre Julliard : ntoskrnl.exe: More general implementation of the CRn and DRn registers.
by Alexandre Julliard March 1, 2018

March 1, 2018

Module: wine Branch: master Commit: 9f103a9e78e4e337026828f15cf835a5ac222bf9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f103a9e78e4e337026828f1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 1 17:11:34 2018 +0100 ntoskrnl.exe: More general implementation of the CRn and DRn registers. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/instr.c | 138 ++++++++++++++++++++-------------------------- 1 file changed, 60 insertions(+), 78 deletions(-) diff --git a/dlls/ntoskrnl.exe/instr.c b/dlls/ntoskrnl.exe/instr.c index 2822aac..fdbe8bd 100644 --- a/dlls/ntoskrnl.exe/instr.c +++ b/dlls/ntoskrnl.exe/instr.c @@ -271,6 +271,7 @@ static void *INSTR_GetOperandAddr( CONTEXT *context, BYTE *instr, */ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) { + static const char *reg_names[8] = { "eax", "ecx", "edx", "ebx", "esp", "ebp", "esi", "edi" }; int prefix, segprefix, prefixlen, len, long_op, long_addr; BYTE *instr; @@ -335,97 +336,78 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) case 0x0f: /* extended instruction */ switch(instr[1]) { - case 0x22: /* mov eax, crX */ - switch (instr[2]) + case 0x20: /* mov crX, Rd */ { - case 0xc0: - TRACE("mov eax,cr0 at 0x%08x, EAX=0x%08x\n", context->Eip,context->Eax ); - context->Eip += prefixlen+3; + int reg = (instr[2] >> 3) & 7; + DWORD *data = get_reg_address( context, instr[2] ); + TRACE( "mov cr%u,%s at 0x%08x\n", reg, reg_names[instr[2] & 7], context->Eip ); + switch (reg) + { + case 0: *data = 0x10; break; /* FIXME: set more bits ? */ + case 2: *data = 0; break; + case 3: *data = 0; break; + case 4: *data = 0; break; + default: return ExceptionContinueSearch; + } + context->Eip += prefixlen + 3; return ExceptionContinueExecution; - case 0xe0: - TRACE("mov eax,cr4 at 0x%08x, EAX=0x%08x\n", context->Eip,context->Eax ); - context->Eip += prefixlen+3; - return ExceptionContinueExecution; - default: - break; /*fallthrough to bad instruction handling */ } - ERR("Unsupported EAX -> CR register, eip+2 is %02x\n", instr[2]); - break; /*fallthrough to bad instruction handling */ - case 0x20: /* mov crX, eax */ - switch (instr[2]) + case 0x21: /* mov drX, Rd */ { - case 0xe0: /* mov cr4, eax */ - /* CR4 register . See linux/arch/i386/mm/init.c, X86_CR4_ defs - * bit 0: VME Virtual Mode Exception ? - * bit 1: PVI Protected mode Virtual Interrupt - * bit 2: TSD Timestamp disable - * bit 3: DE Debugging extensions - * bit 4: PSE Page size extensions - * bit 5: PAE Physical address extension - * bit 6: MCE Machine check enable - * bit 7: PGE Enable global pages - * bit 8: PCE Enable performance counters at IPL3 - */ - TRACE("mov cr4,eax at 0x%08x\n",context->Eip); - context->Eax = 0; - context->Eip += prefixlen+3; - return ExceptionContinueExecution; - case 0xc0: /* mov cr0, eax */ - TRACE("mov cr0,eax at 0x%08x\n",context->Eip); - context->Eax = 0x10; /* FIXME: set more bits ? */ - context->Eip += prefixlen+3; + int reg = (instr[2] >> 3) & 7; + DWORD *data = get_reg_address( context, instr[2] ); + TRACE( "mov dr%u,%s at 0x%08x\n", reg, reg_names[instr[2] & 7], context->Eip ); + switch (reg) + { + case 0: *data = context->Dr0; break; + case 1: *data = context->Dr1; break; + case 2: *data = context->Dr2; break; + case 3: *data = context->Dr3; break; + case 6: *data = context->Dr6; break; + case 7: *data = 0x400; break; + default: return ExceptionContinueSearch; + } + context->Eip += prefixlen + 3; return ExceptionContinueExecution; - default: /* fallthrough to illegal instruction */ - break; } - /* fallthrough to illegal instruction */ - break; - case 0x21: /* mov drX, eax */ - switch (instr[2]) + case 0x22: /* mov Rd, crX */ { - case 0xc8: /* mov dr1, eax */ - TRACE("mov dr1,eax at 0x%08x\n",context->Eip); - context->Eax = context->Dr1; - context->Eip += prefixlen+3; - return ExceptionContinueExecution; - case 0xf8: /* mov dr7, eax */ - TRACE("mov dr7,eax at 0x%08x\n",context->Eip); - context->Eax = 0x400; - context->Eip += prefixlen+3; + int reg = (instr[2] >> 3) & 7; + DWORD *data = get_reg_address( context, instr[2] ); + TRACE( "mov %s,cr%u at 0x%08x, %s=%08x\n", reg_names[instr[2] & 7], + reg, context->Eip, reg_names[instr[2] & 7], *data ); + switch (reg) + { + case 0: break; + case 2: break; + case 3: break; + case 4: break; + default: return ExceptionContinueSearch; + } + context->Eip += prefixlen + 3; return ExceptionContinueExecution; } - ERR("Unsupported DR register -> EAX, eip+2 is %02x\n", instr[2]); - /* fallthrough to illegal instruction */ - break; - case 0x23: /* mov eax drX */ - switch (instr[2]) + case 0x23: /* mov Rd, drX */ { - case 0xc0: /* mov eax, dr0 */ - context->Dr0 = context->Eax; - context->Eip += prefixlen+3; - return ExceptionContinueExecution; - case 0xc8: /* mov eax, dr1 */ - context->Dr1 = context->Eax; - context->Eip += prefixlen+3; - return ExceptionContinueExecution; - case 0xd0: /* mov eax, dr2 */ - context->Dr2 = context->Eax; - context->Eip += prefixlen+3; - return ExceptionContinueExecution; - case 0xd8: /* mov eax, dr3 */ - context->Dr3 = context->Eax; - context->Eip += prefixlen+3; - return ExceptionContinueExecution; - case 0xf8: /* mov eax, dr7 */ - context->Dr7 = context->Eax; - context->Eip += prefixlen+3; + int reg = (instr[2] >> 3) & 7; + DWORD *data = get_reg_address( context, instr[2] ); + TRACE( "mov %s,dr%u at 0x%08x %s=%08x\n", reg_names[instr[2] & 7], + reg, context->Eip, reg_names[instr[2] & 7], *data ); + switch (reg) + { + case 0: context->Dr0 = *data; break; + case 1: context->Dr1 = *data; break; + case 2: context->Dr2 = *data; break; + case 3: context->Dr3 = *data; break; + case 6: context->Dr6 = *data; break; + case 7: context->Dr7 = *data; break; + default: return ExceptionContinueSearch; + } + context->Eip += prefixlen + 3; return ExceptionContinueExecution; } - ERR("Unsupported EAX -> DR register, eip+2 is %02x\n", instr[2]); - /* fallthrough to illegal instruction */ - break; } - break; /* Unable to emulate it */ + break; case 0x8a: /* mov Eb, Gb */ case 0x8b: /* mov Ev, Gv */

1 0

Alexandre Julliard : kernel32: Implement the LOAD_LIBRARY_AS_IMAGE_RESOURCE flag.
by Alexandre Julliard March 1, 2018

March 1, 2018

Module: wine Branch: master Commit: e1d8c176efdd04fb2a0f99426e1ad9962589b9ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=e1d8c176efdd04fb2a0f9942… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 1 17:18:03 2018 +0100 kernel32: Implement the LOAD_LIBRARY_AS_IMAGE_RESOURCE flag. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/module.c | 37 +++++++++++++++++++++---------------- dlls/kernel32/tests/loader.c | 26 ++++++++++++++++++++++++-- 2 files changed, 45 insertions(+), 18 deletions(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index a5346db..d232d7d 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -1125,12 +1125,14 @@ static BOOL load_library_as_datafile( LPCWSTR name, HMODULE *hmod, DWORD flags ) WCHAR filenameW[MAX_PATH]; HANDLE hFile = INVALID_HANDLE_VALUE; HANDLE mapping; - HMODULE module; + HMODULE module = 0; + DWORD protect = PAGE_READONLY; DWORD sharing = FILE_SHARE_READ; *hmod = 0; if (!(flags & LOAD_LIBRARY_AS_DATAFILE_EXCLUSIVE)) sharing |= FILE_SHARE_WRITE; + if (flags & LOAD_LIBRARY_AS_IMAGE_RESOURCE) protect |= SEC_IMAGE; if (SearchPathW( NULL, name, dotDLL, sizeof(filenameW) / sizeof(filenameW[0]), filenameW, NULL )) @@ -1139,22 +1141,28 @@ static BOOL load_library_as_datafile( LPCWSTR name, HMODULE *hmod, DWORD flags ) } if (hFile == INVALID_HANDLE_VALUE) return FALSE; - mapping = CreateFileMappingW( hFile, NULL, PAGE_READONLY, 0, 0, NULL ); - CloseHandle( hFile ); - if (!mapping) return FALSE; + mapping = CreateFileMappingW( hFile, NULL, protect, 0, 0, NULL ); + if (!mapping) goto failed; module = MapViewOfFile( mapping, FILE_MAP_READ, 0, 0, 0 ); CloseHandle( mapping ); - if (!module) return FALSE; + if (!module) goto failed; - /* make sure it's a valid PE file */ - if (!RtlImageNtHeader(module)) + if (!(flags & LOAD_LIBRARY_AS_IMAGE_RESOURCE)) { - UnmapViewOfFile( module ); - return FALSE; + /* make sure it's a valid PE file */ + if (!RtlImageNtHeader( module )) goto failed; + *hmod = (HMODULE)((char *)module + 1); /* set bit 0 for data file module */ } - *hmod = (HMODULE)((char *)module + 1); /* set low bit of handle to indicate datafile module */ + else *hmod = (HMODULE)((char *)module + 2); /* set bit 1 for image resource module */ + + CloseHandle( hFile ); return TRUE; + +failed: + if (module) UnmapViewOfFile( module ); + CloseHandle( hFile ); + return FALSE; } @@ -1174,7 +1182,6 @@ static HMODULE load_library( const UNICODE_STRING *libname, DWORD flags ) LOAD_LIBRARY_SEARCH_SYSTEM32 | LOAD_LIBRARY_SEARCH_DEFAULT_DIRS); const DWORD unsupported_flags = (LOAD_IGNORE_CODE_AUTHZ_LEVEL | - LOAD_LIBRARY_AS_IMAGE_RESOURCE | LOAD_LIBRARY_REQUIRE_SIGNED_TARGET); if (!(flags & load_library_search_flags)) flags |= default_search_flags; @@ -1188,7 +1195,7 @@ static HMODULE load_library( const UNICODE_STRING *libname, DWORD flags ) load_path = MODULE_get_dll_load_path( flags & LOAD_WITH_ALTERED_SEARCH_PATH ? libname->Buffer : NULL, -1 ); if (!load_path) return 0; - if (flags & (LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_DATAFILE_EXCLUSIVE)) + if (flags & (LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_DATAFILE_EXCLUSIVE | LOAD_LIBRARY_AS_IMAGE_RESOURCE)) { ULONG_PTR magic; @@ -1337,11 +1344,9 @@ BOOL WINAPI DECLSPEC_HOTPATCH FreeLibrary(HINSTANCE hLibModule) return FALSE; } - if ((ULONG_PTR)hLibModule & 1) + if ((ULONG_PTR)hLibModule & 3) /* this is a datafile module */ { - /* this is a LOAD_LIBRARY_AS_DATAFILE module */ - char *ptr = (char *)hLibModule - 1; - return UnmapViewOfFile( ptr ); + return UnmapViewOfFile( (void *)((ULONG_PTR)hLibModule & ~3) ); } if ((nts = LdrUnloadDll( hLibModule )) == STATUS_SUCCESS) retv = TRUE; diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 0a65bcd..4d1b3e2 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -849,7 +849,7 @@ static void test_Loader(void) SetLastError(0xdeadbeef); hlib_as_data_file = LoadLibraryExA(dll_name, 0, LOAD_LIBRARY_AS_DATAFILE); ok(hlib_as_data_file != 0, "LoadLibraryEx error %u\n", GetLastError()); - ok((ULONG_PTR)hlib_as_data_file & 1, "hlib_as_data_file is even\n"); + ok(((ULONG_PTR)hlib_as_data_file & 3) == 1, "hlib_as_data_file got %p\n", hlib_as_data_file); hlib = GetModuleHandleA(dll_name); ok(!hlib, "GetModuleHandle should fail\n"); @@ -865,7 +865,7 @@ static void test_Loader(void) SetLastError(0xdeadbeef); hlib_as_data_file = LoadLibraryExA(dll_name, 0, LOAD_LIBRARY_AS_DATAFILE_EXCLUSIVE); - if (!((ULONG_PTR)hlib_as_data_file & 1) || /* winxp */ + if (!((ULONG_PTR)hlib_as_data_file & 3) || /* winxp */ (!hlib_as_data_file && GetLastError() == ERROR_INVALID_PARAMETER)) /* w2k3 */ { win_skip( "LOAD_LIBRARY_AS_DATAFILE_EXCLUSIVE not supported\n" ); @@ -886,6 +886,28 @@ static void test_Loader(void) ok(ret, "FreeLibrary error %d\n", GetLastError()); } + SetLastError(0xdeadbeef); + hlib_as_data_file = LoadLibraryExA(dll_name, 0, LOAD_LIBRARY_AS_IMAGE_RESOURCE); + if (!((ULONG_PTR)hlib_as_data_file & 3) || /* winxp */ + (!hlib_as_data_file && GetLastError() == ERROR_INVALID_PARAMETER)) /* w2k3 */ + { + win_skip( "LOAD_LIBRARY_AS_IMAGE_RESOURCE not supported\n" ); + FreeLibrary(hlib_as_data_file); + } + else + { + ok(hlib_as_data_file != 0, "LoadLibraryEx error %u\n", GetLastError()); + ok(((ULONG_PTR)hlib_as_data_file & 3) == 2, "hlib_as_data_file got %p\n", + hlib_as_data_file); + + hlib = GetModuleHandleA(dll_name); + ok(!hlib, "GetModuleHandle should fail\n"); + + SetLastError(0xdeadbeef); + ret = FreeLibrary(hlib_as_data_file); + ok(ret, "FreeLibrary error %d\n", GetLastError()); + } + query_image_section( i, dll_name, &nt_header, NULL ); } else

1 0

Alexandre Julliard : kernel32: Implement the LOAD_LIBRARY_AS_DATAFILE_EXCLUSIVE flag.
by Alexandre Julliard March 1, 2018

March 1, 2018

Module: wine Branch: master Commit: e55101715cee244ef1857d9a975f87a9d6e3fac0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e55101715cee244ef1857d9a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 1 17:21:32 2018 +0100 kernel32: Implement the LOAD_LIBRARY_AS_DATAFILE_EXCLUSIVE flag. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/module.c | 50 +++++++++++++++++++++++++++++++++++++------- dlls/kernel32/tests/loader.c | 9 ++++++-- 2 files changed, 50 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index d232d7d..6f123ca 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -58,6 +58,15 @@ static struct list dll_dir_list = LIST_INIT( dll_dir_list ); /* extra dirs from static WCHAR *dll_directory; /* extra path for SetDllDirectoryW */ static DWORD default_search_flags; /* default flags set by SetDefaultDllDirectories */ +/* to keep track of LOAD_LIBRARY_AS_DATAFILE_EXCLUSIVE file handles */ +struct exclusive_datafile +{ + struct list entry; + HMODULE module; + HANDLE file; +}; +static struct list exclusive_datafile_list = LIST_INIT( exclusive_datafile_list ); + static CRITICAL_SECTION dlldir_section; static CRITICAL_SECTION_DEBUG critsect_debug = { @@ -1127,11 +1136,10 @@ static BOOL load_library_as_datafile( LPCWSTR name, HMODULE *hmod, DWORD flags ) HANDLE mapping; HMODULE module = 0; DWORD protect = PAGE_READONLY; - DWORD sharing = FILE_SHARE_READ; + DWORD sharing = FILE_SHARE_READ | FILE_SHARE_DELETE; *hmod = 0; - if (!(flags & LOAD_LIBRARY_AS_DATAFILE_EXCLUSIVE)) sharing |= FILE_SHARE_WRITE; if (flags & LOAD_LIBRARY_AS_IMAGE_RESOURCE) protect |= SEC_IMAGE; if (SearchPathW( NULL, name, dotDLL, sizeof(filenameW) / sizeof(filenameW[0]), @@ -1153,6 +1161,17 @@ static BOOL load_library_as_datafile( LPCWSTR name, HMODULE *hmod, DWORD flags ) /* make sure it's a valid PE file */ if (!RtlImageNtHeader( module )) goto failed; *hmod = (HMODULE)((char *)module + 1); /* set bit 0 for data file module */ + + if (flags & LOAD_LIBRARY_AS_DATAFILE_EXCLUSIVE) + { + struct exclusive_datafile *file = HeapAlloc( GetProcessHeap(), 0, sizeof(*file) ); + if (!file) goto failed; + file->module = *hmod; + file->file = hFile; + list_add_head( &exclusive_datafile_list, &file->entry ); + TRACE( "delaying close %p for module %p\n", file->file, file->module ); + return TRUE; + } } else *hmod = (HMODULE)((char *)module + 2); /* set bit 1 for image resource module */ @@ -1206,12 +1225,12 @@ static HMODULE load_library( const UNICODE_STRING *libname, DWORD flags ) LdrUnlockLoaderLock( 0, magic ); goto done; } + if (load_library_as_datafile( libname->Buffer, &hModule, flags )) + { + LdrUnlockLoaderLock( 0, magic ); + goto done; + } LdrUnlockLoaderLock( 0, magic ); - - /* The method in load_library_as_datafile allows searching for the - * 'native' libraries only - */ - if (load_library_as_datafile( libname->Buffer, &hModule, flags )) goto done; flags |= DONT_RESOLVE_DLL_REFERENCES; /* Just in case */ /* Fallback to normal behaviour */ } @@ -1346,6 +1365,23 @@ BOOL WINAPI DECLSPEC_HOTPATCH FreeLibrary(HINSTANCE hLibModule) if ((ULONG_PTR)hLibModule & 3) /* this is a datafile module */ { + if ((ULONG_PTR)hLibModule & 1) + { + struct exclusive_datafile *file; + ULONG_PTR magic; + + LdrLockLoaderLock( 0, NULL, &magic ); + LIST_FOR_EACH_ENTRY( file, &exclusive_datafile_list, struct exclusive_datafile, entry ) + { + if (file->module != hLibModule) continue; + TRACE( "closing %p for module %p\n", file->file, file->module ); + CloseHandle( file->file ); + list_remove( &file->entry ); + HeapFree( GetProcessHeap(), 0, file ); + break; + } + LdrUnlockLoaderLock( 0, magic ); + } return UnmapViewOfFile( (void *)((ULONG_PTR)hLibModule & ~3) ); } diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 4d1b3e2..c9ca02c 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -877,8 +877,13 @@ static void test_Loader(void) SetLastError(0xdeadbeef); h = CreateFileA( dll_name, GENERIC_WRITE, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0 ); - todo_wine ok( h == INVALID_HANDLE_VALUE, "open succeeded\n" ); - todo_wine ok( GetLastError() == ERROR_SHARING_VIOLATION, "wrong error %u\n", GetLastError() ); + ok( h == INVALID_HANDLE_VALUE, "open succeeded\n" ); + ok( GetLastError() == ERROR_SHARING_VIOLATION, "wrong error %u\n", GetLastError() ); + CloseHandle( h ); + + SetLastError(0xdeadbeef); + h = CreateFileA( dll_name, GENERIC_READ | DELETE, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0 ); + ok( h != INVALID_HANDLE_VALUE, "open failed err %u\n", GetLastError() ); CloseHandle( h ); SetLastError(0xdeadbeef);

1 0