November 2021 - Wine-devel - list.winehq.org

[PATCH] ntdll: Move the FILE ptr into the blocks that use it.
by Huw Davies 30 Nov '21

30 Nov '21

This is to prevent compiler warnings on non-linux platforms. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/ntdll/unix/system.c | 61 ++++++++++++++++++++++------------------ 1 file changed, 34 insertions(+), 27 deletions(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 91184b12dba..941c69190fb 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -1848,18 +1848,21 @@ static NTSTATUS get_firmware_info( SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULON 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 defined(linux) - if ((fp = fopen("/proc/uptime", "r"))) { - double uptime, idle_time; + FILE *fp; - fscanf(fp, "%lf %lf", &uptime, &idle_time); - fclose(fp); - info->IdleTime.QuadPart = 10000000 * idle_time; + 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; + } } #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) { @@ -1885,27 +1888,31 @@ static void get_performance_info( SYSTEM_PERFORMANCE_INFORMATION *info ) #endif #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); + { + FILE *fp; + + 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__) -- 2.23.0

1 0

[PATCH v4 9/9] winex11.drv: Use UpdateDisplayDevices driver entry point for registering devices.
by Jacek Caban 30 Nov '21

30 Nov '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winex11.drv/Makefile.in | 2 +- dlls/winex11.drv/display.c | 537 ++------------------------------- dlls/winex11.drv/init.c | 1 + dlls/winex11.drv/x11drv.h | 2 + dlls/winex11.drv/x11drv_main.c | 2 +- 5 files changed, 32 insertions(+), 512 deletions(-)

2 1

[PATCH v4 8/9] user32: Invalidate cache in update_monitor_cache when modification time matches current time.
by Jacek Caban 30 Nov '21

30 Nov '21

Also preserve last error. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/sysparams.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)

3 3

[PATCH v4 7/9] win32u: Implement NtUserEnumDisplayDevices.
by Jacek Caban 30 Nov '21

30 Nov '21

And use it in user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/sysparams.c | 335 +---------------------------------- dlls/win32u/dc.c | 6 - dlls/win32u/gdiobj.c | 1 + dlls/win32u/ntgdi_private.h | 1 - dlls/win32u/sysparams.c | 71 ++++++++ dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 33 +++- dlls/win32u/wrappers.c | 10 +- include/ntuser.h | 2 + 9 files changed, 112 insertions(+), 349 deletions(-)

2 1

[PATCH v4 6/9] winex11.drv: Use gdi driver types for display device handler.
by Jacek Caban 30 Nov '21

30 Nov '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winex11.drv/desktop.c | 18 ++++++------ dlls/winex11.drv/display.c | 24 ++++++++-------- dlls/winex11.drv/x11drv.h | 55 +++++-------------------------------- dlls/winex11.drv/xinerama.c | 20 +++++++------- dlls/winex11.drv/xrandr.c | 47 +++++++++++++++---------------- 5 files changed, 62 insertions(+), 102 deletions(-)

2 1

[PATCH v4 5/9] win32u: Implement monitor registration.
by Jacek Caban 30 Nov '21

30 Nov '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/sysparams.c | 143 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 142 insertions(+), 1 deletion(-)

2 1

[PATCH v2] uiautomationcore: Add UiaRaiseAutomationPropertyChangedEvent stub.
by Mohamad Al-Jaf 30 Nov '21

30 Nov '21

