wine-commits November 2021

wine-commits@winehq.org

2 participants
951 discussions

Jacek Caban : user.exe: Use WINPROC_CallProc16To32A for DefWindowProc16.
by Alexandre Julliard 30 Nov '21

30 Nov '21

Module: wine Branch: master Commit: 1bfae238c861f83e6ccb9e8821d5fb0de5a48a61 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1bfae238c861f83e6ccb9e88… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 30 16:51:35 2021 +0100 user.exe: Use WINPROC_CallProc16To32A for DefWindowProc16. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51624 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51899 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user.exe16/message.c | 80 +++++------------------------------------------ 1 file changed, 8 insertions(+), 72 deletions(-) diff --git a/dlls/user.exe16/message.c b/dlls/user.exe16/message.c index 93e2cc018bf..e0f5bfa5d19 100644 --- a/dlls/user.exe16/message.c +++ b/dlls/user.exe16/message.c @@ -78,6 +78,12 @@ static LRESULT defdlg_proc_callback( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, return *result; } +static LRESULT defwnd_proc_callback( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, + LRESULT *result, void *arg ) +{ + return *result = DefWindowProcA( hwnd, msg, wp, lp ); +} + static LRESULT call_window_proc_callback( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, LRESULT *result, void *arg ) { @@ -1601,78 +1607,8 @@ BOOL16 WINAPI PeekMessage32_16( MSG32_16 *msg16, HWND16 hwnd16, LRESULT WINAPI DefWindowProc16( HWND16 hwnd16, UINT16 msg, WPARAM16 wParam, LPARAM lParam ) { LRESULT result; - HWND hwnd = WIN_Handle32( hwnd16 ); - - switch(msg) - { - case WM_NCCREATE: - { - CREATESTRUCT16 *cs16 = MapSL(lParam); - CREATESTRUCTA cs32; - - cs32.lpCreateParams = ULongToPtr(cs16->lpCreateParams); - cs32.hInstance = HINSTANCE_32(cs16->hInstance); - cs32.hMenu = HMENU_32(cs16->hMenu); - cs32.hwndParent = WIN_Handle32(cs16->hwndParent); - cs32.cy = cs16->cy; - cs32.cx = cs16->cx; - cs32.y = cs16->y; - cs32.x = cs16->x; - cs32.style = cs16->style; - cs32.dwExStyle = cs16->dwExStyle; - cs32.lpszName = MapSL(cs16->lpszName); - cs32.lpszClass = MapSL(cs16->lpszClass); - return DefWindowProcA( hwnd, msg, wParam, (LPARAM)&cs32 ); - } - case WM_NCCALCSIZE: - { - RECT16 *rect16 = MapSL(lParam); - RECT rect32; - - rect32.left = rect16->left; - rect32.top = rect16->top; - rect32.right = rect16->right; - rect32.bottom = rect16->bottom; - - result = DefWindowProcA( hwnd, msg, wParam, (LPARAM)&rect32 ); - - rect16->left = rect32.left; - rect16->top = rect32.top; - rect16->right = rect32.right; - rect16->bottom = rect32.bottom; - return result; - } - case WM_WINDOWPOSCHANGING: - case WM_WINDOWPOSCHANGED: - { - WINDOWPOS16 *pos16 = MapSL(lParam); - WINDOWPOS pos32; - - pos32.hwnd = WIN_Handle32(pos16->hwnd); - pos32.hwndInsertAfter = WIN_Handle32(pos16->hwndInsertAfter); - pos32.x = pos16->x; - pos32.y = pos16->y; - pos32.cx = pos16->cx; - pos32.cy = pos16->cy; - pos32.flags = pos16->flags; - - result = DefWindowProcA( hwnd, msg, wParam, (LPARAM)&pos32 ); - - pos16->hwnd = HWND_16(pos32.hwnd); - pos16->hwndInsertAfter = HWND_16(pos32.hwndInsertAfter); - pos16->x = pos32.x; - pos16->y = pos32.y; - pos16->cx = pos32.cx; - pos16->cy = pos32.cy; - pos16->flags = pos32.flags; - return result; - } - case WM_GETTEXT: - case WM_SETTEXT: - return DefWindowProcA( hwnd, msg, wParam, (LPARAM)MapSL(lParam) ); - default: - return DefWindowProcA( hwnd, msg, wParam, lParam ); - } + WINPROC_CallProc16To32A( defwnd_proc_callback, hwnd16, msg, wParam, lParam, &result, 0 ); + return result; }

1 0

Huw Davies : ntdll: Move the FILE ptr into the blocks that use it.
by Alexandre Julliard 30 Nov '21

30 Nov '21

Module: wine Branch: master Commit: 3ac41371f9a3b59e80f8ad23a4e2bbbbfb2141b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ac41371f9a3b59e80f8ad23… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Nov 30 15:42:37 2021 +0000 ntdll: Move the FILE ptr into the blocks that use it. This is to prevent compiler warnings on non-linux platforms. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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__)

1 0

Huw Davies : winemac: Remove unused variable.
by Alexandre Julliard 30 Nov '21

30 Nov '21

Module: wine Branch: master Commit: 6bc1e9f445128837c488b613cc8c8a746040099a URL: https://source.winehq.org/git/wine.git/?a=commit;h=6bc1e9f445128837c488b613… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Nov 30 15:27:49 2021 +0000 winemac: Remove unused variable. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/display.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index fe48437849d..ffafb0bd1d2 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -429,7 +429,7 @@ static struct display_mode_descriptor* create_original_display_mode_descriptor(C HKEY hkey; DWORD type, size; DWORD refresh100; - WCHAR* pixel_encoding = NULL, *end; + WCHAR* pixel_encoding = NULL; init_original_display_mode();

1 0

Jacek Caban : winex11.drv: Use UpdateDisplayDevices driver entry point for registering devices.
by Alexandre Julliard 30 Nov '21

30 Nov '21

Module: wine Branch: master Commit: 548bc54bf396d74b5b928bf9be835272ddda1886 URL: https://source.winehq.org/git/wine.git/?a=commit;h=548bc54bf396d74b5b928bf9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 30 13:27:04 2021 +0100 winex11.drv: Use UpdateDisplayDevices driver entry point for registering devices. 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/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(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=548bc54bf396d74b5b92…

1 0

Jacek Caban : user32: Invalidate cache in update_monitor_cache when modification time matches current time.
by Alexandre Julliard 30 Nov '21

30 Nov '21

Module: wine Branch: master Commit: d7133c97d91a0dbc746a4c9711831f45704c8b43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7133c97d91a0dbc746a4c97… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 30 13:26:56 2021 +0100 user32: Invalidate cache in update_monitor_cache when modification time matches current time. Also preserve last error. 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/user32/sysparams.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 92c62d815ba..82dd0f4c664 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -3804,14 +3804,14 @@ static BOOL update_monitor_cache(void) BOOL ret = FALSE; BOOL is_replica; DWORD i = 0, j; - DWORD type; + DWORD type, error = GetLastError(); /* Update monitor cache from SetupAPI if it's outdated */ if (!video_key && RegOpenKeyW( HKEY_LOCAL_MACHINE, L"HARDWARE\\DEVICEMAP\\VIDEO", &video_key )) return FALSE; if (RegQueryInfoKeyW( video_key, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, &filetime )) return FALSE; - if (CompareFileTime( &filetime, &last_query_monitors_time ) < 1) + if (CompareFileTime( &filetime, &last_query_monitors_time ) < 0) return TRUE; mutex = get_display_device_init_mutex(); @@ -3879,6 +3879,7 @@ fail: SetupDiDestroyDeviceInfoList( devinfo ); LeaveCriticalSection( &monitors_section ); release_display_device_init_mutex( mutex ); + SetLastError( error ); return ret; }

