November 2021 - Wine-Commits

Jacek Caban : win32u: Implement display adapter registration.
by Alexandre Julliard Nov. 30, 2021

Nov. 30, 2021

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

Hans Leidekker : winhttp: Use DNS only for proxy auto-detection.
by Alexandre Julliard Nov. 30, 2021

Nov. 30, 2021

Module: wine Branch: master Commit: 859f9daada0292a2ce69e5302424905f3b1e335d URL: https://source.winehq.org/git/wine.git/?a=commit;h=859f9daada0292a2ce69e530… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 30 17:29:08 2021 +0100 winhttp: Use DNS only for proxy auto-detection. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52133 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/session.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 3c8cb0fa992..2620bf30ac0 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -1466,7 +1466,7 @@ static WCHAR *detect_autoproxyconfig_url_dns(void) while ((p = strchr( p, '.' )) && is_domain_suffix( p + 1, domain )) { char *name; - struct addrinfo *ai; + struct addrinfo *ai, hints; int res; if (!(name = malloc( sizeof("wpad") + strlen(p) ))) @@ -1477,7 +1477,10 @@ static WCHAR *detect_autoproxyconfig_url_dns(void) } strcpy( name, "wpad" ); strcat( name, p ); - res = getaddrinfo( name, NULL, NULL, &ai ); + memset( &hints, 0, sizeof(hints) ); + hints.ai_flags = AI_ALL | AI_DNS_ONLY; + hints.ai_family = AF_UNSPEC; + res = getaddrinfo( name, NULL, &hints, &ai ); if (!res) { ret = build_wpad_url( name, ai );

1 0

Zebediah Figura : wined3d: Always set GL_PIXEL_PACK_BUFFER binding in texture2d_read_from_framebuffer().
by Alexandre Julliard Nov. 30, 2021

Nov. 30, 2021

Module: wine Branch: master Commit: d3d9785483dd0735de2b93f3376d79b1b1d9b0b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3d9785483dd0735de2b93f3… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Nov 29 18:13:42 2021 -0600 wined3d: Always set GL_PIXEL_PACK_BUFFER binding in texture2d_read_from_framebuffer(). 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/surface.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 060ac84b8b7..9a5b4cbff72 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -475,6 +475,11 @@ void texture2d_read_from_framebuffer(struct wined3d_texture *texture, unsigned i checkGLcall("glBindBuffer"); offset += data.buffer_object->buffer_offset; } + else + { + GL_EXTCALL(glBindBuffer(GL_PIXEL_PACK_BUFFER, 0)); + checkGLcall("glBindBuffer"); + } level = sub_resource_idx % texture->level_count; wined3d_texture_get_pitch(texture, level, &row_pitch, &slice_pitch);

1 0

Zebediah Figura : wined3d: Always set GL_PIXEL_PACK_BUFFER binding before downloading texture data.
by Alexandre Julliard Nov. 30, 2021

Nov. 30, 2021

