February 2022 - Wine-Commits

Jacek Caban : winex11: Get primary monitor rect from win32u.
by Alexandre Julliard Feb. 18, 2022

Feb. 18, 2022

Module: wine Branch: master Commit: 656edbb508d51cbe3155d856ee3f2c27a6cd4cba URL: https://source.winehq.org/git/wine.git/?a=commit;h=656edbb508d51cbe3155d856… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 18 13:37:29 2022 +0100 winex11: Get primary monitor rect from win32u. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/sysparams.c | 11 +++-- dlls/winex11.drv/Makefile.in | 2 +- dlls/winex11.drv/display.c | 101 +------------------------------------------ include/ntuser.h | 1 + 4 files changed, 11 insertions(+), 104 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 09a04892d2d..58bd22a3adf 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -1474,7 +1474,7 @@ RECT get_display_rect( const WCHAR *display ) return map_dpi_rect( rect, system_dpi, get_thread_dpi() ); } -static RECT get_primary_monitor_rect(void) +static RECT get_primary_monitor_rect( UINT dpi ) { struct monitor *monitor; RECT rect = {0}; @@ -1489,7 +1489,7 @@ static RECT get_primary_monitor_rect(void) } unlock_display_devices(); - return map_dpi_rect( rect, system_dpi, get_thread_dpi() ); + return map_dpi_rect( rect, system_dpi, dpi ); } /********************************************************************** @@ -4203,10 +4203,10 @@ int get_system_metrics( int index ) case SM_MOUSEWHEELPRESENT: return 1; case SM_CXSCREEN: - rect = get_primary_monitor_rect(); + rect = get_primary_monitor_rect( get_thread_dpi() ); return rect.right - rect.left; case SM_CYSCREEN: - rect = get_primary_monitor_rect(); + rect = get_primary_monitor_rect( get_thread_dpi() ); return rect.bottom - rect.top; case SM_XVIRTUALSCREEN: rect = get_virtual_screen_rect( get_thread_dpi() ); @@ -4528,6 +4528,9 @@ ULONG_PTR WINAPI NtUserCallOneParam( ULONG_PTR arg, ULONG code ) return get_sys_color( arg ); case NtUserRealizePalette: return realize_palette( UlongToHandle(arg) ); + case NtUserGetPrimaryMonitorRect: + *(RECT *)arg = get_primary_monitor_rect( 0 ); + return 1; case NtUserGetSysColorBrush: return HandleToUlong( get_sys_color_brush(arg) ); case NtUserGetSysColorPen: diff --git a/dlls/winex11.drv/Makefile.in b/dlls/winex11.drv/Makefile.in index 64df2075cc4..93a975d7f63 100644 --- a/dlls/winex11.drv/Makefile.in +++ b/dlls/winex11.drv/Makefile.in @@ -1,6 +1,6 @@ EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = winex11.drv -IMPORTS = uuid setupapi rpcrt4 user32 gdi32 advapi32 win32u +IMPORTS = uuid user32 gdi32 advapi32 win32u DELAYIMPORTS = comctl32 ole32 shell32 imm32 EXTRAINCL = $(X_CFLAGS) EXTRALIBS = $(X_LIBS) $(X_EXTRA_LIBS) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index bff14d3370c..ab5dcdac23f 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -19,52 +19,14 @@ */ #include "config.h" - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "rpc.h" -#include "winreg.h" -#include "cfgmgr32.h" -#include "initguid.h" -#include "devguid.h" -#include "devpkey.h" -#include "ntddvdeo.h" -#include "setupapi.h" -#define WIN32_NO_STATUS -#include "winternl.h" -#include "wine/debug.h" -#include "wine/unicode.h" #include "x11drv.h" +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(x11drv); -/* Wine specific properties */ -DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_RCMONITOR, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 3); - -static const WCHAR displayW[] = {'D','I','S','P','L','A','Y',0}; -static const WCHAR video_keyW[] = { - 'H','A','R','D','W','A','R','E','\\', - 'D','E','V','I','C','E','M','A','P','\\', - 'V','I','D','E','O',0}; - static struct x11drv_display_device_handler host_handler; struct x11drv_display_device_handler desktop_handler; -/* Cached screen information, protected by screen_section */ -static HKEY video_key; -static RECT primary_monitor_rect; -static FILETIME last_query_screen_time; -static CRITICAL_SECTION screen_section; -static CRITICAL_SECTION_DEBUG screen_critsect_debug = -{ - 0, 0, &screen_section, - {&screen_critsect_debug.ProcessLocksList, &screen_critsect_debug.ProcessLocksList}, - 0, 0, {(DWORD_PTR)(__FILE__ ": screen_section")} -}; -static CRITICAL_SECTION screen_section = {&screen_critsect_debug, -1, 0, 0, 0, 0}; - HANDLE get_display_device_init_mutex(void) { static const WCHAR init_mutexW[] = {'d','i','s','p','l','a','y','_','d','e','v','i','c','e','_','i','n','i','t',0}; @@ -80,61 +42,6 @@ void release_display_device_init_mutex(HANDLE mutex) CloseHandle(mutex); } -/* Update screen rectangle cache from SetupAPI if it's outdated, return FALSE on failure and TRUE on success */ -static BOOL update_screen_cache(void) -{ - RECT virtual_rect = {0}, primary_rect = {0}, monitor_rect; - SP_DEVINFO_DATA device_data = {sizeof(device_data)}; - HDEVINFO devinfo = INVALID_HANDLE_VALUE; - FILETIME filetime = {0}; - HANDLE mutex = NULL; - DWORD i = 0; - INT result; - DWORD type; - BOOL ret = FALSE; - - EnterCriticalSection(&screen_section); - if ((!video_key && RegOpenKeyW(HKEY_LOCAL_MACHINE, video_keyW, &video_key)) - || RegQueryInfoKeyW(video_key, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, &filetime)) - { - LeaveCriticalSection(&screen_section); - return FALSE; - } - result = CompareFileTime(&filetime, &last_query_screen_time); - LeaveCriticalSection(&screen_section); - if (result < 1) - return TRUE; - - mutex = get_display_device_init_mutex(); - - devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_MONITOR, displayW, NULL, DIGCF_PRESENT); - if (devinfo == INVALID_HANDLE_VALUE) - goto fail; - - while (SetupDiEnumDeviceInfo(devinfo, i++, &device_data)) - { - if (!SetupDiGetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCMONITOR, &type, - (BYTE *)&monitor_rect, sizeof(monitor_rect), NULL, 0)) - goto fail; - - UnionRect(&virtual_rect, &virtual_rect, &monitor_rect); - if (i == 1) - primary_rect = monitor_rect; - } - - EnterCriticalSection(&screen_section); - primary_monitor_rect = primary_rect; - last_query_screen_time = filetime; - LeaveCriticalSection(&screen_section); - ret = TRUE; -fail: - SetupDiDestroyDeviceInfoList(devinfo); - release_display_device_init_mutex(mutex); - if (!ret) - WARN("Update screen cache failed!\n"); - return ret; -} - POINT virtual_screen_to_root(INT x, INT y) { RECT virtual = get_virtual_screen_rect(); @@ -165,11 +72,7 @@ RECT get_virtual_screen_rect(void) RECT get_primary_monitor_rect(void) { RECT primary; - - update_screen_cache(); - EnterCriticalSection(&screen_section); - primary = primary_monitor_rect; - LeaveCriticalSection(&screen_section); + NtUserCallOneParam( (UINT_PTR)&primary, NtUserGetPrimaryMonitorRect ); return primary; } diff --git a/include/ntuser.h b/include/ntuser.h index 43c1880fc9b..b7e2e63dcb3 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -75,6 +75,7 @@ enum { NtUserGetClipCursor, NtUserGetCursorPos, + NtUserGetPrimaryMonitorRect, NtUserGetSysColor, NtUserGetSysColorBrush, NtUserGetSysColorPen,

