wine-commits November 2019

wine-commits@winehq.org

1 participants
895 discussions

Alexandre Julliard : ntdll: Move locale functions to a new locale.c file.
by Alexandre Julliard 19 Nov '19

19 Nov '19

Module: wine Branch: master Commit: 4538a137e089240f1981f0d6f82fb8d63a65f4f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4538a137e089240f1981f0d6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 13 20:55:03 2019 +0100 ntdll: Move locale functions to a new locale.c file. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/Makefile.in | 1 + dlls/ntdll/directory.c | 134 --------------------------- dlls/ntdll/loader.c | 1 + dlls/ntdll/locale.c | 236 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/ntdll_misc.h | 4 +- dlls/ntdll/resource.c | 59 +----------- 6 files changed, 242 insertions(+), 193 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4538a137e089240f1981…

1 0

Alexandre Julliard : kernel32: Add more special cases in ConvertDefaultLocale().
by Alexandre Julliard 19 Nov '19

19 Nov '19

Module: wine Branch: master Commit: 4b1a8d63615d0e553fd4021a7b135192467220cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b1a8d63615d0e553fd4021a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 19 09:58:20 2019 +0100 kernel32: Add more special cases in ConvertDefaultLocale(). --- dlls/kernel32/locale.c | 41 ++++++++++++++++--------- dlls/kernel32/tests/locale.c | 73 ++++++++++++++++++++++++++++++++------------ 2 files changed, 81 insertions(+), 33 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4b1a8d63615d0e553fd4…

1 0

Alexandre Julliard : kernel32: Move system information functions to kernelbase.
by Alexandre Julliard 19 Nov '19

19 Nov '19

Module: wine Branch: master Commit: 71aba33fc68e97d1b49a9207c8fc2ef733b604a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=71aba33fc68e97d1b49a9207… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 18 18:57:26 2019 +0100 kernel32: Move system information functions to kernelbase. --- dlls/kernel32/cpu.c | 151 ---------------------------------------- dlls/kernel32/kernel32.spec | 10 +-- dlls/kernelbase/kernelbase.spec | 10 +-- dlls/kernelbase/memory.c | 147 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 157 insertions(+), 161 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=71aba33fc68e97d1b49a…

1 0

Alexandre Julliard : kernel32: Move physical memory status functions to kernelbase.
by Alexandre Julliard 19 Nov '19

19 Nov '19

Module: wine Branch: master Commit: b73cfa72edaed76744cfa9a19670bff3684c66ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=b73cfa72edaed76744cfa9a1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 18 15:05:04 2019 +0100 kernel32: Move physical memory status functions to kernelbase. --- dlls/kernel32/heap.c | 274 +--------------------------------------- dlls/kernel32/kernel32.spec | 4 +- dlls/kernelbase/kernelbase.spec | 4 +- dlls/kernelbase/memory.c | 77 +++++++++++ 4 files changed, 83 insertions(+), 276 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b73cfa72edaed76744cf…

1 0

Alexandre Julliard : ntdll: Support SystemPerformanceInformation on non-Linux platforms.
by Alexandre Julliard 19 Nov '19

19 Nov '19

