wine-commits May 2022

wine-commits@winehq.org

2 participants
907 discussions

Zhiyi Zhang : dxgi: Implement dxgi_adapter_QueryVideoMemoryInfo() with D3DKMTQueryVideoMemoryInfo().
by Alexandre Julliard 20 May '22

20 May '22

Module: wine Branch: master Commit: 0f7c7cd7a089d70c4be7bdd6b57ca200dbc93752 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f7c7cd7a089d70c4be7bdd6… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed May 18 14:49:14 2022 +0800 dxgi: Implement dxgi_adapter_QueryVideoMemoryInfo() with D3DKMTQueryVideoMemoryInfo(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/adapter.c | 49 +++++++++++++++------------------------ dlls/wined3d/directx.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 17 ++++++++++++++ 4 files changed, 95 insertions(+), 31 deletions(-) diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index 8962c082c17..20c017eba08 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -21,6 +21,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(dxgi); +static void dxgi_video_memory_info_from_wined3d(DXGI_QUERY_VIDEO_MEMORY_INFO *info, + const struct wined3d_video_memory_info *wined3d_info) +{ + info->Budget = wined3d_info->budget; + info->CurrentUsage = wined3d_info->current_usage; + info->CurrentReservation = wined3d_info->current_reservation; + info->AvailableForReservation = wined3d_info->available_reservation; +} + static inline struct dxgi_adapter *impl_from_IWineDXGIAdapter(IWineDXGIAdapter *iface) { return CONTAINING_RECORD(iface, struct dxgi_adapter, IWineDXGIAdapter_iface); @@ -292,44 +301,22 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_QueryVideoMemoryInfo(IWineDXGIAdap UINT node_index, DXGI_MEMORY_SEGMENT_GROUP segment_group, DXGI_QUERY_VIDEO_MEMORY_INFO *info) { struct dxgi_adapter *adapter = impl_from_IWineDXGIAdapter(iface); - struct wined3d_adapter_identifier adapter_id; - static unsigned int once; + struct wined3d_video_memory_info wined3d_info; HRESULT hr; TRACE("iface %p, node_index %u, segment_group %#x, info %p.\n", iface, node_index, segment_group, info); - if (!once++) - FIXME("Returning fake video memory info.\n"); - - if (node_index) - FIXME("Ignoring node index %u.\n", node_index); - - adapter_id.driver_size = 0; - adapter_id.description_size = 0; - - if (FAILED(hr = wined3d_adapter_get_identifier(adapter->wined3d_adapter, 0, &adapter_id))) - return hr; - - switch (segment_group) + if (SUCCEEDED(hr = wined3d_adapter_get_video_memory_info(adapter->wined3d_adapter, node_index, + (enum wined3d_memory_segment_group)segment_group, &wined3d_info))) { - case DXGI_MEMORY_SEGMENT_GROUP_LOCAL: - info->Budget = adapter_id.video_memory; - info->CurrentUsage = 0; - info->AvailableForReservation = adapter_id.video_memory / 2; - info->CurrentReservation = 0; - break; - case DXGI_MEMORY_SEGMENT_GROUP_NON_LOCAL: - memset(info, 0, sizeof(*info)); - break; - default: - WARN("Invalid memory segment group %#x.\n", segment_group); - return E_INVALIDARG; - } + dxgi_video_memory_info_from_wined3d(info, &wined3d_info); - TRACE("Budget 0x%s, usage 0x%s, available for reservation 0x%s, reservation 0x%s.\n", - wine_dbgstr_longlong(info->Budget), wine_dbgstr_longlong(info->CurrentUsage), - wine_dbgstr_longlong(info->AvailableForReservation), wine_dbgstr_longlong(info->CurrentReservation)); + TRACE("Budget 0x%s, usage 0x%s, available for reservation 0x%s, reservation 0x%s.\n", + wine_dbgstr_longlong(info->Budget), wine_dbgstr_longlong(info->CurrentUsage), + wine_dbgstr_longlong(info->AvailableForReservation), + wine_dbgstr_longlong(info->CurrentReservation)); + } return hr; } diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 5b65e3b49f9..f8a44be0b3e 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -987,6 +987,65 @@ unsigned int CDECL wined3d_adapter_get_output_count(const struct wined3d_adapter return adapter->output_count; } +HRESULT CDECL wined3d_adapter_get_video_memory_info(const struct wined3d_adapter *adapter, + unsigned int node_idx, enum wined3d_memory_segment_group group, + struct wined3d_video_memory_info *info) +{ + static unsigned int once; + D3DKMT_QUERYVIDEOMEMORYINFO query_memory_info; + struct wined3d_adapter_identifier adapter_id; + NTSTATUS status; + HRESULT hr; + + TRACE("adapter %p, node_idx %u, group %d, info %p.\n", adapter, node_idx, group, info); + + if (group > WINED3D_MEMORY_SEGMENT_GROUP_NON_LOCAL) + { + WARN("Invalid memory segment group %#x.\n", group); + return E_INVALIDARG; + } + + query_memory_info.hProcess = NULL; + query_memory_info.hAdapter = adapter->kmt_adapter; + query_memory_info.PhysicalAdapterIndex = node_idx; + query_memory_info.MemorySegmentGroup = (D3DKMT_MEMORY_SEGMENT_GROUP)group; + status = D3DKMTQueryVideoMemoryInfo(&query_memory_info); + if (status == STATUS_SUCCESS) + { + info->budget = query_memory_info.Budget; + info->current_usage = query_memory_info.CurrentUsage; + info->current_reservation = query_memory_info.CurrentReservation; + info->available_reservation = query_memory_info.AvailableForReservation; + return WINED3D_OK; + } + + /* D3DKMTQueryVideoMemoryInfo() failed, fallback to fake memory info */ + if (!once++) + FIXME("Returning fake video memory info.\n"); + + if (node_idx) + FIXME("Ignoring node index %u.\n", node_idx); + + adapter_id.driver_size = 0; + adapter_id.description_size = 0; + if (FAILED(hr = wined3d_adapter_get_identifier(adapter, 0, &adapter_id))) + return hr; + + switch (group) + { + case WINED3D_MEMORY_SEGMENT_GROUP_LOCAL: + info->budget = adapter_id.video_memory; + info->current_usage = 0; + info->available_reservation = adapter_id.video_memory / 2; + info->current_reservation = 0; + break; + case WINED3D_MEMORY_SEGMENT_GROUP_NON_LOCAL: + memset(info, 0, sizeof(*info)); + break; + } + return WINED3D_OK; +} + HRESULT CDECL wined3d_register_software_device(struct wined3d *wined3d, void *init_function) { FIXME("wined3d %p, init_function %p stub!\n", wined3d, init_function); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 1b1c82f90bb..845ca0fb170 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -21,6 +21,7 @@ @ cdecl wined3d_adapter_get_identifier(ptr long ptr) @ cdecl wined3d_adapter_get_output(ptr long) @ cdecl wined3d_adapter_get_output_count(ptr) +@ cdecl wined3d_adapter_get_video_memory_info(ptr long long ptr) @ cdecl wined3d_blend_state_create(ptr ptr ptr ptr ptr) @ cdecl wined3d_blend_state_decref(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index ee241ab3b1d..2b7a626f751 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -876,6 +876,12 @@ enum wined3d_pipeline WINED3D_PIPELINE_COUNT, }; +enum wined3d_memory_segment_group +{ + WINED3D_MEMORY_SEGMENT_GROUP_LOCAL = 0, + WINED3D_MEMORY_SEGMENT_GROUP_NON_LOCAL = 1, +}; + #define WINED3DCOLORWRITEENABLE_RED (1u << 0) #define WINED3DCOLORWRITEENABLE_GREEN (1u << 1) #define WINED3DCOLORWRITEENABLE_BLUE (1u << 2) @@ -1765,6 +1771,14 @@ struct wined3d_adapter_identifier SIZE_T shared_system_memory; }; +struct wined3d_video_memory_info +{ + UINT64 budget; + UINT64 current_usage; + UINT64 current_reservation; + UINT64 available_reservation; +}; + struct wined3d_swapchain_desc { struct wined3d_output *output; @@ -2347,6 +2361,9 @@ HRESULT __cdecl wined3d_adapter_get_identifier(const struct wined3d_adapter *ada struct wined3d_output * __cdecl wined3d_adapter_get_output(const struct wined3d_adapter *adapter, unsigned int idx); unsigned int __cdecl wined3d_adapter_get_output_count(const struct wined3d_adapter *adapter); +HRESULT __cdecl wined3d_adapter_get_video_memory_info(const struct wined3d_adapter *adapter, + unsigned int node_idx, enum wined3d_memory_segment_group group, + struct wined3d_video_memory_info *info); HRESULT __cdecl wined3d_buffer_create(struct wined3d_device *device, const struct wined3d_buffer_desc *desc, const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops,

1 0

Zhiyi Zhang : wined3d: Move kernel mode adapter handle from wined3d_output to wined3d_adapter.
by Alexandre Julliard 20 May '22

20 May '22

Module: wine Branch: master Commit: e85875d59d0c67c8728a988be7fe238aad6a9b72 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e85875d59d0c67c8728a988b… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed May 18 14:49:08 2022 +0800 wined3d: Move kernel mode adapter handle from wined3d_output to wined3d_adapter. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 24 +++++++++++++++--------- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c9a62c6997a..5b65e3b49f9 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -103,14 +103,11 @@ HRESULT CDECL wined3d_output_take_ownership(const struct wined3d_output *output, static void wined3d_output_cleanup(const struct wined3d_output *output) { D3DKMT_DESTROYDEVICE destroy_device_desc; - D3DKMT_CLOSEADAPTER close_adapter_desc; TRACE("output %p.\n", output); destroy_device_desc.hDevice = output->kmt_device; D3DKMTDestroyDevice(&destroy_device_desc); - close_adapter_desc.hAdapter = output->kmt_adapter; - D3DKMTCloseAdapter(&close_adapter_desc); } static HRESULT wined3d_output_init(struct wined3d_output *output, unsigned int ordinal, @@ -125,20 +122,17 @@ static HRESULT wined3d_output_init(struct wined3d_output *output, unsigned int o lstrcpyW(open_adapter_desc.DeviceName, device_name); if (D3DKMTOpenAdapterFromGdiDisplayName(&open_adapter_desc)) return E_INVALIDARG; + close_adapter_desc.hAdapter = open_adapter_desc.hAdapter; + D3DKMTCloseAdapter(&close_adapter_desc); - create_device_desc.u.hAdapter = open_adapter_desc.hAdapter; + create_device_desc.u.hAdapter = adapter->kmt_adapter; if (D3DKMTCreateDevice(&create_device_desc)) - { - close_adapter_desc.hAdapter = open_adapter_desc.hAdapter; - D3DKMTCloseAdapter(&close_adapter_desc); return E_FAIL; - } output->ordinal = ordinal; lstrcpyW(output->device_name, device_name); output->adapter = adapter; output->screen_format = WINED3DFMT_UNKNOWN; - output->kmt_adapter = open_adapter_desc.hAdapter; output->kmt_device = create_device_desc.hDevice; output->vidpn_source_id = open_adapter_desc.VidPnSourceId; @@ -166,12 +160,15 @@ ssize_t adapter_adjust_mapped_memory(struct wined3d_adapter *adapter, ssize_t si void wined3d_adapter_cleanup(struct wined3d_adapter *adapter) { + D3DKMT_CLOSEADAPTER close_adapter_desc; unsigned int output_idx; for (output_idx = 0; output_idx < adapter->output_count; ++output_idx) wined3d_output_cleanup(&adapter->outputs[output_idx]); heap_free(adapter->outputs); heap_free(adapter->formats); + close_adapter_desc.hAdapter = adapter->kmt_adapter; + D3DKMTCloseAdapter(&close_adapter_desc); } ULONG CDECL wined3d_incref(struct wined3d *wined3d) @@ -3222,7 +3219,9 @@ static BOOL wined3d_adapter_create_output(struct wined3d_adapter *adapter, const BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, unsigned int ordinal, const LUID *luid, const struct wined3d_adapter_ops *adapter_ops) { + D3DKMT_OPENADAPTERFROMLUID open_adapter_desc; unsigned int output_idx = 0, primary_idx = 0; + D3DKMT_CLOSEADAPTER close_adapter_desc; DISPLAY_DEVICEW display_device; BOOL ret = FALSE; @@ -3245,6 +3244,11 @@ BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, unsigned int ordinal, } TRACE("adapter %p LUID %08x:%08x.\n", adapter, adapter->luid.HighPart, adapter->luid.LowPart); + open_adapter_desc.AdapterLuid = adapter->luid; + if (D3DKMTOpenAdapterFromLuid(&open_adapter_desc)) + return FALSE; + adapter->kmt_adapter = open_adapter_desc.hAdapter; + display_device.cb = sizeof(display_device); while (EnumDisplayDevicesW(NULL, output_idx++, &display_device, 0)) { @@ -3282,6 +3286,8 @@ done: for (output_idx = 0; output_idx < adapter->output_count; ++output_idx) wined3d_output_cleanup(&adapter->outputs[output_idx]); heap_free(adapter->outputs); + close_adapter_desc.hAdapter = adapter->kmt_adapter; + D3DKMTCloseAdapter(&close_adapter_desc); } return ret; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1d8bb40cec4..00d2cfea8e4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3498,7 +3498,6 @@ struct wined3d_output struct wined3d_adapter *adapter; enum wined3d_format_id screen_format; - D3DKMT_HANDLE kmt_adapter; D3DKMT_HANDLE kmt_device; D3DDDI_VIDEO_PRESENT_SOURCE_ID vidpn_source_id; }; @@ -3521,6 +3520,7 @@ struct wined3d_adapter struct wined3d_driver_info driver_info; struct wined3d_output *outputs; unsigned int output_count; + D3DKMT_HANDLE kmt_adapter; UINT64 vram_bytes_used; GUID driver_uuid; GUID device_uuid;

1 0

Chip Davis : ntdll: Implement idle time query for Mac OS.
by Alexandre Julliard 19 May '22

19 May '22

Module: wine Branch: master Commit: f3d9f00850926b01b0f28e40d3fa0b48028eed4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3d9f00850926b01b0f28e40… Author: Chip Davis <cdavis5x(a)gmail.com> Date: Sun May 8 16:41:49 2022 -0500 ntdll: Implement idle time query for Mac OS. Signed-off-by: Chip Davis <cdavis5x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/system.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 4d5fc282e45..ee91441794e 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -1848,6 +1848,22 @@ static void get_performance_info( SYSTEM_PERFORMANCE_INFORMATION *info ) info->IdleTime.QuadPart = (ULONGLONG)ptimes[CP_IDLE] * 10000000 / clockrate.stathz; } } +#elif defined(__APPLE__) + { + host_name_port_t host = mach_host_self(); + struct host_cpu_load_info load_info; + mach_msg_type_number_t count; + + count = HOST_CPU_LOAD_INFO_COUNT; + if (host_statistics(host, HOST_CPU_LOAD_INFO, (host_info_t)&load_info, &count) == KERN_SUCCESS) + { + /* Believe it or not, based on my reading of XNU source, this is + * already in the units we want (100 ns). + */ + info->IdleTime.QuadPart = load_info.cpu_ticks[CPU_STATE_IDLE]; + } + mach_port_deallocate(mach_task_self(), host); + } #else { static ULONGLONG idle;

1 0

Jacek Caban : winex11: Implement DesktopWindowProc driver entry point.
by Alexandre Julliard 19 May '22

19 May '22

Module: wine Branch: master Commit: 6a4ff4de66e2cd344396d71f0b063adab990e228 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a4ff4de66e2cd344396d71f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 19 14:48:23 2022 +0200 winex11: Implement DesktopWindowProc driver entry point. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/init.c | 1 + dlls/winex11.drv/window.c | 12 +++++------- dlls/winex11.drv/x11drv.h | 1 + 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index fc190805401..3bdc05999f1 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -408,6 +408,7 @@ static const struct user_driver_funcs x11drv_funcs = .pUpdateDisplayDevices = X11DRV_UpdateDisplayDevices, .pCreateDesktopWindow = X11DRV_CreateDesktopWindow, .pCreateWindow = X11DRV_CreateWindow, + .pDesktopWindowProc = X11DRV_DesktopWindowProc, .pDestroyWindow = X11DRV_DestroyWindow, .pFlashWindowEx = X11DRV_FlashWindowEx, .pGetDC = X11DRV_GetDC, diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 50a848cae86..773fa81f5f3 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1860,13 +1860,14 @@ BOOL X11DRV_CreateDesktopWindow( HWND hwnd ) } -static WNDPROC desktop_orig_wndproc; - #define WM_WINE_NOTIFY_ACTIVITY WM_USER #define WM_WINE_DELETE_TAB (WM_USER + 1) #define WM_WINE_ADD_TAB (WM_USER + 2) -static LRESULT CALLBACK desktop_wndproc_wrapper( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) +/********************************************************************** + * DesktopWindowProc (X11DRV.@) + */ +LRESULT X11DRV_DesktopWindowProc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) { switch (msg) { @@ -1891,7 +1892,7 @@ static LRESULT CALLBACK desktop_wndproc_wrapper( HWND hwnd, UINT msg, WPARAM wp, send_notify_message( (HWND)wp, WM_X11DRV_ADD_TAB, 0, 0 ); break; } - return desktop_orig_wndproc( hwnd, msg, wp, lp ); + return NtUserMessageCall( hwnd, msg, wp, lp, 0, NtUserDefWindowProc, FALSE ); } /********************************************************************** @@ -1904,9 +1905,6 @@ BOOL X11DRV_CreateWindow( HWND hwnd ) struct x11drv_thread_data *data = x11drv_init_thread_data(); XSetWindowAttributes attr; - desktop_orig_wndproc = (WNDPROC)NtUserSetWindowLongPtr( hwnd, GWLP_WNDPROC, - (LONG_PTR)desktop_wndproc_wrapper, FALSE ); - /* create the cursor clipping window */ attr.override_redirect = TRUE; attr.event_mask = StructureNotifyMask | FocusChangeMask; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 9a775215321..613dc0e05fe 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -218,6 +218,7 @@ extern void X11DRV_UpdateDisplayDevices( const struct gdi_device_manager *device BOOL force, void *param ) DECLSPEC_HIDDEN; extern BOOL X11DRV_CreateDesktopWindow( HWND hwnd ) DECLSPEC_HIDDEN; extern BOOL X11DRV_CreateWindow( HWND hwnd ) DECLSPEC_HIDDEN; +extern LRESULT X11DRV_DesktopWindowProc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) DECLSPEC_HIDDEN; extern void X11DRV_DestroyWindow( HWND hwnd ) DECLSPEC_HIDDEN; extern void X11DRV_FlashWindowEx( PFLASHWINFO pfinfo ) DECLSPEC_HIDDEN; extern void X11DRV_GetDC( HDC hdc, HWND hwnd, HWND top, const RECT *win_rect,

1 0

Jacek Caban : win32u: Introduce DesktopWindowProc driver entry point.
by Alexandre Julliard 19 May '22

19 May '22

Module: wine Branch: master Commit: dfeb2d2474292b65795f431e2864b7364abcfdfe URL: https://source.winehq.org/git/wine.git/?a=commit;h=dfeb2d2474292b65795f431e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 19 14:27:36 2022 +0200 win32u: Introduce DesktopWindowProc driver entry point. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/defwnd.c | 4 ++++ dlls/win32u/driver.c | 7 +++++++ include/wine/gdi_driver.h | 3 ++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/win32u/defwnd.c b/dlls/win32u/defwnd.c index 444abd1657f..9b4edc90eaa 100644 --- a/dlls/win32u/defwnd.c +++ b/dlls/win32u/defwnd.c @@ -417,6 +417,10 @@ LRESULT desktop_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) } case WM_NCCALCSIZE: return 0; + + default: + if (msg >= WM_USER && hwnd == get_desktop_window()) + return user_driver->pDesktopWindowProc( hwnd, msg, wparam, lparam ); } return default_window_proc( hwnd, msg, wparam, lparam, FALSE ); diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c index 9185069208a..4dac0760464 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c @@ -721,6 +721,11 @@ static SHORT nulldrv_VkKeyScanEx( WCHAR ch, HKL layout ) return -256; /* use default implementation */ } +static LRESULT nulldrv_DesktopWindowProc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) +{ + return default_window_proc( hwnd, msg, wparam, lparam, FALSE ); +} + static void nulldrv_DestroyCursorIcon( HCURSOR cursor ) { } @@ -1175,6 +1180,7 @@ static const struct user_driver_funcs lazy_load_driver = /* windowing functions */ loaderdrv_CreateDesktopWindow, loaderdrv_CreateWindow, + nulldrv_DesktopWindowProc, nulldrv_DestroyWindow, loaderdrv_FlashWindowEx, loaderdrv_GetDC, @@ -1247,6 +1253,7 @@ void CDECL __wine_set_user_driver( const struct user_driver_funcs *funcs, UINT v SET_USER_FUNC(UpdateDisplayDevices); SET_USER_FUNC(CreateDesktopWindow); SET_USER_FUNC(CreateWindow); + SET_USER_FUNC(DesktopWindowProc); SET_USER_FUNC(DestroyWindow); SET_USER_FUNC(FlashWindowEx); SET_USER_FUNC(GetDC); diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index 82bac557c2a..21fff4d4aa2 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -168,7 +168,7 @@ struct gdi_dc_funcs }; /* increment this when you change the DC function table */ -#define WINE_GDI_DRIVER_VERSION 78 +#define WINE_GDI_DRIVER_VERSION 79 #define GDI_PRIORITY_NULL_DRV 0 /* null driver */ #define GDI_PRIORITY_FONT_DRV 100 /* any font driver */ @@ -299,6 +299,7 @@ struct user_driver_funcs /* windowing functions */ BOOL (*pCreateDesktopWindow)(HWND); BOOL (*pCreateWindow)(HWND); + LRESULT (*pDesktopWindowProc)(HWND,UINT,WPARAM,LPARAM); void (*pDestroyWindow)(HWND); void (*pFlashWindowEx)(FLASHWINFO*); void (*pGetDC)(HDC,HWND,HWND,const RECT *,const RECT *,DWORD);

1 0

Jacek Caban : win32u: Move desktop window proc implementation from user32.
by Alexandre Julliard 19 May '22

19 May '22

Module: wine Branch: master Commit: 336f033273b6b70e49e8736d1059704947003272 URL: https://source.winehq.org/git/wine.git/?a=commit;h=336f033273b6b70e49e8736d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 19 14:23:17 2022 +0200 win32u: Move desktop window proc implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/desktop.c | 27 +++++---------------------- dlls/win32u/defwnd.c | 37 +++++++++++++++++++++++++++++++++++++ dlls/win32u/message.c | 2 ++ dlls/win32u/win32u_private.h | 1 + include/ntuser.h | 1 + 5 files changed, 46 insertions(+), 22 deletions(-) diff --git a/dlls/user32/desktop.c b/dlls/user32/desktop.c index 9d1484fdcbb..f2905b0efac 100644 --- a/dlls/user32/desktop.c +++ b/dlls/user32/desktop.c @@ -95,30 +95,13 @@ LRESULT WINAPI DesktopWndProc( HWND hwnd, UINT message, WPARAM wParam, LPARAM lP switch (message) { case WM_NCCREATE: - { - CREATESTRUCTW *cs = (CREATESTRUCTW *)lParam; - const GUID *guid = cs->lpCreateParams; - - if (guid) - { - ATOM atom; - WCHAR buffer[37]; - - if (NtUserGetAncestor( hwnd, GA_PARENT )) return FALSE; /* refuse to create non-desktop window */ - - swprintf( buffer, ARRAY_SIZE(buffer), L"%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x", - guid->Data1, guid->Data2, guid->Data3, - guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], - guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7] ); - atom = GlobalAddAtomW( buffer ); - SetPropW( hwnd, L"__wine_display_device_guid", ULongToHandle( atom ) ); - } - return TRUE; - } case WM_NCCALCSIZE: - return 0; + return NtUserMessageCall( hwnd, message, wParam, lParam, 0, NtUserDesktopWindowProc, FALSE ); + default: - return DefWindowProcW( hwnd, message, wParam, lParam ); + if (message < WM_USER) + return DefWindowProcW( hwnd, message, wParam, lParam ); + return NtUserMessageCall( hwnd, message, wParam, lParam, 0, NtUserDesktopWindowProc, FALSE ); } } diff --git a/dlls/win32u/defwnd.c b/dlls/win32u/defwnd.c index 27120a96d98..444abd1657f 100644 --- a/dlls/win32u/defwnd.c +++ b/dlls/win32u/defwnd.c @@ -384,3 +384,40 @@ LRESULT default_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, return result; } + +LRESULT desktop_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) +{ + static const WCHAR wine_display_device_guidW[] = + {'_','_','w','i','n','e','_','d','i','s','p','l','a','y','_','d','e','v','i','c','e', + '_','g','u','i','d',0}; + + switch (msg) + { + case WM_NCCREATE: + { + CREATESTRUCTW *cs = (CREATESTRUCTW *)lparam; + const GUID *guid = cs->lpCreateParams; + + if (guid) + { + ATOM atom = 0; + char buffer[37]; + WCHAR bufferW[37]; + + if (NtUserGetAncestor( hwnd, GA_PARENT )) return FALSE; /* refuse to create non-desktop window */ + + sprintf( buffer, "%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x", + (unsigned int)guid->Data1, guid->Data2, guid->Data3, + guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], + guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7] ); + NtAddAtom( bufferW, asciiz_to_unicode( bufferW, buffer ) - sizeof(WCHAR), &atom ); + NtUserSetProp( hwnd, wine_display_device_guidW, ULongToHandle( atom ) ); + } + return TRUE; + } + case WM_NCCALCSIZE: + return 0; + } + + return default_window_proc( hwnd, msg, wparam, lparam, FALSE ); +} diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index e67f9adcbe7..6bb9aa455f5 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -2890,6 +2890,8 @@ LRESULT WINAPI NtUserMessageCall( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpa { switch (type) { + case NtUserDesktopWindowProc: + return desktop_window_proc( hwnd, msg, wparam, lparam ); case NtUserDefWindowProc: return default_window_proc( hwnd, msg, wparam, lparam, ansi ); case NtUserCallWindowProc: diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index c7340018830..2d69cbef78e 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -360,6 +360,7 @@ extern void register_window_surface( struct window_surface *old, /* defwnd.c */ extern LRESULT default_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, BOOL ansi ) DECLSPEC_HIDDEN; +extern LRESULT desktop_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) DECLSPEC_HIDDEN; extern void fill_rect( HDC dc, const RECT *rect, HBRUSH hbrush ) DECLSPEC_HIDDEN; /* hook.c */ diff --git a/include/ntuser.h b/include/ntuser.h index c7490eaad0a..29de027a334 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -181,6 +181,7 @@ struct render_synthesized_format_params /* NtUserMessageCall codes */ enum { + NtUserDesktopWindowProc = 0x029d, NtUserDefWindowProc = 0x029e, NtUserCallWindowProc = 0x02ab, NtUserSendMessage = 0x02b1,

1 0

Jacek Caban : win32u: Export NtUserGetWindowPlacement.
by Alexandre Julliard 19 May '22

19 May '22

Module: wine Branch: master Commit: a15df248e5fb52765cdad856167e49e28ad4fbc5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a15df248e5fb52765cdad856… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 19 13:52:43 2022 +0200 win32u: Export NtUserGetWindowPlacement. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/user32.spec | 2 +- dlls/user32/winpos.c | 14 +------------- dlls/win32u/gdiobj.c | 1 + dlls/win32u/sysparams.c | 2 +- dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 2 +- dlls/win32u/window.c | 11 +++++------ dlls/win32u/wrappers.c | 6 ++++++ include/ntuser.h | 8 +------- 9 files changed, 18 insertions(+), 30 deletions(-) diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index d251b80fb70..c153b6dbfe3 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -412,7 +412,7 @@ @ stdcall GetWindowModuleFileName(long ptr long) GetWindowModuleFileNameA @ stdcall GetWindowModuleFileNameA(long ptr long) @ stdcall GetWindowModuleFileNameW(long ptr long) -@ stdcall GetWindowPlacement(long ptr) +@ stdcall GetWindowPlacement(long ptr) NtUserGetWindowPlacement @ stdcall GetWindowRect(long ptr) @ stdcall GetWindowRgn(long long) @ stdcall GetWindowRgnBox(long ptr) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index e4eee036f07..03fe731ee0e 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -225,7 +225,7 @@ UINT WINAPI GetInternalWindowPos( HWND hwnd, LPRECT rectWnd, WINDOWPLACEMENT wndpl; wndpl.length = sizeof(wndpl); - if (GetWindowPlacement( hwnd, &wndpl )) + if (NtUserGetWindowPlacement( hwnd, &wndpl )) { if (rectWnd) *rectWnd = wndpl.rcNormalPosition; if (ptIcon) *ptIcon = wndpl.ptMinPosition; @@ -235,18 +235,6 @@ UINT WINAPI GetInternalWindowPos( HWND hwnd, LPRECT rectWnd, } -/*********************************************************************** - * GetWindowPlacement (USER32.@) - * - * Win95: - * Fails if wndpl->length of Win95 (!) apps is invalid. - */ -BOOL WINAPI GetWindowPlacement( HWND hwnd, WINDOWPLACEMENT *wndpl ) -{ - return NtUserGetWindowPlacement( hwnd, wndpl ); -} - - /*********************************************************************** * AnimateWindow (USER32.@) * Shows/Hides a window with an animation diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index 053ca5aa8f1..edb21456d8d 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -1184,6 +1184,7 @@ static struct unix_funcs unix_funcs = NtUserGetUpdateRect, NtUserGetUpdateRgn, NtUserGetUpdatedClipboardFormats, + NtUserGetWindowPlacement, NtUserHideCaret, NtUserIsClipboardFormatAvailable, NtUserMapVirtualKeyEx, diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index f9491313384..8a99e4095f9 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -2163,7 +2163,7 @@ HMONITOR monitor_from_window( HWND hwnd, DWORD flags, UINT dpi ) TRACE( "(%p, 0x%08x)\n", hwnd, flags ); wp.length = sizeof(wp); - if (is_iconic( hwnd ) && get_window_placement( hwnd, &wp )) + if (is_iconic( hwnd ) && NtUserGetWindowPlacement( hwnd, &wp )) return monitor_from_rect( &wp.rcNormalPosition, flags, dpi ); if (get_window_rect( hwnd, &rect, dpi )) diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 7ef2a4b2c7e..48c10fd45d3 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -1014,7 +1014,7 @@ @ stub NtUserGetWindowFeedbackSetting @ stub NtUserGetWindowGroupId @ stub NtUserGetWindowMinimizeRect -@ stub NtUserGetWindowPlacement +@ stdcall NtUserGetWindowPlacement(long ptr) @ stub NtUserGetWindowProcessHandle @ stdcall -syscall NtUserGetWindowRgnEx(long long long) @ stub NtUserGhostWindowFromHungWindow diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 0e1afb80e62..c7340018830 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -246,6 +246,7 @@ struct unix_funcs BOOL (WINAPI *pNtUserGetUpdateRect)( HWND hwnd, RECT *rect, BOOL erase ); INT (WINAPI *pNtUserGetUpdateRgn)( HWND hwnd, HRGN hrgn, BOOL erase ); BOOL (WINAPI *pNtUserGetUpdatedClipboardFormats)( UINT *formats, UINT size, UINT *out_size ); + BOOL (WINAPI *pNtUserGetWindowPlacement)( HWND hwnd, WINDOWPLACEMENT *placement ); BOOL (WINAPI *pNtUserHideCaret)( HWND hwnd ); BOOL (WINAPI *pNtUserIsClipboardFormatAvailable)( UINT format ); UINT (WINAPI *pNtUserMapVirtualKeyEx)( UINT code, UINT type, HKL layout ); @@ -442,7 +443,6 @@ extern HWND get_full_window_handle( HWND hwnd ) DECLSPEC_HIDDEN; extern HWND get_parent( HWND hwnd ) DECLSPEC_HIDDEN; extern HWND get_hwnd_message_parent(void) DECLSPEC_HIDDEN; extern DPI_AWARENESS_CONTEXT get_window_dpi_awareness_context( HWND hwnd ) DECLSPEC_HIDDEN; -extern BOOL get_window_placement( HWND hwnd, WINDOWPLACEMENT *placement ) DECLSPEC_HIDDEN; extern MINMAXINFO get_min_max_info( HWND hwnd ) DECLSPEC_HIDDEN; extern HWND get_window_relative( HWND hwnd, UINT rel ) DECLSPEC_HIDDEN; extern DWORD get_window_thread( HWND hwnd, DWORD *process ) DECLSPEC_HIDDEN; diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index 440052d6e0b..338063f5fb5 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -2400,8 +2400,10 @@ static BOOL empty_point( POINT pt ) return pt.x == -1 && pt.y == -1; } -/* see GetWindowPlacement */ -BOOL get_window_placement( HWND hwnd, WINDOWPLACEMENT *placement ) +/*********************************************************************** + * NtUserGetWindowPlacement (win32u.@) + */ +BOOL WINAPI NtUserGetWindowPlacement( HWND hwnd, WINDOWPLACEMENT *placement ) { RECT work_rect = get_maximized_work_rect( hwnd ); WND *win = get_win_ptr( hwnd ); @@ -4036,7 +4038,7 @@ static UINT window_min_maximize( HWND hwnd, UINT cmd, RECT *rect ) TRACE( "%p %u\n", hwnd, cmd ); wpl.length = sizeof(wpl); - get_window_placement( hwnd, &wpl ); + NtUserGetWindowPlacement( hwnd, &wpl ); if (call_hooks( WH_CBT, HCBT_MINMAX, (WPARAM)hwnd, cmd, TRUE )) return SWP_NOSIZE | SWP_NOMOVE; @@ -5393,9 +5395,6 @@ ULONG_PTR WINAPI NtUserCallHwndParam( HWND hwnd, DWORD_PTR param, DWORD code ) case NtUserCallHwndParam_GetWindowLongPtrW: return get_window_long_ptr( hwnd, param, FALSE ); - case NtUserCallHwndParam_GetWindowPlacement: - return get_window_placement( hwnd, (WINDOWPLACEMENT *)param ); - case NtUserCallHwndParam_GetWindowRect: return get_window_rect( hwnd, (RECT *)param, get_thread_dpi() ); diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index 953de0caafc..13b4b7164ab 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -1023,6 +1023,12 @@ BOOL WINAPI NtUserGetUpdatedClipboardFormats( UINT *formats, UINT size, UINT *ou return unix_funcs->pNtUserGetUpdatedClipboardFormats( formats, size, out_size ); } +BOOL WINAPI NtUserGetWindowPlacement( HWND hwnd, WINDOWPLACEMENT *placement ) +{ + if (!unix_funcs) return FALSE; + return unix_funcs->pNtUserGetWindowPlacement( hwnd, placement ); +} + BOOL WINAPI NtUserIsClipboardFormatAvailable( UINT format ) { if (!unix_funcs) return FALSE; diff --git a/include/ntuser.h b/include/ntuser.h index bc60f421f0e..c7490eaad0a 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -577,6 +577,7 @@ HDESK WINAPI NtUserGetThreadDesktop( DWORD thread ); INT WINAPI NtUserGetUpdateRgn( HWND hwnd, HRGN hrgn, BOOL erase ); BOOL WINAPI NtUserGetUpdatedClipboardFormats( UINT *formats, UINT size, UINT *out_size ); BOOL WINAPI NtUserGetUpdateRect( HWND hwnd, RECT *rect, BOOL erase ); +BOOL WINAPI NtUserGetWindowPlacement( HWND hwnd, WINDOWPLACEMENT *placement ); int WINAPI NtUserGetWindowRgnEx( HWND hwnd, HRGN hrgn, UINT unk ); BOOL WINAPI NtUserHideCaret( HWND hwnd ); NTSTATUS WINAPI NtUserInitializeClientPfnArrays( const struct user_client_procs *client_procsA, @@ -1000,7 +1001,6 @@ enum NtUserCallHwndParam_GetWindowLongW, NtUserCallHwndParam_GetWindowLongPtrA, NtUserCallHwndParam_GetWindowLongPtrW, - NtUserCallHwndParam_GetWindowPlacement, NtUserCallHwndParam_GetWindowRect, NtUserCallHwndParam_GetWindowRelative, NtUserCallHwndParam_GetWindowThread, @@ -1093,12 +1093,6 @@ static inline LONG NtUserGetWindowLongW( HWND hwnd, INT offset ) return NtUserCallHwndParam( hwnd, offset, NtUserCallHwndParam_GetWindowLongW ); } -static inline BOOL NtUserGetWindowPlacement( HWND hwnd, WINDOWPLACEMENT *wndpl ) -{ - return NtUserCallHwndParam( hwnd, (UINT_PTR)wndpl, - NtUserCallHwndParam_GetWindowPlacement ); -} - static inline BOOL NtUserGetWindowRect( HWND hwnd, RECT *rect ) { return NtUserCallHwndParam( hwnd, (UINT_PTR)rect, NtUserCallHwndParam_GetWindowRect );

1 0

Jacek Caban : win32u: Move NtUserSetInternalWindowPos implementation from user32.
by Alexandre Julliard 19 May '22

19 May '22

Module: wine Branch: master Commit: 9abd2ae8d18c096fe4b62db4408d3777f0a34851 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9abd2ae8d18c096fe4b62db4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 19 13:24:26 2022 +0200 win32u: Move NtUserSetInternalWindowPos implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 20 ----- dlls/user32/user32.spec | 2 +- dlls/user32/win.h | 2 - dlls/user32/winpos.c | 208 ------------------------------------------- dlls/win32u/gdiobj.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/window.c | 26 ++++++ dlls/win32u/wrappers.c | 6 ++ include/ntuser.h | 1 + 10 files changed, 37 insertions(+), 232 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9abd2ae8d18c096fe4b6…

1 0

Jacek Caban : win32u: Move NtUserSetWindowPlacement implementation from user32.
by Alexandre Julliard 19 May '22

19 May '22

Module: wine Branch: master Commit: 96b2b4c078c4b807e24a39526cdc97e8125c1364 URL: https://source.winehq.org/git/wine.git/?a=commit;h=96b2b4c078c4b807e24a3952… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 19 13:12:33 2022 +0200 win32u: Move NtUserSetWindowPlacement implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/user32.spec | 2 +- dlls/user32/winpos.c | 15 ------ dlls/win32u/gdiobj.c | 1 + dlls/win32u/sysparams.c | 20 ++++++++ dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 3 ++ dlls/win32u/window.c | 119 +++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/wrappers.c | 6 +++ include/ntuser.h | 1 + 9 files changed, 152 insertions(+), 17 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=96b2b4c078c4b807e24a…

1 0

Nikolay Sivov : dwrite/opentype: Fix GPOS PairSet array offset.
by Alexandre Julliard 19 May '22

19 May '22

Module: wine Branch: master Commit: 295599e2c2e7b15d42cfd7add9e5ac578f9d0585 URL: https://source.winehq.org/git/wine.git/?a=commit;h=295599e2c2e7b15d42cfd7ad… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 19 20:21:11 2022 +0300 dwrite/opentype: Fix GPOS PairSet array offset. Passed offset already includes subtable offset. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 50e83769715..8e4bd7a62dc 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -4025,7 +4025,7 @@ static BOOL opentype_layout_apply_gpos_pair_adjustment(struct scriptshaping_cont value_len2 * sizeof(WORD); pairset_offset = subtable_offset + GET_BE_WORD(format1->pairsets[coverage_index]); - pairset = table_read_ensure(table, subtable_offset + pairset_offset, pairvalue_len * pairvalue_count); + pairset = table_read_ensure(table, pairset_offset, pairvalue_len * pairvalue_count); if (!pairset) return FALSE;

1 0

← Newer
1
...
32
33
34
35
36
37
38
...
91
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 May 2022