1 0

Matteo Bruni : d3dx9/tests: Get rid of unnecessary ifs.
by Alexandre Julliard Feb. 18, 2022

Feb. 18, 2022

Module: wine Branch: master Commit: 6cf61d4239f3266624487bb8eb7ca9075bde332e URL: https://source.winehq.org/git/wine.git/?a=commit;h=6cf61d4239f3266624487bb8… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Feb 18 11:14:27 2022 +0100 d3dx9/tests: Get rid of unnecessary ifs. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/shader.c | 177 +++++++++++++++++++++---------------------- 1 file changed, 85 insertions(+), 92 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6cf61d4239f326662448…

1 0

Matteo Bruni : d3dx9/tests: Initialize an input variable.
by Alexandre Julliard Feb. 18, 2022

Feb. 18, 2022

Module: wine Branch: master Commit: e1463532beb330acd0f30fc556a7fe9e558d20f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e1463532beb330acd0f30fc5… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Feb 18 11:14:26 2022 +0100 d3dx9/tests: Initialize an input variable. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/math.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 2ed9131d788..501895665f7 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -3309,6 +3309,7 @@ static void test_D3DXFloat_Array(void) }; /* exception on NULL out or in parameter */ + single.f = 0.0f; out = D3DXFloat32To16Array(&half, &single.f, 0); ok(out == &half, "Got %p, expected %p.\n", out, &half);

