wine-commits June 2021

wine-commits@winehq.org

1 participants
811 discussions

Jacek Caban : oleaut32: Use C locale in VARIANT_BstrFromReal.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: 3591388c75ab982862ef777cd6e6b71aef8f40f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3591388c75ab982862ef777c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 16 19:03:37 2021 +0100 oleaut32: Use C locale in VARIANT_BstrFromReal. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50672 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 22a1485c08fb219444f7bb45b37c26af7c203d19) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/oleaut32/vartype.c | 7 ++++++- include/msvcrt/corecrt_wstdio.h | 11 +++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index 6793de317ac..90b3fcaa1a9 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -29,6 +29,8 @@ #include "variant.h" #include "resource.h" +#include "locale.h" + WINE_DEFAULT_DEBUG_CHANNEL(variant); extern HMODULE hProxyDll DECLSPEC_HIDDEN; @@ -6501,12 +6503,15 @@ static BSTR VARIANT_BstrReplaceDecimal(const WCHAR * buff, LCID lcid, ULONG dwFl static HRESULT VARIANT_BstrFromReal(DOUBLE dblIn, LCID lcid, ULONG dwFlags, BSTR* pbstrOut, LPCWSTR lpszFormat) { + _locale_t locale; WCHAR buff[256]; if (!pbstrOut) return E_INVALIDARG; - swprintf( buff, ARRAY_SIZE(buff), lpszFormat, dblIn ); + if (!(locale = _create_locale(LC_ALL, "C"))) return E_OUTOFMEMORY; + _swprintf_l(buff, ARRAY_SIZE(buff), lpszFormat, locale, dblIn); + _free_locale(locale); /* Negative zeroes are disallowed (some applications depend on this). If buff starts with a minus, and then nothing follows but zeroes diff --git a/include/msvcrt/corecrt_wstdio.h b/include/msvcrt/corecrt_wstdio.h index 63f411e02db..81238afafb8 100644 --- a/include/msvcrt/corecrt_wstdio.h +++ b/include/msvcrt/corecrt_wstdio.h @@ -181,6 +181,17 @@ static inline int WINAPIV swprintf_s(wchar_t *buffer, size_t size, const wchar_t return ret; } +static inline int WINAPIV _swprintf_l(wchar_t *buffer, size_t size, const wchar_t* format, _locale_t locale, ...) +{ + int ret; + __ms_va_list args; + + __ms_va_start(args, locale); + ret = __stdio_common_vswprintf_s(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, buffer, size, format, locale, args); + __ms_va_end(args); + return ret; +} + static inline int __cdecl _vscwprintf(const wchar_t *format, __ms_va_list args) { int ret = __stdio_common_vswprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS | _CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR,

1 0

Roman Pišl : ntdll: Don't set error status if volume serial number is missing.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: 1f0940905213fc65c1071147e62aa061f61a4759 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f0940905213fc65c1071147… Author: Roman Pišl <rpisl(a)seznam.cz> Date: Sun Mar 7 11:50:11 2021 +0100 ntdll: Don't set error status if volume serial number is missing. Fixes regression from b14eee69c7240658252bc96b6302e98948f2c62c. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50781 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit dabba3cc86aa3ba6e7ba1d0863fb378828fef9f3) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/unix/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index d6533fedfdd..955b0e0dff6 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -4068,7 +4068,7 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, FILE_ID_INFORMATION *info = ptr; info->VolumeSerialNumber = 0; - if (!(io->u.Status = get_mountmgr_fs_info( handle, fd, &drive, sizeof(drive) ))) + if (!get_mountmgr_fs_info( handle, fd, &drive, sizeof(drive) )) info->VolumeSerialNumber = drive.serial; memset( &info->FileId, 0, sizeof(info->FileId) ); *(ULONGLONG *)&info->FileId = st.st_ino;

1 0

