July 2020 - Wine-commits - list.winehq.org

Gijs Vermeulen : amstream: Return VFW_E_TYPE_NOT_ACCEPTED on error in AMVideoStream::QueryAccept().
by Alexandre Julliard 01 Jul '20

01 Jul '20

Module: wine Branch: master Commit: 83bdfb780c352d428650de013492d4bfb186f976 URL: https://source.winehq.org/git/wine.git/?a=commit;h=83bdfb780c352d428650de01… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Tue Jun 30 19:57:15 2020 -0500 amstream: Return VFW_E_TYPE_NOT_ACCEPTED on error in AMVideoStream::QueryAccept(). Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/ddrawstream.c | 2 +- dlls/amstream/tests/amstream.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index 7095e1d49a..bcb752e6bd 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -798,7 +798,7 @@ static HRESULT WINAPI ddraw_sink_QueryId(IPin *iface, WCHAR **id) static HRESULT WINAPI ddraw_sink_QueryAccept(IPin *iface, const AM_MEDIA_TYPE *mt) { TRACE("iface %p, mt %p.\n", iface, mt); - return check_media_type(mt) ? S_OK : S_FALSE; + return check_media_type(mt) ? S_OK : VFW_E_TYPE_NOT_ACCEPTED; } static HRESULT WINAPI ddraw_sink_EnumMediaTypes(IPin *iface, IEnumMediaTypes **enum_media_types) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 5db46bbca4..a9a9ccfed0 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -1958,20 +1958,21 @@ static void test_media_types(void) pmt->majortype = MEDIATYPE_NULL; hr = IPin_QueryAccept(pin, pmt); - todo_wine ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); pmt->majortype = MEDIATYPE_Audio; hr = IPin_QueryAccept(pin, pmt); - todo_wine ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); pmt->majortype = MEDIATYPE_Stream; hr = IPin_QueryAccept(pin, pmt); - todo_wine ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); pmt->majortype = MEDIATYPE_Video; for (i = 0; i < ARRAY_SIZE(rejected_subtypes); ++i) { pmt->subtype = *rejected_subtypes[i]; hr = IPin_QueryAccept(pin, pmt); - todo_wine ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x for subtype %s.\n", + todo_wine_if (i < 6) + ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x for subtype %s.\n", hr, wine_dbgstr_guid(rejected_subtypes[i])); }

1 0

Gijs Vermeulen : amstream: Validate the format type in check_media_type().
by Alexandre Julliard 01 Jul '20

01 Jul '20

Module: wine Branch: master Commit: fddae90d9b147b54a5edc8657e5f991cc26d8fbb URL: https://source.winehq.org/git/wine.git/?a=commit;h=fddae90d9b147b54a5edc865… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Tue Jun 30 19:57:16 2020 -0500 amstream: Validate the format type in check_media_type(). Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/ddrawstream.c | 3 ++- dlls/amstream/tests/amstream.c | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index bcb752e6bd..9fcb6d37ce 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -634,7 +634,8 @@ static HRESULT WINAPI ddraw_sink_Connect(IPin *iface, IPin *peer, const AM_MEDIA static BOOL check_media_type(const AM_MEDIA_TYPE *media_type) { - if (IsEqualGUID(&media_type->majortype, &MEDIATYPE_Video)) + if (IsEqualGUID(&media_type->majortype, &MEDIATYPE_Video) + && IsEqualGUID(&media_type->formattype, &FORMAT_VideoInfo)) { if (IsEqualGUID(&media_type->subtype, &MEDIASUBTYPE_RGB1) || IsEqualGUID(&media_type->subtype, &MEDIASUBTYPE_RGB4) || diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index a9a9ccfed0..1fa1f2432c 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -1946,8 +1946,7 @@ static void test_media_types(void) pmt->cbFormat = tests[i].size; pmt->pbFormat = tests[i].format; hr = IPin_QueryAccept(pin, pmt); - todo_wine_if (i != 6) - ok(hr == (i == 6) ? S_OK : VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + ok(hr == (i == 6) ? S_OK : VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); } pmt->bFixedSizeSamples = FALSE;

1 0