Module: wine Branch: master Commit: dad14ab8331922171393d6ef75861303c8bc8d50 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dad14ab8331922171393d6ef… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 18 14:55:00 2019 +0100 ntdll: Support SystemPerformanceInformation on non-Linux platforms. Based on the GlobalMemoryStatusEx implementation. --- dlls/ntdll/nt.c | 197 ++++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 147 insertions(+), 50 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index b6daa226b3..c9b278d3fc 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -50,6 +50,19 @@ #endif #include <time.h> +#ifdef sun +/* FIXME: Unfortunately swapctl can't be used with largefile.... */ +# undef _FILE_OFFSET_BITS +# define _FILE_OFFSET_BITS 32 +# ifdef HAVE_SYS_RESOURCE_H +# include <sys/resource.h> +# endif +# ifdef HAVE_SYS_STAT_H +# include <sys/stat.h> +# endif +# include <sys/swap.h> +#endif + #define NONAMELESSUNION #include "ntstatus.h" #define WIN32_NO_STATUS @@ -2347,6 +2360,139 @@ static NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULONG #endif +static void get_performance_info( SYSTEM_PERFORMANCE_INFORMATION *info ) +{ + unsigned long long totalram = 0, freeram = 0, totalswap = 0, freeswap = 0; + FILE *fp; + + memset( info, 0, sizeof(*info) ); + + if ((fp = fopen("/proc/uptime", "r"))) + { + double uptime, idle_time; + + fscanf(fp, "%lf %lf", &uptime, &idle_time); + fclose(fp); + info->IdleTime.QuadPart = 10000000 * idle_time; + } + else + { + static ULONGLONG idle; + /* many programs expect IdleTime to change so fake change */ + info->IdleTime.QuadPart = ++idle; + } + +#ifdef linux + if ((fp = fopen("/proc/meminfo", "r"))) + { + unsigned long long value; + char line[64]; + + while (fgets(line, sizeof(line), fp)) + { + if(sscanf(line, "MemTotal: %llu kB", &value) == 1) + totalram += value * 1024; + else if(sscanf(line, "MemFree: %llu kB", &value) == 1) + freeram += value * 1024; + else if(sscanf(line, "SwapTotal: %llu kB", &value) == 1) + totalswap += value * 1024; + else if(sscanf(line, "SwapFree: %llu kB", &value) == 1) + freeswap += value * 1024; + else if (sscanf(line, "Buffers: %llu", &value)) + freeram += value * 1024; + else if (sscanf(line, "Cached: %llu", &value)) + freeram += value * 1024; + } + fclose(fp); + } +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || \ + defined(__OpenBSD__) || defined(__DragonFly__) || defined(__APPLE__) + { +#ifdef __APPLE__ + unsigned int val; +#else + unsigned long val; +#endif + int mib[2]; + size_t size_sys; + + mib[0] = CTL_HW; +#ifdef HW_MEMSIZE + { + uint64_t val64; + mib[1] = HW_MEMSIZE; + size_sys = sizeof(val64); + if (!sysctl(mib, 2, &val64, &size_sys, NULL, 0) && size_sys == sizeof(val64)) totalram = val64; + } +#endif + +#ifdef HAVE_MACH_MACH_H + { + host_name_port_t host = mach_host_self(); + mach_msg_type_number_t count; +#ifdef HOST_VM_INFO64_COUNT + vm_statistics64_data_t vm_stat; + + count = HOST_VM_INFO64_COUNT; + if (host_statistics64(host, HOST_VM_INFO64, (host_info64_t)&vm_stat, &count) == KERN_SUCCESS) + freeram = (vm_stat.free_count + vm_stat.inactive_count) * (ULONGLONG)page_size; +#endif + if (!totalram) + { + host_basic_info_data_t info; + count = HOST_BASIC_INFO_COUNT; + if (host_info(host, HOST_BASIC_INFO, (host_info_t)&info, &count) == KERN_SUCCESS) + totalram = info.max_mem; + } + mach_port_deallocate(mach_task_self(), host); + } +#endif + + if (!totalram) + { + mib[1] = HW_PHYSMEM; + size_sys = sizeof(val); + if (!sysctl(mib, 2, &val, &size_sys, NULL, 0) && size_sys == sizeof(val)) totalram = val; + } + if (!freeram) + { + mib[1] = HW_USERMEM; + size_sys = sizeof(val); + if (!sysctl(mib, 2, &val, &size_sys, NULL, 0) && size_sys == sizeof(val)) freeram = val; + } +#ifdef VM_SWAPUSAGE + { + struct xsw_usage swap; + mib[0] = CTL_VM; + mib[1] = VM_SWAPUSAGE; + size_sys = sizeof(swap); + if (!sysctl(mib, 2, &swap, &size_sys, NULL, 0) && size_sys == sizeof(swap)) + { + totalswap = swap.xsu_total; + freeswap = swap.xsu_avail; + } + } +#endif + } +#elif defined( sun ) + { + struct anoninfo swapinf; + int rval; + totalram = sysconf(_SC_PHYS_PAGES) * (ULONGLONG)page_size; + freeram = sysconf(_SC_AVPHYS_PAGES) * (ULONGLONG)page_size; + rval = swapctl(SC_AINFO, &swapinf); + if (rval > -1) + { + totalswap = swapinf.ani_max * (ULONGLONG)page_size; + freeswap = swapinf.ani_free * (ULONGLONG)page_size; + } + } +#endif + info->AvailablePages = freeram / page_size; + info->TotalCommittedPages = (totalram + totalswap - freeram - freeswap) / page_size; + info->TotalCommitLimit = (totalram + totalswap) / page_size; +} + /*********************************************************************** * RtlIsProcessorFeaturePresent [NTDLL.@] */ @@ -2415,59 +2561,10 @@ NTSTATUS WINAPI NtQuerySystemInformation( { SYSTEM_PERFORMANCE_INFORMATION spi; static BOOL fixme_written = FALSE; - FILE *fp; - memset(&spi, 0 , sizeof(spi)); + get_performance_info( &spi ); len = sizeof(spi); - spi.Reserved3 = 0x7fffffff; /* Available paged pool memory? */ - - if ((fp = fopen("/proc/uptime", "r"))) - { - double uptime, idle_time; - - fscanf(fp, "%lf %lf", &uptime, &idle_time); - fclose(fp); - spi.IdleTime.QuadPart = 10000000 * idle_time; - } - else - { - static ULONGLONG idle; - /* many programs expect IdleTime to change so fake change */ - spi.IdleTime.QuadPart = ++idle; - } - - if ((fp = fopen("/proc/meminfo", "r"))) - { - unsigned long long totalram = 0, freeram = 0, totalswap = 0, freeswap = 0; - char line[64]; - while (fgets(line, sizeof(line), fp)) - { - if(sscanf(line, "MemTotal: %llu kB", &totalram) == 1) - { - totalram *= 1024; - } - else if(sscanf(line, "MemFree: %llu kB", &freeram) == 1) - { - freeram *= 1024; - } - else if(sscanf(line, "SwapTotal: %llu kB", &totalswap) == 1) - { - totalswap *= 1024; - } - else if(sscanf(line, "SwapFree: %llu kB", &freeswap) == 1) - { - freeswap *= 1024; - break; - } - } - fclose(fp); - - spi.AvailablePages = freeram / page_size; - spi.TotalCommittedPages = (totalram + totalswap - freeram - freeswap) / page_size; - spi.TotalCommitLimit = (totalram + totalswap) / page_size; - } - if (Length >= len) { if (!SystemInformation) ret = STATUS_ACCESS_VIOLATION;