Module: wine Branch: master Commit: f4cbd110d9234a339fede7e005135fd31c926cb1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4cbd110d9234a339fede7e0… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Nov 29 18:13:41 2021 -0600 wined3d: Always set GL_PIXEL_PACK_BUFFER binding before downloading texture data. 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/texture.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 48202c2142c..d4c7082912b 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2695,6 +2695,8 @@ static void wined3d_texture_gl_download_data_slow_path(struct wined3d_texture_gl if (temporary_mem) { + GL_EXTCALL(glBindBuffer(GL_PIXEL_PACK_BUFFER, 0)); + checkGLcall("glBindBuffer"); mem = temporary_mem; } else if (bo) @@ -2705,6 +2707,8 @@ static void wined3d_texture_gl_download_data_slow_path(struct wined3d_texture_gl } else { + GL_EXTCALL(glBindBuffer(GL_PIXEL_PACK_BUFFER, 0)); + checkGLcall("glBindBuffer"); mem = data->addr; } @@ -2918,6 +2922,11 @@ static void wined3d_texture_gl_download_data(struct wined3d_context *context, checkGLcall("glBindBuffer"); offset += dst_bo->buffer_offset; } + else + { + GL_EXTCALL(glBindBuffer(GL_PIXEL_PACK_BUFFER, 0)); + checkGLcall("glBindBuffer"); + } if (src_texture->resource.format_flags & WINED3DFMT_FLAG_COMPRESSED) {

1 0

Nikolay Sivov : user.exe: Fix WM_ERASEBKGND HDC param conversion in WINPROC_CallProc16To32A.
by Alexandre Julliard Nov. 30, 2021

Nov. 30, 2021

Module: wine Branch: master Commit: 0f16aa1842d2bb9f5b8410cfd342680a9a1844ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f16aa1842d2bb9f5b8410cf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 30 16:51:41 2021 +0100 user.exe: Fix WM_ERASEBKGND HDC param conversion in WINPROC_CallProc16To32A. 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 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/user.exe16/message.c b/dlls/user.exe16/message.c index e0f5bfa5d19..b79b0cb7751 100644 --- a/dlls/user.exe16/message.c +++ b/dlls/user.exe16/message.c @@ -905,6 +905,9 @@ LRESULT WINPROC_CallProc16To32A( winproc_callback_t callback, HWND16 hwnd, UINT1 case WM_SIZECLIPBOARD: FIXME_(msg)( "message %04x needs translation\n", msg ); break; + case WM_ERASEBKGND: + ret = callback( hwnd32, msg, (WPARAM)HDC_32(wParam), lParam, result, arg ); + break; default: ret = callback( hwnd32, msg, wParam, lParam, result, arg ); break;

1 0

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

Nov. 30, 2021

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

Jacek Caban : win32u: Implement NtUserEnumDisplayDevices.
by Alexandre Julliard Nov. 30, 2021

Nov. 30, 2021

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 UpdateDisplayDevices driver entry point for registering devices.
by Alexandre Julliard Nov. 30, 2021

Nov. 30, 2021

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 : user.exe: Use WINPROC_CallProc16To32A for DefWindowProc16.
by Alexandre Julliard Nov. 30, 2021

Nov. 30, 2021

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

Paul Gofman : d3d9/tests: Add more tests for fullscreen window size reset.
by Alexandre Julliard Nov. 30, 2021

Nov. 30, 2021

Module: wine Branch: master Commit: 78533e9e94d4fcae06dd44d29dbed4755d4ac1f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=78533e9e94d4fcae06dd44d2… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Nov 29 22:27:37 2021 +0300 d3d9/tests: Add more tests for fullscreen window size reset. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 38 +++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 3ef9361886d..c480a9d163e 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -14572,10 +14572,10 @@ static void test_window_position(void) { unsigned int adapter_idx, adapter_count; struct device_desc device_desc; + RECT window_rect, new_rect; IDirect3DDevice9 *device; MONITORINFO monitor_info; HMONITOR monitor; - RECT window_rect; IDirect3D9 *d3d; HWND window; HRESULT hr; @@ -14612,6 +14612,42 @@ static void test_window_position(void) "Adapter %u: Expect window rect %s, got %s.\n", adapter_idx, wine_dbgstr_rect(&monitor_info.rcMonitor), wine_dbgstr_rect(&window_rect)); + new_rect = window_rect; + --new_rect.right; + --new_rect.bottom; + + ret = MoveWindow(window, new_rect.left, new_rect.top, new_rect.right - new_rect.left, + new_rect.bottom - new_rect.top, TRUE); + ok(ret, "Got unexpected ret %#x, error %#x, Adapter %u.\n", ret, GetLastError(), adapter_idx); + ret = GetWindowRect(window, &window_rect); + ok(ret, "Got unexpected ret %#x, error %#x, Adapter %u.\n", ret, GetLastError(), adapter_idx); + ok(EqualRect(&window_rect, &new_rect), + "Adapter %u: Expect window rect %s, got %s.\n", adapter_idx, + wine_dbgstr_rect(&monitor_info.rcMonitor), wine_dbgstr_rect(&window_rect)); + /* After processing window events window rectangle gets restored. But only once, the size set + * on the second resize remains. */ + flush_events(); + ret = GetWindowRect(window, &window_rect); + ok(ret, "Got unexpected ret %#x, error %#x, Adapter %u.\n", ret, GetLastError(), adapter_idx); + todo_wine ok(EqualRect(&window_rect, &monitor_info.rcMonitor), + "Adapter %u: Expect window rect %s, got %s.\n", adapter_idx, + wine_dbgstr_rect(&monitor_info.rcMonitor), wine_dbgstr_rect(&window_rect)); + + ret = MoveWindow(window, new_rect.left, new_rect.top, new_rect.right - new_rect.left, + new_rect.bottom - new_rect.top, TRUE); + ok(ret, "Got unexpected ret %#x, error %#x, Adapter %u.\n", ret, GetLastError(), adapter_idx); + ret = GetWindowRect(window, &window_rect); + ok(ret, "Got unexpected ret %#x, error %#x, Adapter %u.\n", ret, GetLastError(), adapter_idx); + ok(EqualRect(&window_rect, &new_rect), + "Adapter %u: Expect window rect %s, got %s.\n", adapter_idx, + wine_dbgstr_rect(&monitor_info.rcMonitor), wine_dbgstr_rect(&window_rect)); + flush_events(); + ret = GetWindowRect(window, &window_rect); + ok(ret, "Got unexpected ret %#x, error %#x, Adapter %u.\n", ret, GetLastError(), adapter_idx); + ok(EqualRect(&window_rect, &new_rect), + "Adapter %u: Expect window rect %s, got %s.\n", adapter_idx, + wine_dbgstr_rect(&monitor_info.rcMonitor), wine_dbgstr_rect(&window_rect)); + /* Device resets should restore the window rectangle to fit the whole monitor */ ret = SetWindowPos(window, 0, 0, 0, 0, 0, SWP_NOZORDER | SWP_NOSIZE); ok(ret, "Adapter %u: SetWindowPos failed, error %#x.\n", adapter_idx, GetLastError());

1 0