Enable Microsoft Edge to run in Windows 10 mode. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51437 Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- v2: Fix incorrect spec file parameter. (Thanks Connor McAdams and Nikolay Sivov) --- dlls/uiautomationcore/uia_main.c | 9 +++++++++ dlls/uiautomationcore/uiautomationcore.spec | 2 +- include/uiautomationcoreapi.h | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/uiautomationcore/uia_main.c b/dlls/uiautomationcore/uia_main.c index 44fd42742d9..f1cf06ed4f5 100644 --- a/dlls/uiautomationcore/uia_main.c +++ b/dlls/uiautomationcore/uia_main.c @@ -324,6 +324,15 @@ HRESULT WINAPI UiaRaiseAutomationEvent(IRawElementProviderSimple *provider, EVEN return S_OK; } +/*********************************************************************** + * UiaRaiseAutomationPropertyChangedEvent (uiautomationcore.@) + */ +HRESULT WINAPI UiaRaiseAutomationPropertyChangedEvent(IRawElementProviderSimple *provider, PROPERTYID id, VARIANT old, VARIANT new) +{ + FIXME("(%p, %d, %s, %s): stub\n", provider, id, debugstr_variant(&old), debugstr_variant(&new)); + return S_OK; +} + void WINAPI UiaRegisterProviderCallback(UiaProviderCallback *callback) { FIXME("(%p): stub\n", callback); diff --git a/dlls/uiautomationcore/uiautomationcore.spec b/dlls/uiautomationcore/uiautomationcore.spec index 656641c4bad..82071bd2317 100644 --- a/dlls/uiautomationcore/uiautomationcore.spec +++ b/dlls/uiautomationcore/uiautomationcore.spec @@ -86,7 +86,7 @@ #@ stub UiaProviderFromIAccessible @ stub UiaRaiseAsyncContentLoadedEvent @ stdcall UiaRaiseAutomationEvent(ptr long) -@ stub UiaRaiseAutomationPropertyChangedEvent +@ stdcall UiaRaiseAutomationPropertyChangedEvent(ptr long int128 int128) #@ stub UiaRaiseChangesEvent #@ stub UiaRaiseNotificationEvent @ stub UiaRaiseStructureChangedEvent diff --git a/include/uiautomationcoreapi.h b/include/uiautomationcoreapi.h index de486710158..563d5c602bd 100644 --- a/include/uiautomationcoreapi.h +++ b/include/uiautomationcoreapi.h @@ -66,6 +66,7 @@ HRESULT WINAPI UiaGetReservedNotSupportedValue(IUnknown **value); int WINAPI UiaLookupId(enum AutomationIdentifierType type, const GUID *guid); BOOL WINAPI UiaPatternRelease(HUIAPATTERNOBJECT hobj); HRESULT WINAPI UiaRaiseAutomationEvent(IRawElementProviderSimple *provider, EVENTID id); +HRESULT WINAPI UiaRaiseAutomationPropertyChangedEvent(IRawElementProviderSimple *provider, PROPERTYID id, VARIANT old, VARIANT new); void WINAPI UiaRegisterProviderCallback(UiaProviderCallback *pCallback); LRESULT WINAPI UiaReturnRawElementProvider(HWND hwnd, WPARAM wParam, LPARAM lParam, IRawElementProviderSimple *elprov); BOOL WINAPI UiaTextRangeRelease(HUIATEXTRANGE hobj); -- 2.34.1

2 1

[PATCH v4 4/9] win32u: Implement display adapter registration.
by Jacek Caban 30 Nov '21

30 Nov '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/font.c | 4 ++- dlls/win32u/sysparams.c | 67 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 69 insertions(+), 2 deletions(-)

2 1

[PATCH v4 3/9] win32u: Implement GPU registration.
by Jacek Caban 30 Nov '21

30 Nov '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/font.c | 10 +- dlls/win32u/sysparams.c | 473 ++++++++++++++++++++++++++++++++++- dlls/win32u/win32u_private.h | 6 + 3 files changed, 481 insertions(+), 8 deletions(-)

2 1

[PATCH v4 2/9] win32u: Introduce UpdateDisplayDevice user driver entry point.
by Jacek Caban 30 Nov '21

30 Nov '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/driver.c | 1 + dlls/win32u/driver.c | 13 +++++++ dlls/win32u/sysparams.c | 75 ++++++++++++++++++++++++++++++++++++++- include/wine/gdi_driver.h | 39 +++++++++++++++++++- 4 files changed, 126 insertions(+), 2 deletions(-)

2 1