Vijay Kiran Kamuju : dhtmled.ocx: Implement IOleObject::GetMiscStatus function.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: b4031162439374a9e6f355dbe0afb24b559b6422 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b4031162439374a9e6f355db… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sat Feb 6 10:16:24 2021 +0100 dhtmled.ocx: Implement IOleObject::GetMiscStatus function. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50620 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d2c2987bcef21c08aacaba95af76ef381e0907e1) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dhtmled.ocx/Makefile.in | 2 +- dlls/dhtmled.ocx/edit.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dhtmled.ocx/Makefile.in b/dlls/dhtmled.ocx/Makefile.in index c483de93a05..0a890a57d44 100644 --- a/dlls/dhtmled.ocx/Makefile.in +++ b/dlls/dhtmled.ocx/Makefile.in @@ -1,5 +1,5 @@ MODULE = dhtmled.ocx -IMPORTS = uuid +IMPORTS = uuid ole32 EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/dhtmled.ocx/edit.c b/dlls/dhtmled.ocx/edit.c index 874b6554e59..dfa300b9590 100644 --- a/dlls/dhtmled.ocx/edit.c +++ b/dlls/dhtmled.ocx/edit.c @@ -737,9 +737,9 @@ static HRESULT WINAPI OleObject_EnumAdvise(IOleObject *iface, IEnumSTATDATA **ad static HRESULT WINAPI OleObject_GetMiscStatus(IOleObject *iface, DWORD aspect, DWORD *status) { DHTMLEditImpl *This = impl_from_IOleObject(iface); - FIXME("(%p)->(%u, %p) stub\n", This, aspect, status); - *status = 0; - return E_NOTIMPL; + TRACE("(%p)->(%u, %p)\n", This, aspect, status); + + return OleRegGetMiscStatus(&CLSID_DHTMLEdit, aspect, status); } static HRESULT WINAPI OleObject_SetColorScheme(IOleObject *iface, LOGPALETTE *palette)

1 0

Jacek Caban : conhost: Avoid assumption about the exact Unix cursor position after writing to the last column.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: a4ac7faab9effb60f9d5ec5bb8c8df149ea2cad4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4ac7faab9effb60f9d5ec5b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 16 20:32:33 2021 +0100 conhost: Avoid assumption about the exact Unix cursor position after writing to the last column. Spotted by Roman Pišl. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50581 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 9e97f3513eeea8da96654e9843579461649c3597) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/conhost/conhost.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index dd22636be6a..fbee37d9c01 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -195,6 +195,14 @@ static void set_tty_cursor( struct console *console, unsigned int x, unsigned in else if (!x && y == console->tty_cursor_y) strcpy( buf, "\r" ); else if (y == console->tty_cursor_y) { + if (console->is_unix && console->tty_cursor_x >= console->active->width) + { + /* Unix will usually have the cursor at width-1 in this case. instead of depending + * on the exact behaviour, move the cursor to the first column and move forward + * from threre. */ + tty_write( console, "\r", 1 ); + console->tty_cursor_x = 0; + } if (x + 1 == console->tty_cursor_x) strcpy( buf, "\b" ); else if (x > console->tty_cursor_x) sprintf( buf, "\x1b[%uC", x - console->tty_cursor_x ); else sprintf( buf, "\x1b[%uD", console->tty_cursor_x - x );

1 0

Alistair Leslie-Hughes : odbccp32: Implement SQLWriteDSNToIni/W.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: f4d30930a653aea1072ef3e08638fd373fd14da3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4d30930a653aea1072ef3e0… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Feb 5 16:19:45 2021 +1100 odbccp32: Implement SQLWriteDSNToIni/W. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50150 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ea3096bdab8fb865f63496613d1db09a105330dc) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/odbccp32/odbccp32.c | 72 +++++++++++++++++++++++++++--- dlls/odbccp32/tests/misc.c | 108 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 175 insertions(+), 5 deletions(-) diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index 420f206b700..1c46584cd29 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -1691,16 +1691,78 @@ BOOL WINAPI SQLValidDSN(LPCSTR lpszDSN) BOOL WINAPI SQLWriteDSNToIniW(LPCWSTR lpszDSN, LPCWSTR lpszDriver) { + DWORD ret; + HKEY hkey, hkeydriver; + WCHAR filename[MAX_PATH]; + + TRACE("%s %s\n", debugstr_w(lpszDSN), debugstr_w(lpszDriver)); + clear_errors(); - FIXME("%s %s\n", debugstr_w(lpszDSN), debugstr_w(lpszDriver)); - return TRUE; + + if (!SQLValidDSNW(lpszDSN)) + { + push_error(ODBC_ERROR_INVALID_DSN, odbc_error_invalid_dsn); + return FALSE; + } + + /* It doesn't matter if we cannot find the driver, windows just writes a blank value. */ + filename[0] = 0; + if (RegOpenKeyW(HKEY_LOCAL_MACHINE, odbcini, &hkey) == ERROR_SUCCESS) + { + HKEY hkeydriver; + + if (RegOpenKeyW(hkey, lpszDriver, &hkeydriver) == ERROR_SUCCESS) + { + DWORD size = MAX_PATH * sizeof(WCHAR); + RegGetValueW(hkeydriver, NULL, L"driver", RRF_RT_REG_SZ, NULL, filename, &size); + RegCloseKey(hkeydriver); + } + RegCloseKey(hkey); + } + + if ((ret = RegCreateKeyW(HKEY_LOCAL_MACHINE, L"SOFTWARE\\ODBC\\ODBC.INI", &hkey)) == ERROR_SUCCESS) + { + HKEY sources; + + if ((ret = RegCreateKeyW(hkey, L"ODBC Data Sources", &sources)) == ERROR_SUCCESS) + { + RegSetValueExW(sources, lpszDSN, 0, REG_SZ, (BYTE*)lpszDriver, (lstrlenW(lpszDriver)+1)*sizeof(WCHAR)); + RegCloseKey(sources); + + RegDeleteTreeW(hkey, lpszDSN); + if ((ret = RegCreateKeyW(hkey, lpszDSN, &hkeydriver)) == ERROR_SUCCESS) + { + RegSetValueExW(sources, L"driver", 0, REG_SZ, (BYTE*)filename, (lstrlenW(filename)+1)*sizeof(WCHAR)); + RegCloseKey(hkeydriver); + } + } + RegCloseKey(hkey); + } + + if (ret != ERROR_SUCCESS) + push_error(ODBC_ERROR_REQUEST_FAILED, odbc_error_request_failed); + + return ret == ERROR_SUCCESS; } BOOL WINAPI SQLWriteDSNToIni(LPCSTR lpszDSN, LPCSTR lpszDriver) { - clear_errors(); - FIXME("%s %s\n", debugstr_a(lpszDSN), debugstr_a(lpszDriver)); - return TRUE; + BOOL ret = FALSE; + WCHAR *dsn, *driver; + + TRACE("%s %s\n", debugstr_a(lpszDSN), debugstr_a(lpszDriver)); + + dsn = SQLInstall_strdup(lpszDSN); + driver = SQLInstall_strdup(lpszDriver); + if (dsn && driver) + ret = SQLWriteDSNToIniW(dsn, driver); + else + push_error(ODBC_ERROR_OUT_OF_MEM, odbc_error_out_of_mem); + + heap_free(dsn); + heap_free(driver); + + return ret; } BOOL WINAPI SQLWriteFileDSNW(LPCWSTR lpszFileName, LPCWSTR lpszAppName, diff --git a/dlls/odbccp32/tests/misc.c b/dlls/odbccp32/tests/misc.c index 0120504227d..f52dcee7acd 100644 --- a/dlls/odbccp32/tests/misc.c +++ b/dlls/odbccp32/tests/misc.c @@ -771,6 +771,113 @@ static void test_SQLConfigDataSource(void) check_error(ODBC_ERROR_COMPONENT_NOT_FOUND); } +static void test_SQLWriteDSNToIni(void) +{ + BOOL ret; + char buffer[MAX_PATH]; + char path[MAX_PATH]; + DWORD type, size; + + SQLSetConfigMode(ODBC_SYSTEM_DSN); + + ret = SQLWriteDSNToIni("wine_dbs", "SQL Server"); + if (!ret) + { + win_skip("Doesn't have permission to write a System DSN\n"); + return; + } + + if(ret) + { + HKEY hkey; + LONG res; + + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\ODBC\\ODBC.INI\\ODBC Data Sources", 0, + KEY_READ, &hkey); + ok(res == ERROR_SUCCESS, "RegOpenKeyExW failed\n"); + if (res == ERROR_SUCCESS) + { + type = 0xdeadbeef; + size = MAX_PATH; + + memset(buffer, 0, sizeof(buffer)); + res = RegQueryValueExA(hkey, "wine_dbs", NULL, &type, (BYTE *)buffer, &size); + ok(res == ERROR_SUCCESS, "RegGetValueA failed\n"); + ok(type == REG_SZ, "got %u\n", type); + ok(!strcmp(buffer, "SQL Server"), "incorrect string '%s'\n", buffer); + + RegCloseKey(hkey); + } + + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\ODBC\\ODBC.INI\\wine_dbs", 0, + KEY_READ, &hkey); + ok(res == ERROR_SUCCESS, "RegOpenKeyExW failed\n"); + if (res == ERROR_SUCCESS) + { + type = 0xdeadbeef; + size = MAX_PATH; + + memset(path, 0, sizeof(path)); + res = RegQueryValueExA(hkey, "driver", NULL, &type, (BYTE *)path, &size); + ok(res == ERROR_SUCCESS, "RegGetValueA failed\n"); + ok(type == REG_SZ, "got %u\n", type); + /* WINE doesn't have a 'SQL Server' driver available */ + todo_wine ok(strlen(path) != 0, "Invalid value\n"); + + RegCloseKey(hkey); + } + + ret = SQLRemoveDSNFromIni("wine_dbs"); + ok(ret, "got %d\n", ret); + } + + /* Show that values are writen, even though an invalid driver was specified. */ + ret = SQLWriteDSNToIni("wine_mis", "Missing Access Driver (*.mis)"); + ok(ret, "got %d\n", ret); + if(ret) + { + HKEY hkey; + LONG res; + + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\ODBC\\ODBC.INI\\ODBC Data Sources", 0, + KEY_READ, &hkey); + ok(res == ERROR_SUCCESS, "RegOpenKeyExW failed\n"); + if (res == ERROR_SUCCESS) + { + type = 0xdeadbeef; + size = MAX_PATH; + + memset(buffer, 0, sizeof(buffer)); + res = RegQueryValueExA(hkey, "wine_mis", NULL, &type, (BYTE *)buffer, &size); + ok(res == ERROR_SUCCESS, "RegGetValueA failed\n"); + ok(type == REG_SZ, "got %u\n", type); + ok(!strcmp(buffer, "Missing Access Driver (*.mis)"), "incorrect string '%s'\n", buffer); + + RegCloseKey(hkey); + } + + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\ODBC\\ODBC.INI\\wine_mis", 0, + KEY_READ, &hkey); + ok(res == ERROR_SUCCESS, "RegOpenKeyExW failed\n"); + if (res == ERROR_SUCCESS) + { + type = 0xdeadbeef; + size = MAX_PATH; + + memset(path, 0, sizeof(path)); + res = RegQueryValueExA(hkey, "driver", NULL, &type, (BYTE *)path, &size); + ok(res == ERROR_SUCCESS, "RegGetValueA failed\n"); + ok(type == REG_SZ, "got %u\n", type); + ok(strlen(path) == 0, "Invalid value\n"); + + RegCloseKey(hkey); + } + + ret = SQLRemoveDSNFromIni("wine_mis"); + ok(ret, "got %d\n", ret); + } +} + START_TEST(misc) { test_SQLConfigMode(); @@ -785,4 +892,5 @@ START_TEST(misc) test_SQLValidDSN(); test_SQLValidDSNW(); test_SQLConfigDataSource(); + test_SQLWriteDSNToIni(); }