Gijs Vermeulen : amstream: Accept only MEDIASUBTYPE_RGB8 in check_media_type().
by Alexandre Julliard 01 Jul '20

01 Jul '20

Module: wine Branch: master Commit: a7c515fe01c4902a3e7c6b60608a54b77e252b47 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7c515fe01c4902a3e7c6b60… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Tue Jun 30 19:57:17 2020 -0500 amstream: Accept only MEDIASUBTYPE_RGB8 in check_media_type(). Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/ddrawstream.c | 21 +++++---------------- dlls/amstream/tests/amstream.c | 5 ++--- 2 files changed, 7 insertions(+), 19 deletions(-) diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index 9fcb6d37ce..5530603f7a 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -632,23 +632,12 @@ static HRESULT WINAPI ddraw_sink_Connect(IPin *iface, IPin *peer, const AM_MEDIA return E_UNEXPECTED; } -static BOOL check_media_type(const AM_MEDIA_TYPE *media_type) +static BOOL check_media_type(const AM_MEDIA_TYPE *mt) { - if (IsEqualGUID(&media_type->majortype, &MEDIATYPE_Video) - && IsEqualGUID(&media_type->formattype, &FORMAT_VideoInfo)) - { - 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 TRUE; - } - } + if (IsEqualGUID(&mt->majortype, &MEDIATYPE_Video) + && IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB8) + && IsEqualGUID(&mt->formattype, &FORMAT_VideoInfo)) + return TRUE; return FALSE; } diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 1fa1f2432c..bbad585d48 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -1970,9 +1970,8 @@ static void test_media_types(void) { pmt->subtype = *rejected_subtypes[i]; hr = IPin_QueryAccept(pin, pmt); - todo_wine_if (i < 6) - ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x for subtype %s.\n", - hr, wine_dbgstr_guid(rejected_subtypes[i])); + ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x for subtype %s.\n", + hr, wine_dbgstr_guid(rejected_subtypes[i])); } CoTaskMemFree(pmt);

1 0

Zebediah Figura : include: Use the public VM_COUNTERS and VM_COUNTERS_EX structure definitions.
by Alexandre Julliard 01 Jul '20

01 Jul '20