1 0

Zebediah Figura : strmbase: Avoid unnecessary use of IPin::ConnectedTo().
by Alexandre Julliard 19 Nov '19

19 Nov '19

Module: wine Branch: master Commit: cc78d104054378570b0d4a244efb5a3e95b92cb0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc78d104054378570b0d4a24… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Nov 18 18:51:24 2019 -0600 strmbase: Avoid unnecessary use of IPin::ConnectedTo(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/outputqueue.c | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/dlls/strmbase/outputqueue.c b/dlls/strmbase/outputqueue.c index ee05653d7a..dbcc4b6d0d 100644 --- a/dlls/strmbase/outputqueue.c +++ b/dlls/strmbase/outputqueue.c @@ -177,6 +177,8 @@ VOID WINAPI OutputQueue_SendAnyway(OutputQueue *pOutputQueue) VOID WINAPI OutputQueue_EOS(OutputQueue *pOutputQueue) { + IPin *peer; + EnterCriticalSection(&pOutputQueue->csQueue); if (pOutputQueue->hThread) { @@ -191,16 +193,8 @@ VOID WINAPI OutputQueue_EOS(OutputQueue *pOutputQueue) qev->pSample = NULL; list_add_tail(&pOutputQueue->SampleList, &qev->entry); } - else - { - IPin* ppin = NULL; - IPin_ConnectedTo(&pOutputQueue->pInputPin->pin.IPin_iface, &ppin); - if (ppin) - { - IPin_EndOfStream(ppin); - IPin_Release(ppin); - } - } + else if ((peer = pOutputQueue->pInputPin->pin.peer)) + IPin_EndOfStream(peer); LeaveCriticalSection(&pOutputQueue->csQueue); /* Covers sending the Event to the worker Thread */ OutputQueue_SendAnyway(pOutputQueue); @@ -259,13 +253,9 @@ DWORD WINAPI OutputQueueImpl_ThreadProc(OutputQueue *pOutputQueue) QueuedEvent *qev = LIST_ENTRY(cursor, QueuedEvent, entry); if (qev->type == EOS_PACKET) { - IPin* ppin = NULL; - IPin_ConnectedTo(&pOutputQueue->pInputPin->pin.IPin_iface, &ppin); - if (ppin) - { - IPin_EndOfStream(ppin); - IPin_Release(ppin); - } + IPin *peer; + if ((peer = pOutputQueue->pInputPin->pin.peer)) + IPin_EndOfStream(peer); } else if (qev->type == SAMPLE_PACKET) break;

1 0

Zebediah Figura : quartz/videorenderer: Avoid calling IPin::ConnectionMediaType() on our own pin.
by Alexandre Julliard 19 Nov '19

19 Nov '19

Module: wine Branch: master Commit: bcb05ad29b7cf1bcda29f5b019cf2636b3491f4a URL: https://source.winehq.org/git/wine.git/?a=commit;h=bcb05ad29b7cf1bcda29f5b0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Nov 18 18:51:23 2019 -0600 quartz/videorenderer: Avoid calling IPin::ConnectionMediaType() on our own pin. Avoids leaking the format block. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/videorenderer.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 18e5f618b0..b71d15a5d2 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -136,30 +136,23 @@ static void VideoRenderer_AutoShowWindow(VideoRendererImpl *This) static DWORD VideoRenderer_SendSampleData(VideoRendererImpl* This, LPBYTE data, DWORD size) { - AM_MEDIA_TYPE amt; - HRESULT hr = S_OK; + const AM_MEDIA_TYPE *amt = &This->renderer.sink.pin.mt; BITMAPINFOHEADER *bmiHeader; HDC dc; TRACE("(%p)->(%p, %d)\n", This, data, size); - hr = IPin_ConnectionMediaType(&This->renderer.sink.pin.IPin_iface, &amt); - if (FAILED(hr)) { - ERR("Unable to retrieve media type\n"); - return hr; - } - - if (IsEqualIID(&amt.formattype, &FORMAT_VideoInfo)) + if (IsEqualGUID(&amt->formattype, &FORMAT_VideoInfo)) { - bmiHeader = &((VIDEOINFOHEADER *)amt.pbFormat)->bmiHeader; + bmiHeader = &((VIDEOINFOHEADER *)amt->pbFormat)->bmiHeader; } - else if (IsEqualIID(&amt.formattype, &FORMAT_VideoInfo2)) + else if (IsEqualGUID(&amt->formattype, &FORMAT_VideoInfo2)) { - bmiHeader = &((VIDEOINFOHEADER2 *)amt.pbFormat)->bmiHeader; + bmiHeader = &((VIDEOINFOHEADER2 *)amt->pbFormat)->bmiHeader; } else { - FIXME("Unknown type %s\n", debugstr_guid(&amt.subtype)); + FIXME("Unknown subtype %s.\n", debugstr_guid(&amt->subtype)); return VFW_E_RUNTIME_ERROR; }

1 0

Zebediah Figura : wineqtdecoder: Simplify disconnecting the sink's peer in qt_splitter_destroy().
by Alexandre Julliard 19 Nov '19

19 Nov '19

Module: wine Branch: master Commit: 31bd0a6abbf2816c428c4044227d190b6ccda8d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=31bd0a6abbf2816c428c4044… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Nov 18 18:51:22 2019 -0600 wineqtdecoder: Simplify disconnecting the sink's peer in qt_splitter_destroy(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineqtdecoder/qtsplitter.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index a7da3b37d6..2da0f691dc 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -234,12 +234,9 @@ static void qt_splitter_destroy(struct strmbase_filter *iface) EnterCriticalSection(&filter->csReceive); /* Don't need to clean up output pins, disconnecting input pin will do that */ - IPin_ConnectedTo(&filter->pInputPin.pin.IPin_iface, &peer); - if (peer) - { - IPin_Disconnect(peer); - IPin_Release(peer); - } + + if (filter->pInputPin.pin.peer) + IPin_Disconnect(filter->pInputPin.pin.peer); FreeMediaType(&filter->pInputPin.pin.mt); if (filter->pInputPin.pAlloc)

1 0

Zebediah Figura : strmbase: Forbid (dis)connecting pins if the filter is not stopped.
by Alexandre Julliard 19 Nov '19

19 Nov '19

Module: wine Branch: master Commit: 2a6037e263ff3fae8ca82d90b0b141bea1cd473d URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a6037e263ff3fae8ca82d90… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Nov 18 18:51:21 2019 -0600 strmbase: Forbid (dis)connecting pins if the filter is not stopped. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/pin.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index c7f1ed2af4..8c337ca471 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -366,6 +366,13 @@ HRESULT WINAPI BaseOutputPinImpl_Connect(IPin * iface, IPin * pReceivePin, const EnterCriticalSection(&This->pin.filter->csFilter); { + if (This->pin.filter->state != State_Stopped) + { + LeaveCriticalSection(&This->pin.filter->csFilter); + WARN("Filter is not stopped; returning VFW_E_NOT_STOPPED.\n"); + return VFW_E_NOT_STOPPED; + } + /* if we have been a specific type to connect with, then we can either connect * with that or fail. We cannot choose different AM_MEDIA_TYPE */ if (pmt && !IsEqualGUID(&pmt->majortype, &GUID_NULL) && !IsEqualGUID(&pmt->subtype, &GUID_NULL)) @@ -447,6 +454,13 @@ HRESULT WINAPI BaseOutputPinImpl_Disconnect(IPin * iface) EnterCriticalSection(&This->pin.filter->csFilter); { + if (This->pin.filter->state != State_Stopped) + { + LeaveCriticalSection(&This->pin.filter->csFilter); + WARN("Filter is not stopped; returning VFW_E_NOT_STOPPED.\n"); + return VFW_E_NOT_STOPPED; + } + if (This->pMemInputPin) { IMemInputPin_Release(This->pMemInputPin); @@ -730,6 +744,13 @@ HRESULT WINAPI BaseInputPinImpl_ReceiveConnection(IPin * iface, IPin * pReceiveP EnterCriticalSection(&This->pin.filter->csFilter); { + if (This->pin.filter->state != State_Stopped) + { + LeaveCriticalSection(&This->pin.filter->csFilter); + WARN("Filter is not stopped; returning VFW_E_NOT_STOPPED.\n"); + return VFW_E_NOT_STOPPED; + } + if (This->pin.peer) hr = VFW_E_ALREADY_CONNECTED;

1 0

Zebediah Figura : strmbase: Rename the "mtCurrent" field of struct strmbase_pin to "mt".
by Alexandre Julliard 19 Nov '19

19 Nov '19

Module: wine Branch: master Commit: 03f0479c34ec1d9cf732728f740113fedd48a10c URL: https://source.winehq.org/git/wine.git/?a=commit;h=03f0479c34ec1d9cf732728f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Nov 18 18:51:20 2019 -0600 strmbase: Rename the "mtCurrent" field of struct strmbase_pin to "mt". Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/avico.c | 4 ++-- dlls/qcap/avimux.c | 2 +- dlls/qcap/smartteefilter.c | 4 ++-- dlls/quartz/dsoundrender.c | 14 +++++++------- dlls/quartz/filesource.c | 4 ++-- dlls/quartz/tests/videorenderer.c | 4 ++-- dlls/quartz/tests/vmr7.c | 4 ++-- dlls/quartz/tests/vmr9.c | 4 ++-- dlls/quartz/videorenderer.c | 4 ++-- dlls/quartz/vmr9.c | 6 +++--- dlls/strmbase/pin.c | 20 ++++++++++---------- dlls/winegstreamer/gstdemux.c | 4 ++-- dlls/wineqtdecoder/qtsplitter.c | 4 ++-- include/wine/strmbase.h | 2 +- 14 files changed, 40 insertions(+), 40 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=03f0479c34ec1d9cf732…

1 0

← Newer
1
...
42
43
44
45
46
47
48
...
90
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2019