1 0

Henri Verbeet : wined3d: Introduce a backup path for swapchain presents using GDI.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: e6fab0bcba6f233d722500e25c32876dd0c22cc5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e6fab0bcba6f233d722500e2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 19 21:31:11 2021 +0100 wined3d: Introduce a backup path for swapchain presents using GDI. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 70418f69dd49da5625bb1893d9fc2bef3fe97b5e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/swapchain.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 1671abb698d..180f724b5cb 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -400,6 +400,73 @@ HRESULT CDECL wined3d_swapchain_get_gamma_ramp(const struct wined3d_swapchain *s return WINED3D_OK; } +/* The is a fallback for cases where we e.g. can't create a GL context or + * Vulkan swapchain for the swapchain window. */ +static void swapchain_blit_gdi(struct wined3d_swapchain *swapchain, + struct wined3d_context *context, const RECT *src_rect, const RECT *dst_rect) +{ + struct wined3d_texture *back_buffer = swapchain->back_buffers[0]; + D3DKMT_DESTROYDCFROMMEMORY destroy_desc; + D3DKMT_CREATEDCFROMMEMORY create_desc; + const struct wined3d_format *format; + unsigned int row_pitch, slice_pitch; + HDC src_dc, dst_dc; + NTSTATUS status; + HBITMAP bitmap; + + static unsigned int once; + + TRACE("swapchain %p, context %p, src_rect %s, dst_rect %s.\n", + swapchain, context, wine_dbgstr_rect(src_rect), wine_dbgstr_rect(dst_rect)); + + if (!once++) + FIXME("Using GDI present.\n"); + + format = back_buffer->resource.format; + if (!format->ddi_format) + { + WARN("Cannot create a DC for format %s.\n", debug_d3dformat(format->id)); + return; + } + + wined3d_texture_load_location(back_buffer, 0, context, WINED3D_LOCATION_SYSMEM); + wined3d_texture_get_pitch(back_buffer, 0, &row_pitch, &slice_pitch); + + create_desc.pMemory = back_buffer->resource.heap_memory; + create_desc.Format = format->ddi_format; + create_desc.Width = wined3d_texture_get_level_width(back_buffer, 0); + create_desc.Height = wined3d_texture_get_level_height(back_buffer, 0); + create_desc.Pitch = row_pitch; + create_desc.hDeviceDc = CreateCompatibleDC(NULL); + create_desc.pColorTable = NULL; + + status = D3DKMTCreateDCFromMemory(&create_desc); + DeleteDC(create_desc.hDeviceDc); + if (status) + { + WARN("Failed to create DC, status %#x.\n", status); + return; + } + + src_dc = create_desc.hDc; + bitmap = create_desc.hBitmap; + + TRACE("Created source DC %p, bitmap %p for backbuffer %p.\n", src_dc, bitmap, back_buffer); + + if (!(dst_dc = GetDCEx(swapchain->win_handle, 0, DCX_USESTYLE | DCX_CACHE))) + ERR("Failed to get destination DC.\n"); + + if (!BitBlt(dst_dc, dst_rect->left, dst_rect->top, dst_rect->right - dst_rect->left, + dst_rect->bottom - dst_rect->top, src_dc, src_rect->left, src_rect->top, SRCCOPY)) + ERR("Failed to blit.\n"); + + ReleaseDC(swapchain->win_handle, dst_dc); + destroy_desc.hDc = src_dc; + destroy_desc.hBitmap = bitmap; + if ((status = D3DKMTDestroyDCFromMemory(&destroy_desc))) + ERR("Failed to destroy src dc, status %#x.\n", status); +} + /* A GL context is provided by the caller */ static void swapchain_blit(const struct wined3d_swapchain *swapchain, struct wined3d_context *context, const RECT *src_rect, const RECT *dst_rect) @@ -523,6 +590,9 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, TRACE("Presenting DC %p.\n", context_gl->dc); + if (context_gl->dc == swapchain_gl->backup_dc) + swapchain_blit_gdi(swapchain, context, src_rect, dst_rect); + if (!(render_to_fbo = swapchain->render_to_fbo) && (src_rect->left || src_rect->top || src_rect->right != desc->backbuffer_width @@ -1152,6 +1222,8 @@ static void swapchain_vk_present(struct wined3d_swapchain *swapchain, const RECT if (swapchain_vk->vk_swapchain) wined3d_swapchain_vk_blit(swapchain_vk, context_vk, src_rect, dst_rect, swap_interval); + else + swapchain_blit_gdi(swapchain, &context_vk->c, src_rect, dst_rect); wined3d_swapchain_vk_rotate(swapchain, context_vk);

1 0

Zhiyi Zhang : user32: Send a WM_ACTIVATE message after restoring a minimized top level window.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: 1fdf148c585d22142ec3b201f9de0a0b68a32644 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1fdf148c585d22142ec3b201… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Feb 10 14:33:27 2021 +0800 user32: Send a WM_ACTIVATE message after restoring a minimized top level window. The WmShowRestoreMinimizedOverlappedSeq message sequence in tests clearly show that there is a WM_ACTIVATE message at the end of ShowWindow() calls after restoring a minimized window, and it's not from SetFocus(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47507 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 3898ad408bb7ad50555ce6bce0fc02ab60eb5caf) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/tests/msg.c | 247 +++++++++++++++++++++++++++++++++++++++++++++++- dlls/user32/winpos.c | 8 +- 2 files changed, 253 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1fdf148c585d22142ec3…

1 0

Akihiro Sagawa : krnl386.exe: Cap GetFreeSpace value to 2GB.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: 0dc595d4e1ee612be0157bde8b27c7308b524091 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0dc595d4e1ee612be0157bde… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sat Feb 20 21:26:27 2021 +0900 krnl386.exe: Cap GetFreeSpace value to 2GB. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46962 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit eca2bfd071ea2142f5c4126badb5bcf923a9a655) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/krnl386.exe16/global.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/krnl386.exe16/global.c b/dlls/krnl386.exe16/global.c index e66007784ee..0a8da28e99b 100644 --- a/dlls/krnl386.exe16/global.c +++ b/dlls/krnl386.exe16/global.c @@ -750,7 +750,7 @@ DWORD WINAPI GetFreeSpace16( UINT16 wFlags ) { MEMORYSTATUS ms; GlobalMemoryStatus( &ms ); - return ms.dwAvailVirtual; + return min( ms.dwAvailVirtual, MAXLONG ); } /***********************************************************************

1 0

Michael Müller : ntdll: Implement NtQuerySystemInformation(SystemExtendedHandleInformation).
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: dc85e950179173dbf5d46dade570ff8671770e94 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc85e950179173dbf5d46dad… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Feb 17 22:59:15 2021 -0600 ntdll: Implement NtQuerySystemInformation(SystemExtendedHandleInformation). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 835f5fff7150034139919801444b52a4c0186f44) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/tests/info.c | 79 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/system.c | 50 ++++++++++++++++++++++++++++++ include/winternl.h | 20 ++++++++++++ 3 files changed, 149 insertions(+) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 4379d8a84c6..d003def5107 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -603,6 +603,84 @@ done: HeapFree( GetProcessHeap(), 0, shi); } +static void test_query_handle_ex(void) +{ + SYSTEM_HANDLE_INFORMATION_EX *info = malloc(sizeof(SYSTEM_HANDLE_INFORMATION_EX)); + ULONG size, expect_size; + NTSTATUS status; + unsigned int i; + HANDLE event; + BOOL found, ret; + + event = CreateEventA(NULL, FALSE, FALSE, NULL); + ok(event != NULL, "failed to create event, error %u\n", GetLastError()); + ret = SetHandleInformation(event, HANDLE_FLAG_INHERIT | HANDLE_FLAG_PROTECT_FROM_CLOSE, + HANDLE_FLAG_INHERIT | HANDLE_FLAG_PROTECT_FROM_CLOSE); + ok(ret, "got error %u\n", GetLastError()); + + size = 0; + status = pNtQuerySystemInformation(SystemExtendedHandleInformation, info, sizeof(SYSTEM_HANDLE_INFORMATION_EX), &size); + ok(status == STATUS_INFO_LENGTH_MISMATCH, "got %#x\n", status); + ok(size > sizeof(SYSTEM_HANDLE_INFORMATION_EX), "got size %u\n", size); + + while (status == STATUS_INFO_LENGTH_MISMATCH) + { + info = realloc(info, size); + status = pNtQuerySystemInformation(SystemExtendedHandleInformation, info, size, &size); + } + ok(!status, "got %#x\n", status); + expect_size = FIELD_OFFSET(SYSTEM_HANDLE_INFORMATION_EX, Handles[info->NumberOfHandles]); + ok(size == expect_size, "expected size %u, got %u\n", expect_size, size); + ok(info->NumberOfHandles > 1, "got %Iu handles\n", info->NumberOfHandles); + + found = FALSE; + for (i = 0; i < info->NumberOfHandles; ++i) + { + if (info->Handles[i].UniqueProcessId == GetCurrentProcessId() + && (HANDLE)info->Handles[i].HandleValue == event) + { + todo_wine ok(info->Handles[i].HandleAttributes == (OBJ_INHERIT | OBJ_PROTECT_CLOSE), + "got flags %#x\n", info->Handles[i].HandleAttributes); + ok(info->Handles[i].GrantedAccess == EVENT_ALL_ACCESS, "got access %#x\n", info->Handles[i].GrantedAccess); + found = TRUE; + } + ok(!info->Handles[i].CreatorBackTraceIndex, "got backtrace index %u\n", info->Handles[i].CreatorBackTraceIndex); + } + ok(found, "event handle not found\n"); + + ret = SetHandleInformation(event, HANDLE_FLAG_PROTECT_FROM_CLOSE, 0); + ok(ret, "got error %u\n", GetLastError()); + CloseHandle(event); + + status = pNtQuerySystemInformation(SystemExtendedHandleInformation, info, size, &size); + while (status == STATUS_INFO_LENGTH_MISMATCH) + { + info = realloc(info, size); + status = pNtQuerySystemInformation(SystemExtendedHandleInformation, info, size, &size); + } + ok(!status, "got %#x\n", status); + expect_size = FIELD_OFFSET(SYSTEM_HANDLE_INFORMATION_EX, Handles[info->NumberOfHandles]); + ok(size == expect_size, "expected size %u, got %u\n", expect_size, size); + ok(info->NumberOfHandles > 1, "got %Iu handles\n", info->NumberOfHandles); + + found = FALSE; + for (i = 0; i < info->NumberOfHandles; ++i) + { + if (info->Handles[i].UniqueProcessId == GetCurrentProcessId() + && (HANDLE)info->Handles[i].HandleValue == event) + { + found = TRUE; + break; + } + } + ok(!found, "event handle found\n"); + + status = pNtQuerySystemInformation(SystemExtendedHandleInformation, NULL, sizeof(SYSTEM_HANDLE_INFORMATION_EX), &size); + ok( status == STATUS_ACCESS_VIOLATION, "Expected STATUS_ACCESS_VIOLATION, got %08x\n", status ); + + free(info); +} + static void test_query_cache(void) { NTSTATUS status; @@ -2762,6 +2840,7 @@ START_TEST(info) test_query_procperf(); test_query_module(); test_query_handle(); + test_query_handle_ex(); test_query_cache(); test_query_interrupt(); test_time_adjustment(); diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index a889b2e020c..e2482f91041 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -2461,6 +2461,56 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, break; } + case SystemExtendedHandleInformation: + { + struct handle_info *handle_info; + DWORD i, num_handles; + + if (size < sizeof(SYSTEM_HANDLE_INFORMATION_EX)) + { + ret = STATUS_INFO_LENGTH_MISMATCH; + break; + } + + if (!info) + { + ret = STATUS_ACCESS_VIOLATION; + break; + } + + num_handles = (size - FIELD_OFFSET( SYSTEM_HANDLE_INFORMATION_EX, Handles )) + / sizeof(SYSTEM_HANDLE_TABLE_ENTRY_INFO_EX); + if (!(handle_info = malloc( sizeof(*handle_info) * num_handles ))) return STATUS_NO_MEMORY; + + SERVER_START_REQ( get_system_handles ) + { + wine_server_set_reply( req, handle_info, sizeof(*handle_info) * num_handles ); + if (!(ret = wine_server_call( req ))) + { + SYSTEM_HANDLE_INFORMATION_EX *shi = info; + shi->NumberOfHandles = wine_server_reply_size( req ) / sizeof(*handle_info); + len = FIELD_OFFSET( SYSTEM_HANDLE_INFORMATION_EX, Handles[shi->NumberOfHandles] ); + for (i = 0; i < shi->NumberOfHandles; i++) + { + memset( &shi->Handles[i], 0, sizeof(shi->Handles[i]) ); + shi->Handles[i].UniqueProcessId = handle_info[i].owner; + shi->Handles[i].HandleValue = handle_info[i].handle; + shi->Handles[i].GrantedAccess = handle_info[i].access; + /* FIXME: Fill out Object, HandleAttributes, ObjectTypeIndex */ + } + } + else if (ret == STATUS_BUFFER_TOO_SMALL) + { + len = FIELD_OFFSET( SYSTEM_HANDLE_INFORMATION_EX, Handles[reply->count] ); + ret = STATUS_INFO_LENGTH_MISMATCH; + } + } + SERVER_END_REQ; + + free( handle_info ); + break; + } + case SystemCacheInformation: { SYSTEM_CACHE_INFORMATION sci = { 0 }; diff --git a/include/winternl.h b/include/winternl.h index a7b0e04aade..41d871e9bc6 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1867,6 +1867,25 @@ typedef struct _SYSTEM_HANDLE_INFORMATION { SYSTEM_HANDLE_ENTRY Handle[1]; } SYSTEM_HANDLE_INFORMATION, *PSYSTEM_HANDLE_INFORMATION; +typedef struct _SYSTEM_HANDLE_TABLE_ENTRY_INFO_EX +{ + void *Object; + ULONG_PTR UniqueProcessId; + ULONG_PTR HandleValue; + ULONG GrantedAccess; + USHORT CreatorBackTraceIndex; + USHORT ObjectTypeIndex; + ULONG HandleAttributes; + ULONG Reserved; +} SYSTEM_HANDLE_TABLE_ENTRY_INFO_EX; + +typedef struct _SYSTEM_HANDLE_INFORMATION_EX +{ + ULONG_PTR NumberOfHandles; + ULONG_PTR Reserved; + SYSTEM_HANDLE_TABLE_ENTRY_INFO_EX Handles[1]; +} SYSTEM_HANDLE_INFORMATION_EX; + /* System Information Class 0x15 */ typedef struct _SYSTEM_CACHE_INFORMATION { @@ -2244,6 +2263,7 @@ typedef struct _RTL_HANDLE_TABLE #define LOGONID_CURRENT ((ULONG)-1) +#define OBJ_PROTECT_CLOSE 0x00000001 #define OBJ_INHERIT 0x00000002 #define OBJ_PERMANENT 0x00000010 #define OBJ_EXCLUSIVE 0x00000020

1 0

Gijs Vermeulen : msvcirt: Implement remainder of fstream class.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: c3674b30f26095169c47f06228fd1073c68f074e URL: https://source.winehq.org/git/wine.git/?a=commit;h=c3674b30f26095169c47f062… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Sun Feb 21 18:05:02 2021 +0100 msvcirt: Implement remainder of fstream class. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 4981785f0fbcafbdc6a9dc4f71d06b137d558597) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 157 +++++++++++++++++ dlls/msvcirt/msvcirt.spec | 52 +++--- dlls/msvcirt/tests/msvcirt.c | 397 ++++++++++++++++++++++++++++++++++++++++++- dlls/msvcrt20/msvcrt20.spec | 52 +++--- dlls/msvcrt40/msvcrt40.spec | 52 +++--- 5 files changed, 625 insertions(+), 85 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c3674b30f26095169c47…

1 0

← Newer
1
...
62
63
64
65
66
67
68
...
82
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 June 2021