Module: wine Branch: master Commit: acc52bc90ef1d3cdfc3eef97bb3ac84bfc96cb4c URL: https://source.winehq.org/git/wine.git/?a=commit;h=acc52bc90ef1d3cdfc3eef97… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 30 23:19:21 2020 -0500 include: Use the public VM_COUNTERS and VM_COUNTERS_EX structure definitions. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/info.c | 20 +++++++------------- dlls/ntdll/unix/process.c | 12 ++++++------ include/winternl.h | 26 ++++++++++++++++++++------ 3 files changed, 33 insertions(+), 25 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 7475fcf56e..35e4b834c4 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -342,7 +342,7 @@ static void test_query_process(void) ULONG HandleCount; DWORD dwUnknown3; DWORD dwUnknown4; - VM_COUNTERS vmCounters; + VM_COUNTERS_EX vmCounters; IO_COUNTERS ioCounters; SYSTEM_THREAD_INFORMATION ti[1]; } SYSTEM_PROCESS_INFORMATION_PRIVATE; @@ -1399,7 +1399,7 @@ static void test_query_process_basic(void) ok( pbi.UniqueProcessId > 0, "Expected a ProcessID > 0, got 0\n"); } -static void dump_vm_counters(const char *header, const VM_COUNTERS *pvi) +static void dump_vm_counters(const char *header, const VM_COUNTERS_EX *pvi) { trace("%s:\n", header); trace("PeakVirtualSize : %lu\n", pvi->PeakVirtualSize); @@ -1419,8 +1419,7 @@ static void test_query_process_vm(void) { NTSTATUS status; ULONG ReturnLength; - VM_COUNTERS pvi; - ULONG old_size = FIELD_OFFSET(VM_COUNTERS,PrivatePageCount); + VM_COUNTERS_EX pvi; HANDLE process; SIZE_T prev_size; const SIZE_T alloc_size = 16 * 1024 * 1024; @@ -1430,24 +1429,19 @@ static void test_query_process_vm(void) ok( status == STATUS_ACCESS_VIOLATION || status == STATUS_INVALID_HANDLE, "Expected STATUS_ACCESS_VIOLATION or STATUS_INVALID_HANDLE(W2K3), got %08x\n", status); - status = pNtQueryInformationProcess(NULL, ProcessVmCounters, &pvi, old_size, NULL); + status = pNtQueryInformationProcess(NULL, ProcessVmCounters, &pvi, sizeof(VM_COUNTERS), NULL); ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08x\n", status); - /* Windows XP and W2K3 will report success for a size of 44 AND 48 ! - Windows W2K will only report success for 44. - For now we only care for 44, which is FIELD_OFFSET(VM_COUNTERS,PrivatePageCount)) - */ - status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessVmCounters, &pvi, 24, &ReturnLength); ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); - status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessVmCounters, &pvi, old_size, &ReturnLength); + status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessVmCounters, &pvi, sizeof(VM_COUNTERS), &ReturnLength); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); - ok( old_size == ReturnLength, "Inconsistent length %d\n", ReturnLength); + ok( ReturnLength == sizeof(VM_COUNTERS), "Inconsistent length %d\n", ReturnLength); status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessVmCounters, &pvi, 46, &ReturnLength); ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); - ok( ReturnLength == old_size || ReturnLength == sizeof(pvi), "Inconsistent length %d\n", ReturnLength); + ok( ReturnLength == sizeof(VM_COUNTERS) || ReturnLength == sizeof(pvi), "Inconsistent length %d\n", ReturnLength); /* Check if we have some return values */ dump_vm_counters("VM counters for GetCurrentProcess", &pvi); diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index 578c79bf89..c39d8fb23a 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -1170,13 +1170,13 @@ NTSTATUS WINAPI NtQueryInformationProcess( HANDLE handle, PROCESSINFOCLASS class { VM_COUNTERS pvmi; - /* older Windows versions don't have the PrivatePageCount field */ - if (size >= FIELD_OFFSET(VM_COUNTERS,PrivatePageCount)) + /* older Windows versions don't have the PrivateUsage field */ + if (size >= sizeof(VM_COUNTERS)) { if (!info) ret = STATUS_ACCESS_VIOLATION; else { - memset(&pvmi, 0 , sizeof(VM_COUNTERS)); + memset(&pvmi, 0, sizeof(pvmi)); if (handle == GetCurrentProcess()) fill_VM_COUNTERS(&pvmi); else { @@ -1197,10 +1197,10 @@ NTSTATUS WINAPI NtQueryInformationProcess( HANDLE handle, PROCESSINFOCLASS class if (ret) break; } len = size; - if (len != FIELD_OFFSET(VM_COUNTERS,PrivatePageCount)) len = sizeof(VM_COUNTERS); - memcpy(info, &pvmi, min(size,sizeof(VM_COUNTERS))); + if (len != sizeof(VM_COUNTERS)) len = sizeof(VM_COUNTERS_EX); + memcpy(info, &pvmi, min(size, sizeof(pvmi))); } - if (size != FIELD_OFFSET(VM_COUNTERS,PrivatePageCount) && size != sizeof(VM_COUNTERS)) + if (size != sizeof(VM_COUNTERS) && size != sizeof(VM_COUNTERS_EX)) ret = STATUS_INFO_LENGTH_MISMATCH; } else diff --git a/include/winternl.h b/include/winternl.h index 9a70a2014f..5b5a5f32c6 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1584,12 +1584,11 @@ typedef struct _SYSTEM_KERNEL_DEBUGGER_INFORMATION { BOOLEAN DebuggerNotPresent; } SYSTEM_KERNEL_DEBUGGER_INFORMATION, *PSYSTEM_KERNEL_DEBUGGER_INFORMATION; -/* System Information Class 0x05 */ - -typedef struct _VM_COUNTERS_ { +typedef struct _VM_COUNTERS +{ SIZE_T PeakVirtualSize; SIZE_T VirtualSize; - ULONG PageFaultCount; + ULONG PageFaultCount; SIZE_T PeakWorkingSetSize; SIZE_T WorkingSetSize; SIZE_T QuotaPeakPagedPoolUsage; @@ -1598,9 +1597,24 @@ typedef struct _VM_COUNTERS_ { SIZE_T QuotaNonPagedPoolUsage; SIZE_T PagefileUsage; SIZE_T PeakPagefileUsage; - SIZE_T PrivatePageCount; } VM_COUNTERS, *PVM_COUNTERS; +typedef struct _VM_COUNTERS_EX +{ + SIZE_T PeakVirtualSize; + SIZE_T VirtualSize; + ULONG PageFaultCount; + SIZE_T PeakWorkingSetSize; + SIZE_T WorkingSetSize; + SIZE_T QuotaPeakPagedPoolUsage; + SIZE_T QuotaPagedPoolUsage; + SIZE_T QuotaPeakNonPagedPoolUsage; + SIZE_T QuotaNonPagedPoolUsage; + SIZE_T PagefileUsage; + SIZE_T PeakPagefileUsage; + SIZE_T PrivateUsage; +} VM_COUNTERS_EX, *PVM_COUNTERS_EX; + typedef struct _SYSTEM_PROCESS_INFORMATION { #ifdef __WINESRC__ /* win32/win64 */ ULONG NextEntryOffset; /* 00/00 */ @@ -1616,7 +1630,7 @@ typedef struct _SYSTEM_PROCESS_INFORMATION { ULONG HandleCount; /* 4c/60 */ ULONG SessionId; /* 50/64 */ DWORD dwUnknown4; /* 54/68 */ - VM_COUNTERS vmCounters; /* 58/70 */ + VM_COUNTERS_EX vmCounters; /* 58/70 */ IO_COUNTERS ioCounters; /* 88/d0 */ SYSTEM_THREAD_INFORMATION ti[1]; /* b8/100 */ #else