1 0

Jacek Caban : win32u: Implement NtUserEnumDisplayDevices.
by Alexandre Julliard 30 Nov '21

30 Nov '21

Module: wine Branch: master Commit: f6abd9d14027b0bb24225328678e4d2901720514 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6abd9d14027b0bb24225328… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 30 13:26:48 2021 +0100 win32u: Implement NtUserEnumDisplayDevices. And use it in user32. 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/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 | 10 ++ dlls/win32u/wrappers.c | 10 +- include/ntuser.h | 2 + 9 files changed, 96 insertions(+), 342 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f6abd9d14027b0bb2422…

1 0

Jacek Caban : winex11.drv: Use gdi driver types for display device handler.
by Alexandre Julliard 30 Nov '21

30 Nov '21

Module: wine Branch: master Commit: b502a3e3c6b43ac3947d85ccc263e729ace917fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=b502a3e3c6b43ac3947d85cc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 30 13:26:29 2021 +0100 winex11.drv: Use gdi driver types for display device handler. 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/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(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b502a3e3c6b43ac3947d…

1 0

Jacek Caban : win32u: Implement monitor registration.
by Alexandre Julliard 30 Nov '21

30 Nov '21

Module: wine Branch: master Commit: 8278bdcbec3430aa32eb387543fcdbc10938c3c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8278bdcbec3430aa32eb3875… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 30 13:26:17 2021 +0100 win32u: Implement monitor registration. 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 | 143 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 142 insertions(+), 1 deletion(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index b81b78badfe..26ea6f01f1f 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -97,6 +97,22 @@ static const WCHAR devpropkey_device_ispresentW[] = '\\','0','0','0','5' }; +static const WCHAR devpropkey_monitor_gpu_luidW[] = +{ + 'P','r','o','p','e','r','t','i','e','s', + '\\','{','C','A','0','8','5','8','5','3','-','1','6','C','E','-','4','8','A','A', + '-','B','1','1','4','-','D','E','9','C','7','2','3','3','4','2','2','3','}', + '\\','0','0','0','1' +}; + +static const WCHAR devpropkey_monitor_output_idW[] = +{ + 'P','r','o','p','e','r','t','i','e','s', + '\\','{','C','A','0','8','5','8','5','3','-','1','6','C','E','-','4','8','A','A', + '-','B','1','1','4','-','D','E','9','C','7','2','3','3','4','2','2','3','}', + '\\','0','0','0','2' +}; + static const WCHAR wine_devpropkey_monitor_stateflagsW[] = { 'P','r','o','p','e','r','t','i','e','s','\\', @@ -121,6 +137,14 @@ static const WCHAR wine_devpropkey_monitor_rcworkW[] = '\\','0','0','0','4' }; +static const WCHAR wine_devpropkey_monitor_adapternameW[] = +{ + 'P','r','o','p','e','r','t','i','e','s','\\', + '{','2','3','3','a','9','e','f','3','-','a','f','c','4','-','4','a','b','d', + '-','b','5','6','4','-','c','3','2','f','2','1','f','1','5','3','5','b','}', + '\\','0','0','0','5' +}; + static const WCHAR device_instanceW[] = {'D','e','v','i','c','e','I','n','s','t','a','n','c','e',0}; static const WCHAR controlW[] = {'C','o','n','t','r','o','l'}; static const WCHAR device_parametersW[] = @@ -146,6 +170,9 @@ static const WCHAR guid_devclass_displayW[] = 'B','F','C','1','-','0','8','0','0','2','B','E','1','0','3','1','8','}',0}; static const char guid_devclass_monitorA[] = "{4D36E96E-E325-11CE-BFC1-08002BE10318}"; +static const WCHAR guid_devclass_monitorW[] = + {'{','4','D','3','6','E','9','6','E','-','E','3','2','5','-','1','1','C','E','-' + ,'B','F','C','1','-','0','8','0','0','2','B','E','1','0','3','1','8','}'}; static const WCHAR guid_devinterface_display_adapterW[] = {'{','5','B','4','5','2','0','1','D','-','F','2','F','2','-','4','F','3','B','-', @@ -876,7 +903,121 @@ static void add_adapter( const struct gdi_adapter *adapter, void *param ) static void add_monitor( const struct gdi_monitor *monitor, void *param ) { - FIXME( "\n" ); + struct device_manager_ctx *ctx = param; + char buffer[MAX_PATH], instance[64]; + unsigned int monitor_index, output_index; + WCHAR bufferW[MAX_PATH]; + HKEY hkey, subkey; + + static const WCHAR default_monitorW[] = + {'M','O','N','I','T','O','R','\\','D','e','f','a','u','l','t','_','M','o','n','i','t','o','r',0,0}; + + TRACE( "%s %s %s\n", debugstr_w(monitor->name), wine_dbgstr_rect(&monitor->rc_monitor), + wine_dbgstr_rect(&monitor->rc_work) ); + + if (!ctx->adapter_count) + { + static const struct gdi_adapter default_adapter = + { + .state_flags = DISPLAY_DEVICE_ATTACHED_TO_DESKTOP | DISPLAY_DEVICE_PRIMARY_DEVICE | + DISPLAY_DEVICE_VGA_COMPATIBLE, + }; + TRACE( "adding default fake adapter\n" ); + add_adapter( &default_adapter, ctx ); + } + + monitor_index = ctx->monitor_count++; + output_index = ctx->output_count++; + + sprintf( buffer, "MonitorID%u", monitor_index ); + sprintf( instance, "DISPLAY\\Default_Monitor\\%04X&%04X", ctx->video_count - 1, monitor_index ); + set_reg_ascii_value( ctx->adapter_key, buffer, instance ); + + hkey = reg_create_key( enum_key, bufferW, asciiz_to_unicode( bufferW, instance ) - sizeof(WCHAR), + 0, NULL ); + if (!hkey) return; + + link_device( bufferW, guid_devinterface_monitorW ); + + lstrcpyW( bufferW, monitor->name ); + if (!bufferW[0]) asciiz_to_unicode( bufferW, "Generic Non-PnP Monitor" ); + set_reg_value( hkey, device_descW, REG_SZ, bufferW, (lstrlenW( bufferW ) + 1) * sizeof(WCHAR) ); + + set_reg_value( hkey, classW, REG_SZ, monitorW, sizeof(monitorW) ); + sprintf( buffer, "%s\\%04X", guid_devclass_monitorA, output_index ); + set_reg_ascii_value( hkey, "Driver", buffer ); + set_reg_value( hkey, class_guidW, REG_SZ, guid_devclass_monitorW, sizeof(guid_devclass_monitorW) ); + set_reg_value( hkey, hardware_idW, REG_MULTI_SZ, default_monitorW, sizeof(default_monitorW) ); + + if ((subkey = reg_create_key( hkey, device_parametersW, sizeof(device_parametersW), 0, NULL ))) + { + static const WCHAR edidW[] = {'E','D','I','D',0}; + set_reg_value( subkey, edidW, REG_BINARY, monitor->edid, monitor->edid_len ); + NtClose( subkey ); + } + + /* StateFlags */ + if ((subkey = reg_create_key( hkey, wine_devpropkey_monitor_stateflagsW, + sizeof(wine_devpropkey_monitor_stateflagsW), 0, NULL ))) + { + set_reg_value( subkey, NULL, 0xffff0000 | DEVPROP_TYPE_UINT32, &monitor->state_flags, + sizeof(monitor->state_flags) ); + NtClose( subkey ); + } + + /* WINE_DEVPROPKEY_MONITOR_RCMONITOR */ + if ((subkey = reg_create_key( hkey, wine_devpropkey_monitor_rcmonitorW, + sizeof(wine_devpropkey_monitor_rcmonitorW), 0, NULL ))) + { + set_reg_value( subkey, NULL, 0xffff0000 | DEVPROP_TYPE_BINARY, &monitor->rc_monitor, + sizeof(monitor->rc_monitor) ); + NtClose( subkey ); + } + + /* WINE_DEVPROPKEY_MONITOR_RCWORK */ + if ((subkey = reg_create_key( hkey, wine_devpropkey_monitor_rcworkW, + sizeof(wine_devpropkey_monitor_rcworkW), 0, NULL ))) + { + TRACE( "rc_work %s\n", wine_dbgstr_rect(&monitor->rc_work) ); + set_reg_value( subkey, NULL, 0xffff0000 | DEVPROP_TYPE_BINARY, &monitor->rc_work, + sizeof(monitor->rc_work) ); + NtClose( subkey ); + } + + /* WINE_DEVPROPKEY_MONITOR_ADAPTERNAME */ + if ((subkey = reg_create_key( hkey, wine_devpropkey_monitor_adapternameW, + sizeof(wine_devpropkey_monitor_adapternameW), 0, NULL ))) + { + sprintf( buffer, "\\\\.\\DISPLAY%u", ctx->video_count ); + set_reg_value( subkey, NULL, 0xffff0000 | DEVPROP_TYPE_STRING, bufferW, + asciiz_to_unicode( bufferW, buffer )); + NtClose( subkey ); + } + + /* DEVPROPKEY_MONITOR_GPU_LUID */ + if ((subkey = reg_create_key( hkey, devpropkey_monitor_gpu_luidW, + sizeof(devpropkey_monitor_gpu_luidW), 0, NULL ))) + { + set_reg_value( subkey, NULL, 0xffff0000 | DEVPROP_TYPE_INT64, + &ctx->gpu_luid, sizeof(ctx->gpu_luid) ); + NtClose( subkey ); + } + + /* DEVPROPKEY_MONITOR_OUTPUT_ID */ + if ((subkey = reg_create_key( hkey, devpropkey_monitor_output_idW, + sizeof(devpropkey_monitor_output_idW), 0, NULL ))) + { + set_reg_value( subkey, NULL, 0xffff0000 | DEVPROP_TYPE_UINT32, + &output_index, sizeof(output_index) ); + NtClose( subkey ); + } + + NtClose( hkey ); + + sprintf( buffer, "Class\\%s\\%04X", guid_devclass_monitorA, output_index ); + hkey = reg_create_key( control_key, bufferW, + asciiz_to_unicode( bufferW, buffer ) - sizeof(WCHAR), 0, NULL ); + if (hkey) NtClose( hkey ); } static const struct gdi_device_manager device_manager =

1 0

Jacek Caban : win32u: Implement display adapter registration.
by Alexandre Julliard 30 Nov '21

30 Nov '21

Module: wine Branch: master Commit: 082136aea1ecf2b44416e8263138839b9be7263c URL: https://source.winehq.org/git/wine.git/?a=commit;h=082136aea1ecf2b44416e826… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 30 13:26:10 2021 +0100 win32u: Implement display adapter registration. 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/font.c | 4 ++- dlls/win32u/sysparams.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 69 insertions(+), 2 deletions(-) diff --git a/dlls/win32u/font.c b/dlls/win32u/font.c index 1f284d775f4..40467bb82f5 100644 --- a/dlls/win32u/font.c +++ b/dlls/win32u/font.c @@ -584,9 +584,11 @@ HKEY reg_create_key( HKEY root, const WCHAR *name, ULONG name_len, if (i == len) return 0; for (;;) { + unsigned int subkey_options = options; + if (i < len) subkey_options &= ~(REG_OPTION_CREATE_LINK | REG_OPTION_OPEN_LINK); nameW.Buffer = (WCHAR *)name + pos; nameW.Length = (i - pos) * sizeof(WCHAR); - status = NtCreateKey( &ret, MAXIMUM_ALLOWED, &attr, 0, NULL, options, disposition ); + status = NtCreateKey( &ret, MAXIMUM_ALLOWED, &attr, 0, NULL, subkey_options, disposition ); if (attr.RootDirectory != root) NtClose( attr.RootDirectory ); if (!NT_SUCCESS(status)) return 0; diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 05c4417cc69..b81b78badfe 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -126,6 +126,8 @@ static const WCHAR controlW[] = {'C','o','n','t','r','o','l'}; static const WCHAR device_parametersW[] = {'D','e','v','i','c','e',' ','P','a','r','a','m','e','t','e','r','s'}; static const WCHAR linkedW[] = {'L','i','n','k','e','d',0}; +static const WCHAR symbolic_link_valueW[] = + {'S','y','m','b','o','l','i','c','L','i','n','k','V','a','l','u','e',0}; static const WCHAR state_flagsW[] = {'S','t','a','t','e','F','l','a','g','s',0}; static const WCHAR gpu_idW[] = {'G','P','U','I','D',0}; static const WCHAR hardware_idW[] = {'H','a','r','d','w','a','r','e','I','D',0}; @@ -806,7 +808,70 @@ static void add_gpu( const struct gdi_gpu *gpu, void *param ) static void add_adapter( const struct gdi_adapter *adapter, void *param ) { - FIXME( "\n" ); + struct device_manager_ctx *ctx = param; + unsigned int adapter_index, video_index, len; + char name[64], buffer[MAX_PATH]; + WCHAR nameW[64], bufferW[MAX_PATH]; + HKEY hkey; + + TRACE( "\n" ); + + if (!ctx->gpu_count) + { + static const struct gdi_gpu default_gpu; + TRACE( "adding default fake GPU\n" ); + add_gpu( &default_gpu, ctx ); + } + + if (ctx->adapter_key) + { + NtClose( ctx->adapter_key ); + ctx->adapter_key = NULL; + } + + adapter_index = ctx->adapter_count++; + video_index = ctx->video_count++; + ctx->monitor_count = 0; + + len = asciiz_to_unicode( bufferW, "\\Registry\\Machine\\System\\CurrentControlSet\\" + "Control\\Video\\" ) / sizeof(WCHAR) - 1; + lstrcpyW( bufferW + len, ctx->gpu_guid ); + len += lstrlenW( bufferW + len ); + sprintf( buffer, "\\%04x", adapter_index ); + len += asciiz_to_unicode( bufferW + len, buffer ) / sizeof(WCHAR) - 1; + hkey = reg_create_key( NULL, bufferW, len * sizeof(WCHAR), + REG_OPTION_VOLATILE | REG_OPTION_CREATE_LINK, NULL ); + if (!hkey) hkey = reg_create_key( NULL, bufferW, len * sizeof(WCHAR), + REG_OPTION_VOLATILE | REG_OPTION_OPEN_LINK, NULL ); + + sprintf( name, "\\Device\\Video%u", video_index ); + asciiz_to_unicode( nameW, name ); + set_reg_value( video_key, nameW, REG_SZ, bufferW, (lstrlenW( bufferW ) + 1) * sizeof(WCHAR) ); + + if (hkey) + { + sprintf( buffer, "\\Registry\\Machine\\System\\CurrentControlSet\\Control\\Class\\" + "%s\\%04X", guid_devclass_displayA, ctx->gpu_count - 1 ); + len = asciiz_to_unicode( bufferW, buffer ) - sizeof(WCHAR); + set_reg_value( hkey, symbolic_link_valueW, REG_LINK, bufferW, len ); + NtClose( hkey ); + } + else ERR( "failed to create link key\n" ); + + /* Following information is Wine specific, it doesn't really exist on Windows. */ + len = asciiz_to_unicode( bufferW, "System\\CurrentControlSet\\Control\\Video\\" ) + / sizeof(WCHAR) - 1; + lstrcpyW( bufferW + len, ctx->gpu_guid ); + len += lstrlenW( bufferW + len ); + sprintf( buffer, "\\%04x", adapter_index ); + len += asciiz_to_unicode( bufferW + len, buffer ) / sizeof(WCHAR) - 1; + ctx->adapter_key = reg_create_key( config_key, bufferW, len * sizeof(WCHAR), + REG_OPTION_VOLATILE, NULL ); + + set_reg_value( ctx->adapter_key, gpu_idW, REG_SZ, ctx->gpuid, + (lstrlenW( ctx->gpuid ) + 1) * sizeof(WCHAR) ); + set_reg_value( ctx->adapter_key, state_flagsW, REG_DWORD, &adapter->state_flags, + sizeof(adapter->state_flags) ); } static void add_monitor( const struct gdi_monitor *monitor, void *param )

1 0

Jacek Caban : win32u: Implement GPU registration.
by Alexandre Julliard 30 Nov '21

30 Nov '21

Module: wine Branch: master Commit: 6185c8a34777fbcc06eb26ab716976856054d8ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=6185c8a34777fbcc06eb26ab… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 30 13:26:01 2021 +0100 win32u: Implement GPU registration. 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/font.c | 10 +- dlls/win32u/sysparams.c | 473 ++++++++++++++++++++++++++++++++++++++++++- dlls/win32u/win32u_private.h | 6 + 3 files changed, 481 insertions(+), 8 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6185c8a34777fbcc06eb…

1 0

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 2021