1 0

Rémi Bernon : dinput: Only read effect state reports when exclusively acquired.
by Alexandre Julliard Feb. 18, 2022

Feb. 18, 2022

Module: wine Branch: master Commit: 6d7889ef5314ef73187a408a98db0d9113914ac4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d7889ef5314ef73187a408a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Feb 18 10:31:14 2022 +0100 dinput: Only read effect state reports when exclusively acquired. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 4987a9f9872..13c168bca89 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -1273,7 +1273,7 @@ static HRESULT hid_joystick_read( IDirectInputDevice8W *iface ) if (impl->base.hEvent && memcmp( &params.old_state, impl->base.device_state, format->dwDataSize )) SetEvent( impl->base.hEvent ); } - else if (report_buf[0] == impl->pid_effect_state.id) + else if (report_buf[0] == impl->pid_effect_state.id && is_exclusively_acquired( impl )) { status = HidP_GetUsageValue( HidP_Input, HID_USAGE_PAGE_PID, 0, PID_USAGE_EFFECT_BLOCK_INDEX, &index, impl->preparsed, report_buf, report_len );

1 0

Rémi Bernon : dinput: Also trace report buffers on immediate ReadFile success.
by Alexandre Julliard Feb. 18, 2022

Feb. 18, 2022

Module: wine Branch: master Commit: f6ef943b9cea7cb82d8c748690fd3354da81ccf7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6ef943b9cea7cb82d8c7486… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Feb 18 10:31:13 2022 +0100 dinput: Also trace report buffers on immediate ReadFile success. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 68db935c44a..4987a9f9872 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -1226,24 +1226,23 @@ static HRESULT hid_joystick_read( IDirectInputDevice8W *iface ) BOOL ret; ret = GetOverlappedResult( impl->device, &impl->read_ovl, &count, FALSE ); - if (ret && TRACE_ON(dinput)) + + EnterCriticalSection( &impl->base.crit ); + while (ret) { - TRACE( "read size %lu report:\n", count ); - for (i = 0; i < count;) + if (TRACE_ON(dinput)) { - char buffer[256], *buf = buffer; - buf += sprintf(buf, "%08lx ", i); - do + TRACE( "iface %p, size %lu, report:\n", iface, count ); + for (i = 0; i < count;) { - buf += sprintf(buf, " %02x", (BYTE)report_buf[i] ); - } while (++i % 16 && i < count); - TRACE("%s\n", buffer); + char buffer[256], *buf = buffer; + buf += sprintf(buf, "%08lx ", i); + do { buf += sprintf(buf, " %02x", (BYTE)report_buf[i] ); } + while (++i % 16 && i < count); + TRACE("%s\n", buffer); + } } - } - EnterCriticalSection( &impl->base.crit ); - while (ret) - { count = impl->usages_count; memset( impl->usages_buf, 0, count * sizeof(*impl->usages_buf) ); status = HidP_GetUsagesEx( HidP_Input, 0, impl->usages_buf, &count,

1 0

Zebediah Figura : wined3d: Treat NOOVERWRITE maps on a previously discarded buffer as if they were DISCARD maps.
by Alexandre Julliard Feb. 18, 2022

Feb. 18, 2022

Module: wine Branch: master Commit: 83fc1807f9f85ce6c1a2e05a1d772c2e28eafd27 URL: https://source.winehq.org/git/wine.git/?a=commit;h=83fc1807f9f85ce6c1a2e05a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Feb 17 23:01:39 2022 -0600 wined3d: Treat NOOVERWRITE maps on a previously discarded buffer as if they were DISCARD maps. For the purposes of wined3d_cs_map_upload_bo(). That is, if a buffer was just created or just discarded [e.g. with wined3d_device_evict_managed_resources()], and then subsequently mapped with WINED3D_MAP_NOOVERWRITE, treat it as if it had been mapped with WINED3D_MAP_DISCARD instead, thus allowing the adapter_alloc_upload_bo callback to allocate a new buffer from the client thread. This was the source of a bunch of stalls in Grand Theft Auto V, although it's hard to measure a difference in performance. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 3 +++ dlls/wined3d/cs.c | 13 ++++++++++++- dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 16308a098e3..63afa01bb2e 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1321,6 +1321,9 @@ static HRESULT wined3d_buffer_init(struct wined3d_buffer *buffer, struct wined3d } buffer->maps_size = 1; + if (buffer->locations & WINED3D_LOCATION_DISCARDED) + buffer->resource.client.addr.buffer_object = CLIENT_BO_DISCARDED; + if (data) wined3d_buffer_init_data(buffer, device, data); diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 4a3b805c0bd..7280739b8b2 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -67,6 +67,14 @@ struct wined3d_command_list struct wined3d_deferred_query_issue *queries; }; +static void discard_client_address(struct wined3d_resource *resource) +{ + struct wined3d_client_resource *client = &resource->client; + + client->addr.buffer_object = CLIENT_BO_DISCARDED; + client->addr.addr = NULL; +} + static void invalidate_client_address(struct wined3d_resource *resource) { struct wined3d_client_resource *client = &resource->client; @@ -2430,7 +2438,7 @@ void wined3d_cs_emit_unload_resource(struct wined3d_cs *cs, struct wined3d_resou { struct wined3d_cs_unload_resource *op; - invalidate_client_address(resource); + discard_client_address(resource); op = wined3d_device_context_require_space(&cs->c, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_UNLOAD_RESOURCE; @@ -3134,6 +3142,9 @@ static bool wined3d_cs_map_upload_bo(struct wined3d_device_context *context, str return NULL; } + if ((flags & WINED3D_MAP_NOOVERWRITE) && client->addr.buffer_object == CLIENT_BO_DISCARDED) + flags = (flags & ~WINED3D_MAP_NOOVERWRITE) | WINED3D_MAP_DISCARD; + if (flags & WINED3D_MAP_DISCARD) { if (!device->adapter->adapter_ops->adapter_alloc_bo(device, resource, sub_resource_idx, &addr)) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index eff42be3aa6..989fd33d2bf 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4276,6 +4276,8 @@ static inline ULONG wined3d_atomic_decrement_mutex_lock(volatile LONG *refcount) return count - 1; } +#define CLIENT_BO_DISCARDED ((struct wined3d_bo *)~(UINT_PTR)0) + struct wined3d_client_resource { /* The resource's persistently mapped address, which we may use to perform

1 0

Eric Pouech : traffic: Enable compilation with long types.
by Alexandre Julliard Feb. 18, 2022

Feb. 18, 2022

Module: wine Branch: master Commit: 56f0485da75978d0287ab774d6deeb031c63f1d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=56f0485da75978d0287ab774… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 18 09:17:34 2022 +0100 traffic: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/traffic/Makefile.in | 1 - dlls/traffic/traffic_main.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/traffic/Makefile.in b/dlls/traffic/Makefile.in index bef639c0a98..633355f93ec 100644 --- a/dlls/traffic/Makefile.in +++ b/dlls/traffic/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = traffic.dll EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/traffic/traffic_main.c b/dlls/traffic/traffic_main.c index 87646622346..c551d8bcc30 100644 --- a/dlls/traffic/traffic_main.c +++ b/dlls/traffic/traffic_main.c @@ -32,7 +32,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(traffic); ULONG WINAPI TcRegisterClient(ULONG version, HANDLE context, PTCI_CLIENT_FUNC_LIST list, PHANDLE buffer) { - FIXME("(%u %p %p %p) stub\n", version, context, list, buffer); + FIXME("(%lu %p %p %p) stub\n", version, context, list, buffer); if(buffer) *buffer = INVALID_HANDLE_VALUE; return ERROR_CALL_NOT_IMPLEMENTED; }

1 0

Eric Pouech : uiautomationcore: Enable compilation with long types.
by Alexandre Julliard Feb. 18, 2022

Feb. 18, 2022

Module: wine Branch: master Commit: 0077d80bd20d1f0ace36387ab0dcc480a3093b44 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0077d80bd20d1f0ace36387a… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 18 09:17:58 2022 +0100 uiautomationcore: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uiautomationcore/Makefile.in | 1 - dlls/uiautomationcore/uia_main.c | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/uiautomationcore/Makefile.in b/dlls/uiautomationcore/Makefile.in index 919314c16d9..f0973fdec4c 100644 --- a/dlls/uiautomationcore/Makefile.in +++ b/dlls/uiautomationcore/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = uiautomationcore.dll IMPORTLIB = uiautomationcore IMPORTS = uuid ole32 oleaut32 user32 diff --git a/dlls/uiautomationcore/uia_main.c b/dlls/uiautomationcore/uia_main.c index f1cf06ed4f5..c250d82a1e6 100644 --- a/dlls/uiautomationcore/uia_main.c +++ b/dlls/uiautomationcore/uia_main.c @@ -52,7 +52,7 @@ static ULONG WINAPI uia_object_wrapper_AddRef(IUnknown *iface) struct uia_object_wrapper *wrapper = impl_uia_object_wrapper_from_IUnknown(iface); ULONG refcount = InterlockedIncrement(&wrapper->refcount); - TRACE("%p, refcount %d\n", iface, refcount); + TRACE("%p, refcount %ld\n", iface, refcount); return refcount; } @@ -62,7 +62,7 @@ static ULONG WINAPI uia_object_wrapper_Release(IUnknown *iface) struct uia_object_wrapper *wrapper = impl_uia_object_wrapper_from_IUnknown(iface); ULONG refcount = InterlockedDecrement(&wrapper->refcount); - TRACE("%p, refcount %d\n", iface, refcount); + TRACE("%p, refcount %ld\n", iface, refcount); if (!refcount) { IUnknown_Release(wrapper->marshaler); @@ -178,7 +178,7 @@ ULONG WINAPI hwnd_host_provider_AddRef(IRawElementProviderSimple *iface) struct hwnd_host_provider *host_prov = impl_from_hwnd_host_provider(iface); ULONG refcount = InterlockedIncrement(&host_prov->refcount); - TRACE("%p, refcount %d\n", iface, refcount); + TRACE("%p, refcount %ld\n", iface, refcount); return refcount; } @@ -188,7 +188,7 @@ ULONG WINAPI hwnd_host_provider_Release(IRawElementProviderSimple *iface) struct hwnd_host_provider *host_prov = impl_from_hwnd_host_provider(iface); ULONG refcount = InterlockedDecrement(&host_prov->refcount); - TRACE("%p, refcount %d\n", iface, refcount); + TRACE("%p, refcount %ld\n", iface, refcount); if (!refcount) heap_free(host_prov); @@ -311,7 +311,7 @@ int WINAPI UiaLookupId(enum AutomationIdentifierType type, const GUID *guid) LRESULT WINAPI UiaReturnRawElementProvider(HWND hwnd, WPARAM wParam, LPARAM lParam, IRawElementProviderSimple *elprov) { - FIXME("(%p, %lx, %lx, %p) stub!\n", hwnd, wParam, lParam, elprov); + FIXME("(%p, %Ix, %Ix, %p) stub!\n", hwnd, wParam, lParam, elprov); return 0; }

1 0

Eric Pouech : uiribbon: Enable compilation with long types.
by Alexandre Julliard Feb. 18, 2022

Feb. 18, 2022

Module: wine Branch: master Commit: 189324805c383faaf57918983983cea27067f0e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=189324805c383faaf5791898… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 18 09:18:04 2022 +0100 uiribbon: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uiribbon/Makefile.in | 1 - dlls/uiribbon/uiribbon.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/uiribbon/Makefile.in b/dlls/uiribbon/Makefile.in index 19753ea19ed..0b9724d87a9 100644 --- a/dlls/uiribbon/Makefile.in +++ b/dlls/uiribbon/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = uiribbon.dll IMPORTS = uuid ole32 diff --git a/dlls/uiribbon/uiribbon.c b/dlls/uiribbon/uiribbon.c index 18cb4870f9a..38fd60cd533 100644 --- a/dlls/uiribbon/uiribbon.c +++ b/dlls/uiribbon/uiribbon.c @@ -56,7 +56,7 @@ static ULONG WINAPI UIRibbonFrameworkImpl_AddRef(IUIFramework *iface) UIRibbonFrameworkImpl *This = impl_from_IUIFramework(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p/%p)->(): new ref %d\n", iface, This, ref); + TRACE("(%p/%p)->(): new ref %ld\n", iface, This, ref); return ref; } @@ -66,7 +66,7 @@ static ULONG WINAPI UIRibbonFrameworkImpl_Release(IUIFramework *iface) UIRibbonFrameworkImpl *This = impl_from_IUIFramework(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p/%p)->(): new ref %d\n", iface, This, ref); + TRACE("(%p/%p)->(): new ref %ld\n", iface, This, ref); if (!ref) HeapFree(GetProcessHeap(), 0, This);

1 0

Alexandre Julliard : apisetschema: Add dll.
by Alexandre Julliard Feb. 18, 2022

Feb. 18, 2022

Module: wine Branch: master Commit: d40ecdd248b9d26aea1165f54b9b1a0b9d832644 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d40ecdd248b9d26aea1165f5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 18 10:14:17 2022 +0100 apisetschema: Add dll. Apiset data generated from the existing api-ms-* modules. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 + configure.ac | 1 + dlls/apisetschema/Makefile.in | 3 + dlls/apisetschema/apisetschema.spec | 225 ++++++++++++++++++++++++++++++++++++ 4 files changed, 231 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d40ecdd248b9d26aea11…

1 0