1 0

Zebediah Figura : ntdll: Fill the PrivateUsage field of VM_COUNTERS_EX.
by Alexandre Julliard 01 Jul '20

01 Jul '20

Module: wine Branch: master Commit: 2d5bd21f31e2a608120ba262ba2af245526905d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d5bd21f31e2a608120ba262… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 30 23:19:22 2020 -0500 ntdll: Fill the PrivateUsage field of VM_COUNTERS_EX. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/info.c | 6 ++++++ dlls/ntdll/unix/process.c | 10 ++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 35e4b834c4..e399757b85 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -1462,6 +1462,7 @@ static void test_query_process_vm(void) process = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, GetCurrentProcessId()); status = pNtQueryInformationProcess(process, ProcessVmCounters, &pvi, sizeof(pvi), NULL); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + ok( pvi.PrivateUsage == pvi.PagefileUsage, "wrong value %lu/%lu\n", pvi.PrivateUsage, pvi.PagefileUsage ); /* Check if we have some return values */ dump_vm_counters("VM counters for GetCurrentProcessId", &pvi); @@ -1473,6 +1474,7 @@ static void test_query_process_vm(void) /* Check if we have real counters */ status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessVmCounters, &pvi, sizeof(pvi), NULL); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + ok( pvi.PrivateUsage == pvi.PagefileUsage, "wrong value %lu/%lu\n", pvi.PrivateUsage, pvi.PagefileUsage ); prev_size = pvi.VirtualSize; if (winetest_debug > 1) dump_vm_counters("VM counters before VirtualAlloc", &pvi); @@ -1480,6 +1482,7 @@ static void test_query_process_vm(void) ok( ptr != NULL, "VirtualAlloc failed, err %u\n", GetLastError()); status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessVmCounters, &pvi, sizeof(pvi), NULL); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + ok( pvi.PrivateUsage == pvi.PagefileUsage, "wrong value %lu/%lu\n", pvi.PrivateUsage, pvi.PagefileUsage ); if (winetest_debug > 1) dump_vm_counters("VM counters after VirtualAlloc", &pvi); todo_wine ok( pvi.VirtualSize >= prev_size + alloc_size, @@ -1488,6 +1491,7 @@ static void test_query_process_vm(void) status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessVmCounters, &pvi, sizeof(pvi), NULL); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + ok( pvi.PrivateUsage == pvi.PagefileUsage, "wrong value %lu/%lu\n", pvi.PrivateUsage, pvi.PagefileUsage ); prev_size = pvi.VirtualSize; if (winetest_debug > 1) dump_vm_counters("VM counters before VirtualAlloc", &pvi); @@ -1495,6 +1499,7 @@ static void test_query_process_vm(void) ok( ptr != NULL, "VirtualAlloc failed, err %u\n", GetLastError()); status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessVmCounters, &pvi, sizeof(pvi), NULL); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + ok( pvi.PrivateUsage == pvi.PagefileUsage, "wrong value %lu/%lu\n", pvi.PrivateUsage, pvi.PagefileUsage ); if (winetest_debug > 1) dump_vm_counters("VM counters after VirtualAlloc(MEM_RESERVE)", &pvi); todo_wine ok( pvi.VirtualSize >= prev_size + alloc_size, @@ -1505,6 +1510,7 @@ static void test_query_process_vm(void) ok( ptr != NULL, "VirtualAlloc failed, err %u\n", GetLastError()); status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessVmCounters, &pvi, sizeof(pvi), NULL); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + ok( pvi.PrivateUsage == pvi.PagefileUsage, "wrong value %lu/%lu\n", pvi.PrivateUsage, pvi.PagefileUsage ); if (winetest_debug > 1) dump_vm_counters("VM counters after VirtualAlloc(MEM_COMMIT)", &pvi); ok( pvi.VirtualSize == prev_size, diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index c39d8fb23a..33bee03c19 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -1008,7 +1008,7 @@ NTSTATUS WINAPI NtTerminateProcess( HANDLE handle, LONG exit_code ) #if defined(HAVE_MACH_MACH_H) -static void fill_VM_COUNTERS(VM_COUNTERS* pvmi) +static void fill_VM_COUNTERS( VM_COUNTERS_EX *pvmi ) { #if defined(MACH_TASK_BASIC_INFO) struct mach_task_basic_info info; @@ -1025,7 +1025,7 @@ static void fill_VM_COUNTERS(VM_COUNTERS* pvmi) #elif defined(linux) -static void fill_VM_COUNTERS(VM_COUNTERS* pvmi) +static void fill_VM_COUNTERS( VM_COUNTERS_EX *pvmi ) { FILE *f; char line[256]; @@ -1056,7 +1056,7 @@ static void fill_VM_COUNTERS(VM_COUNTERS* pvmi) #else -static void fill_VM_COUNTERS(VM_COUNTERS* pvmi) +static void fill_VM_COUNTERS( VM_COUNTERS_EX *pvmi ) { /* FIXME : real data */ } @@ -1168,7 +1168,7 @@ NTSTATUS WINAPI NtQueryInformationProcess( HANDLE handle, PROCESSINFOCLASS class case ProcessVmCounters: { - VM_COUNTERS pvmi; + VM_COUNTERS_EX pvmi; /* older Windows versions don't have the PrivateUsage field */ if (size >= sizeof(VM_COUNTERS)) @@ -1196,6 +1196,8 @@ NTSTATUS WINAPI NtQueryInformationProcess( HANDLE handle, PROCESSINFOCLASS class SERVER_END_REQ; if (ret) break; } + if (size >= sizeof(VM_COUNTERS_EX)) + pvmi.PrivateUsage = pvmi.PagefileUsage; len = size; if (len != sizeof(VM_COUNTERS)) len = sizeof(VM_COUNTERS_EX); memcpy(info, &pvmi, min(size, sizeof(pvmi)));

1 0

Alexandre Julliard : winebuild: Support a -mno-cygwin flag.
by Alexandre Julliard 01 Jul '20

01 Jul '20

Module: wine Branch: master Commit: 7933562048d4d93c419a1b9d32427c33148b67d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7933562048d4d93c419a1b9d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 1 10:36:30 2020 +0200 winebuild: Support a -mno-cygwin flag. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/build.h | 1 + tools/winebuild/import.c | 2 +- tools/winebuild/main.c | 2 ++ tools/winebuild/winebuild.man.in | 7 +++++-- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index c162888a03..d0fc3dca1b 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -363,6 +363,7 @@ extern int verbose; extern int link_ext_symbols; extern int force_pointer_size; extern int unwind_tables; +extern int use_msvcrt; extern int unix_lib; extern int safe_seh; diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 04ab433dd6..616b9842ce 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -643,7 +643,7 @@ void read_undef_symbols( DLLSPEC *spec, char **argv ) add_undef_import( p + strlen( import_func_prefix ), 0 ); else if (!strncmp( p, import_ord_prefix, strlen(import_ord_prefix) )) add_undef_import( p + strlen( import_ord_prefix ), 1 ); - else if (!unix_lib || !find_name( p, &stdc_functions )) + else if (use_msvcrt || !find_name( p, &stdc_functions )) strarray_add( &undef_symbols, xstrdup( p ), NULL ); } if ((err = pclose( f ))) warning( "%s failed with status %d\n", cmd, err ); diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index efb86b705e..c1858a4b4d 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -46,6 +46,7 @@ int verbose = 0; int link_ext_symbols = 0; int force_pointer_size = 0; int unwind_tables = 0; +int use_msvcrt = 0; int unix_lib = 0; int safe_seh = 0; @@ -445,6 +446,7 @@ static char **parse_options( int argc, char **argv, DLLSPEC *spec ) else if (!strcmp( optarg, "64" )) force_pointer_size = 8; else if (!strcmp( optarg, "arm" )) thumb_mode = 0; else if (!strcmp( optarg, "thumb" )) thumb_mode = 1; + else if (!strcmp( optarg, "no-cygwin" )) use_msvcrt = 1; else if (!strcmp( optarg, "unix" )) unix_lib = 1; else if (!strncmp( optarg, "cpu=", 4 )) cpu_option = xstrdup( optarg + 4 ); else if (!strncmp( optarg, "fpu=", 4 )) fpu_option = xstrdup( optarg + 4 ); diff --git a/tools/winebuild/winebuild.man.in b/tools/winebuild/winebuild.man.in index 63ea2a3226..109f3824f1 100644 --- a/tools/winebuild/winebuild.man.in +++ b/tools/winebuild/winebuild.man.in @@ -177,9 +177,12 @@ Generate respectively 16-bit, 32-bit or 64-bit code. .BI \-marm,\ \-mthumb,\ \-march= option ,\ \-mcpu= option ,\ \-mfpu= option ,\ \-mfloat-abi= option Set code generation options for the assembler. .TP +.B \-mno-cygwin +Build a library that uses the Windows runtime instead of the Unix C +library. +.TP .B \-munix -Build a library that imports standard functions from the Unix C -library instead of the Windows runtime. +Build the Unix counterpart of a builtin module. .TP .BI \-M,\ --main-module= module When building a 16-bit dll, set the name of its 32-bit counterpart to

1 0

Alexandre Julliard : winegcc: Pass -mno-cygwin and -munix flags directly to winebuild.
by Alexandre Julliard 01 Jul '20

01 Jul '20

Module: wine Branch: master Commit: cbc35152c4c4b053d6ff48601c3eead71f083b21 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cbc35152c4c4b053d6ff4860… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 1 10:36:42 2020 +0200 winegcc: Pass -mno-cygwin and -munix flags directly to winebuild. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 10 +++++++++- tools/winegcc/winegcc.man.in | 3 +++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 776d2b6473..29c1b0549d 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -207,6 +207,7 @@ struct options int nostartfiles; int nodefaultlibs; int noshortwchar; + int unix_lib; int gui_app; int unicode_app; int win16_app; @@ -964,7 +965,8 @@ static strarray *get_winebuild_args(struct options *opts) for (i = 0; i < opts->prefix->size; i++) strarray_add( spec_args, strmake( "-B%s", opts->prefix->base[i] )); } - if (!opts->use_msvcrt) strarray_add( spec_args, "-munix" ); + if (opts->use_msvcrt) strarray_add( spec_args, "-mno-cygwin" ); + if (opts->unix_lib) strarray_add( spec_args, "-munix" ); if (opts->unwind_tables) strarray_add( spec_args, "-fasynchronous-unwind-tables" ); else strarray_add( spec_args, "-fno-asynchronous-unwind-tables" ); return spec_args; @@ -1790,6 +1792,7 @@ int main(int argc, char **argv) { opts.use_msvcrt = 1; raw_compiler_arg = 0; + strarray_add( opts.winebuild_args, opts.args->base[i] ); } else if (strcmp("-mwindows", opts.args->base[i]) == 0) { @@ -1810,6 +1813,11 @@ int main(int argc, char **argv) { raw_compiler_arg = 0; } + else if (strcmp("-munix", opts.args->base[i]) == 0) + { + opts.unix_lib = 1; + raw_compiler_arg = 0; + } else if (strcmp("-m16", opts.args->base[i]) == 0) { opts.win16_app = 1; diff --git a/tools/winegcc/winegcc.man.in b/tools/winegcc/winegcc.man.in index 5550767299..8a14dd59fd 100644 --- a/tools/winegcc/winegcc.man.in +++ b/tools/winegcc/winegcc.man.in @@ -59,6 +59,9 @@ Set the default entry point of the application to be the Unicode This option adds -lgdi32, -lcomdlg32, and -lshell32 to the list of default libraries, and passes '--subsystem windows' to winebuild to build graphical applications. +.B \-munix +Set when building the Unix counterpart of a builtin module. +.TP .IP \fB-nodefaultlibs\fR Do not use the standard system libraries when linking. These include at a minimum -lkernel32, -luser32, -ladvapi32, and

1 0

Alexandre Julliard : makefiles: Use -munix when building a Unix library.
by Alexandre Julliard 01 Jul '20

01 Jul '20

Module: wine Branch: master Commit: 2cf256686e5f5c314bbdda16e91327a636cad4b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2cf256686e5f5c314bbdda16… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 1 10:36:51 2020 +0200 makefiles: Use -munix when building a Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/makedep.c b/tools/makedep.c index 743eaf6e35..bdeae8f65a 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3355,6 +3355,7 @@ static void output_module( struct makefile *make ) output_filename( tools_path( make, "winegcc" )); output( "\n" ); output_winegcc_command( make, 0 ); + output_filename( "-munix" ); output_filename( "-shared" ); if (strarray_exists( &make->extradllflags, "-nodefaultlibs" )) output_filename( "-nodefaultlibs" ); output_filenames_obj_dir( make, make->unixobj_files );

1 0

Alexandre Julliard : winebuild: Don't use a dll entry point for Unix libraries.
by Alexandre Julliard 01 Jul '20

01 Jul '20

Module: wine Branch: master Commit: e6632e0412663da0d1c1a4a453462d745160ba4e URL: https://source.winehq.org/git/wine.git/?a=commit;h=e6632e0412663da0d1c1a4a4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 1 10:36:55 2020 +0200 winebuild: Don't use a dll entry point for Unix libraries. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index c1858a4b4d..0e5e1627dd 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -680,7 +680,7 @@ int main(int argc, char **argv) case MODE_EXE: load_resources( argv, spec ); if (spec_file_name && !parse_input_file( spec )) break; - if (!spec->init_func) spec->init_func = xstrdup( get_default_entry_point( spec )); + if (!spec->init_func && !unix_lib) spec->init_func = xstrdup( get_default_entry_point( spec )); if (fake_module) {

1 0

Alexandre Julliard : ntdll: Get rid of DllMain in the Unix library.
by Alexandre Julliard 01 Jul '20

01 Jul '20

Module: wine Branch: master Commit: 8885a51347a768d8a9125d573963d12ac67d4715 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8885a51347a768d8a9125d57… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 1 10:36:59 2020 +0200 ntdll: Get rid of DllMain in the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 590d1b544a..3ea7adf9f0 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1830,10 +1830,3 @@ void __wine_main( int argc, char *argv[], char *envp[] ) #endif start_main_thread(); } - - -BOOL WINAPI DECLSPEC_HIDDEN DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) -{ - if (reason == DLL_PROCESS_ATTACH) LdrDisableThreadCalloutsForDll( inst ); - return TRUE; -}

1 0