wine-devel

wine-devel@winehq.org

5 participants
84465 discussions

[PATCH v2 2/7] wbemprox: Add RegisterdUser property to Win32_Operatingsystem.
by Hans Leidekker 28 Apr '22

28 Apr '22

From: Louis Lenders <xerox.xerox2000x(a)gmail.com> v2: Use a shared helper to get the registry value. Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=52887 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/builtin.c | 27 ++++++++++++++++++++++----- dlls/wbemprox/tests/query.c | 1 + 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 93b26c23dd3..5c53aae8d3b 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -250,6 +250,7 @@ static const struct column col_operatingsystem[] = { L"OSType", CIM_UINT16 }, { L"Primary", CIM_BOOLEAN }, { L"ProductType", CIM_UINT32 }, + { L"RegisteredUser", CIM_STRING|COL_FLAG_DYNAMIC }, { L"SerialNumber", CIM_STRING|COL_FLAG_DYNAMIC }, { L"ServicePackMajorVersion", CIM_UINT16 }, { L"ServicePackMinorVersion", CIM_UINT16 }, @@ -682,6 +683,7 @@ struct record_operatingsystem UINT16 ostype; int primary; UINT32 producttype; + const WCHAR *registereduser; const WCHAR *serialnumber; UINT16 servicepackmajor; UINT16 servicepackminor; @@ -3571,27 +3573,35 @@ static WCHAR *get_osname( const WCHAR *caption ) memcpy( ret + len, partitionW, sizeof(partitionW) ); return ret; } -static WCHAR *get_osserialnumber(void) + +static WCHAR *get_reg_str( HKEY root, const WCHAR *path, const WCHAR *value ) { HKEY hkey = 0; DWORD size, type; WCHAR *ret = NULL; - if (!RegOpenKeyExW( HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Windows NT\\CurrentVersion", 0, KEY_READ, &hkey ) && - !RegQueryValueExW( hkey, L"ProductId", NULL, &type, NULL, &size ) && type == REG_SZ && + if (!RegOpenKeyExW( root, path, 0, KEY_READ, &hkey ) && + !RegQueryValueExW( hkey, value, NULL, &type, NULL, &size ) && type == REG_SZ && (ret = malloc( size + sizeof(WCHAR) ))) { size += sizeof(WCHAR); - if (RegQueryValueExW( hkey, L"ProductId", NULL, NULL, (BYTE *)ret, &size )) + if (RegQueryValueExW( hkey, value, NULL, NULL, (BYTE *)ret, &size )) { free( ret ); ret = NULL; } } if (hkey) RegCloseKey( hkey ); - if (!ret) return wcsdup( L"12345-OEM-1234567-12345" ); return ret; } + +static WCHAR *get_osserialnumber(void) +{ + WCHAR *ret = get_reg_str( HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Windows NT\\CurrentVersion", L"ProductId" ); + if (!ret) ret = wcsdup( L"12345-OEM-1234567-12345" ); + return ret; +} + static WCHAR *get_osversion( OSVERSIONINFOEXW *ver ) { WCHAR *ret = malloc( 33 * sizeof(WCHAR) ); @@ -3604,6 +3614,12 @@ static DWORD get_operatingsystemsku(void) GetProductInfo( 6, 0, 0, 0, &ret ); return ret; } + +static WCHAR *get_registereduser(void) +{ + return get_reg_str( HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Windows NT\\CurrentVersion", L"RegisteredOwner" ); +} + static INT16 get_currenttimezone(void) { TIME_ZONE_INFORMATION info; @@ -3648,6 +3664,7 @@ static enum fill_status fill_operatingsystem( struct table *table, const struct rec->ostype = 18; /* WINNT */ rec->primary = -1; rec->producttype = 1; + rec->registereduser = get_registereduser(); rec->serialnumber = get_osserialnumber(); rec->servicepackmajor = ver.wServicePackMajor; rec->servicepackminor = ver.wServicePackMinor; diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 865d1b6136a..7cca770ffc7 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1430,6 +1430,7 @@ static void test_Win32_OperatingSystem( IWbemServices *services ) check_property( obj, L"Manufacturer", VT_BSTR, CIM_STRING ); check_property( obj, L"OSType", VT_I4, CIM_UINT16 ); check_property( obj, L"ProductType", VT_I4, CIM_UINT32 ); + check_property( obj, L"RegisteredUser", VT_BSTR, CIM_STRING ); check_property( obj, L"ServicePackMajorVersion", VT_I4, CIM_UINT16 ); check_property( obj, L"ServicePackMinorVersion", VT_I4, CIM_UINT16 ); check_property( obj, L"SuiteMask", VT_I4, CIM_UINT32 ); -- 2.30.2

1 0

[PATCH v2 1/7] wbemprox: Add BuildType property to Win32_OperatingSystem.
by Hans Leidekker 28 Apr '22

28 Apr '22

From: Louis Lenders <xerox.xerox2000x(a)gmail.com> Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=52887 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/builtin.c | 3 +++ dlls/wbemprox/tests/query.c | 1 + 2 files changed, 4 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 69d74d756f8..93b26c23dd3 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -229,6 +229,7 @@ static const struct column col_networkadapterconfig[] = static const struct column col_operatingsystem[] = { { L"BuildNumber", CIM_STRING|COL_FLAG_DYNAMIC }, + { L"BuildType", CIM_STRING }, { L"Caption", CIM_STRING|COL_FLAG_DYNAMIC }, { L"CodeSet", CIM_STRING|COL_FLAG_DYNAMIC }, { L"CountryCode", CIM_STRING|COL_FLAG_DYNAMIC }, @@ -660,6 +661,7 @@ struct record_networkadapterconfig struct record_operatingsystem { const WCHAR *buildnumber; + const WCHAR *buildtype; const WCHAR *caption; const WCHAR *codeset; const WCHAR *countrycode; @@ -3625,6 +3627,7 @@ static enum fill_status fill_operatingsystem( struct table *table, const struct rec = (struct record_operatingsystem *)table->data; rec->buildnumber = get_osbuildnumber( &ver ); + rec->buildtype = L"Wine build"; rec->caption = get_oscaption( &ver ); rec->codeset = get_codeset(); rec->countrycode = get_countrycode(); diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index e0fe78b7fd1..865d1b6136a 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1389,6 +1389,7 @@ static void test_Win32_OperatingSystem( IWbemServices *services ) ok( hr == S_OK, "got %#lx\n", hr ); check_property( obj, L"BuildNumber", VT_BSTR, CIM_STRING ); + check_property( obj, L"BuildType", VT_BSTR, CIM_STRING ); check_property( obj, L"Caption", VT_BSTR, CIM_STRING ); type = 0xdeadbeef; -- 2.30.2

1 0

[PATCH 1/5] kernel32/tests: Add some HEAP_NO_SERIALIZE flag / LFH locking tests.
by Rémi Bernon 28 Apr '22

28 Apr '22

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/kernel32/tests/heap.c | 202 ++++++++++++++++++++++++++++++++++++- 1 file changed, 201 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index fded1c69f1e..28cbee6ea83 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -88,18 +88,76 @@ struct heap }; +struct heap_thread_params +{ + HANDLE ready_event; + HANDLE start_event; + BOOL done; + + HANDLE heap; + DWORD flags; + BOOL lock; +}; + +DWORD WINAPI heap_thread_proc( void *arg ) +{ + struct heap_thread_params *params = arg; + void *ptr; + DWORD res; + BOOL ret; + + SetEvent( params->ready_event ); + + while (!(res = WaitForSingleObject( params->start_event, INFINITE )) && !params->done) + { + if (params->lock) + { + ret = HeapLock( params->heap ); + ok( ret, "HeapLock failed, error %lu\n", GetLastError() ); + } + + ptr = HeapAlloc( params->heap, params->flags, 0 ); + ok( !!ptr, "HeapAlloc failed, error %lu\n", GetLastError() ); + ret = HeapFree( params->heap, params->flags, ptr ); + ok( ret, "HeapFree failed, error %lu\n", GetLastError() ); + + if (params->lock) + { + ret = HeapUnlock( params->heap ); + ok( ret, "HeapUnlock failed, error %lu\n", GetLastError() ); + } + + SetEvent( params->ready_event ); + } + ok( !res, "WaitForSingleObject returned %#lx, error %lu\n", res, GetLastError() ); + + return 0; +} + + static void test_HeapCreate(void) { static const BYTE buffer[512] = {0}; SIZE_T alloc_size = 0x8000 * sizeof(void *), size, i; + struct heap_thread_params thread_params = {0}; PROCESS_HEAP_ENTRY entry, entries[256]; - HANDLE heap, heap1, heaps[8]; + HANDLE heap, heap1, heaps[8], thread; BYTE *ptr, *ptr1, *ptrs[128]; DWORD heap_count, count; ULONG compat_info; UINT_PTR align; + DWORD res; BOOL ret; + thread_params.ready_event = CreateEventW( NULL, FALSE, FALSE, NULL ); + ok( !!thread_params.ready_event, "CreateEventW failed, error %lu\n", GetLastError() ); + thread_params.start_event = CreateEventW( NULL, FALSE, FALSE, NULL ); + ok( !!thread_params.start_event, "CreateEventW failed, error %lu\n", GetLastError() ); + thread = CreateThread( NULL, 0, heap_thread_proc, &thread_params, 0, NULL ); + ok( !!thread, "CreateThread failed, error %lu\n", GetLastError() ); + res = WaitForSingleObject( thread_params.ready_event, INFINITE ); + ok( !res, "WaitForSingleObject returned %#lx, error %lu\n", res, GetLastError() ); + heap_count = GetProcessHeaps( 0, NULL ); ok( heap_count <= 6, "GetProcessHeaps returned %lu\n", heap_count ); @@ -879,6 +937,148 @@ static void test_HeapCreate(void) ret = HeapDestroy( heap ); ok( ret, "HeapDestroy failed, error %lu\n", GetLastError() ); + + + /* check HEAP_NO_SERIALIZE HeapCreate flag effect */ + + heap = HeapCreate( HEAP_NO_SERIALIZE, 0, 0 ); + ok( !!heap, "HeapCreate failed, error %lu\n", GetLastError() ); + ok( !((ULONG_PTR)heap & 0xffff), "wrong heap alignment\n" ); + + ret = HeapLock( heap ); + ok( ret, "HeapLock failed, error %lu\n", GetLastError() ); + thread_params.heap = heap; + thread_params.lock = TRUE; + thread_params.flags = 0; + SetEvent( thread_params.start_event ); + res = WaitForSingleObject( thread_params.ready_event, 100 ); + todo_wine + ok( !res, "WaitForSingleObject returned %#lx, error %lu\n", res, GetLastError() ); + ret = HeapUnlock( heap ); + ok( ret, "HeapUnlock failed, error %lu\n", GetLastError() ); + if (res) WaitForSingleObject( thread_params.ready_event, 100 ); + + ret = HeapLock( heap ); + ok( ret, "HeapLock failed, error %lu\n", GetLastError() ); + thread_params.heap = heap; + thread_params.lock = FALSE; + thread_params.flags = 0; + SetEvent( thread_params.start_event ); + res = WaitForSingleObject( thread_params.ready_event, 100 ); + ok( !res, "WaitForSingleObject returned %#lx, error %lu\n", res, GetLastError() ); + ret = HeapUnlock( heap ); + ok( ret, "HeapUnlock failed, error %lu\n", GetLastError() ); + + ret = HeapDestroy( heap ); + ok( ret, "HeapDestroy failed, error %lu\n", GetLastError() ); + + + /* check HEAP_NO_SERIALIZE HeapAlloc / HeapFree flag effect */ + + heap = HeapCreate( 0, 0, 0 ); + ok( !!heap, "HeapCreate failed, error %lu\n", GetLastError() ); + ok( !((ULONG_PTR)heap & 0xffff), "wrong heap alignment\n" ); + + ret = HeapLock( heap ); + ok( ret, "HeapLock failed, error %lu\n", GetLastError() ); + thread_params.heap = heap; + thread_params.lock = TRUE; + thread_params.flags = 0; + SetEvent( thread_params.start_event ); + res = WaitForSingleObject( thread_params.ready_event, 100 ); + ok( res == WAIT_TIMEOUT, "WaitForSingleObject returned %#lx, error %lu\n", res, GetLastError() ); + ret = HeapUnlock( heap ); + ok( ret, "HeapUnlock failed, error %lu\n", GetLastError() ); + res = WaitForSingleObject( thread_params.ready_event, 100 ); + ok( !res, "WaitForSingleObject returned %#lx, error %lu\n", res, GetLastError() ); + + ret = HeapLock( heap ); + ok( ret, "HeapLock failed, error %lu\n", GetLastError() ); + thread_params.heap = heap; + thread_params.lock = FALSE; + thread_params.flags = 0; + SetEvent( thread_params.start_event ); + res = WaitForSingleObject( thread_params.ready_event, 100 ); + ok( res == WAIT_TIMEOUT, "WaitForSingleObject returned %#lx, error %lu\n", res, GetLastError() ); + ret = HeapUnlock( heap ); + ok( ret, "HeapUnlock failed, error %lu\n", GetLastError() ); + res = WaitForSingleObject( thread_params.ready_event, 100 ); + ok( !res, "WaitForSingleObject returned %#lx, error %lu\n", res, GetLastError() ); + + ret = HeapLock( heap ); + ok( ret, "HeapLock failed, error %lu\n", GetLastError() ); + thread_params.heap = heap; + thread_params.lock = FALSE; + thread_params.flags = HEAP_NO_SERIALIZE; + SetEvent( thread_params.start_event ); + res = WaitForSingleObject( thread_params.ready_event, 100 ); + ok( !res, "WaitForSingleObject returned %#lx, error %lu\n", res, GetLastError() ); + ret = HeapUnlock( heap ); + ok( ret, "HeapUnlock failed, error %lu\n", GetLastError() ); + + ret = HeapDestroy( heap ); + ok( ret, "HeapDestroy failed, error %lu\n", GetLastError() ); + + + /* check LFH heap locking */ + + heap = HeapCreate( 0, 0, 0 ); + ok( !!heap, "HeapCreate failed, error %lu\n", GetLastError() ); + ok( !((ULONG_PTR)heap & 0xffff), "wrong heap alignment\n" ); + + ret = pHeapQueryInformation( heap, HeapCompatibilityInformation, &compat_info, sizeof(compat_info), &size ); + ok( ret, "HeapQueryInformation failed, error %lu\n", GetLastError() ); + ok( compat_info == 0, "got HeapCompatibilityInformation %lu\n", compat_info ); + + for (i = 0; i < 0x12; i++) ptrs[i] = pHeapAlloc( heap, 0, 0 ); + for (i = 0; i < 0x12; i++) HeapFree( heap, 0, ptrs[i] ); + + ret = pHeapQueryInformation( heap, HeapCompatibilityInformation, &compat_info, sizeof(compat_info), &size ); + ok( ret, "HeapQueryInformation failed, error %lu\n", GetLastError() ); + todo_wine + ok( compat_info == 2, "got HeapCompatibilityInformation %lu\n", compat_info ); + + /* locking is serialized */ + + ret = HeapLock( heap ); + ok( ret, "HeapLock failed, error %lu\n", GetLastError() ); + thread_params.heap = heap; + thread_params.lock = TRUE; + thread_params.flags = 0; + SetEvent( thread_params.start_event ); + res = WaitForSingleObject( thread_params.ready_event, 100 ); + ok( res == WAIT_TIMEOUT, "WaitForSingleObject returned %#lx, error %lu\n", res, GetLastError() ); + ret = HeapUnlock( heap ); + ok( ret, "HeapUnlock failed, error %lu\n", GetLastError() ); + res = WaitForSingleObject( thread_params.ready_event, 100 ); + ok( !res, "WaitForSingleObject returned %#lx, error %lu\n", res, GetLastError() ); + + /* but allocation is not */ + + ret = HeapLock( heap ); + ok( ret, "HeapLock failed, error %lu\n", GetLastError() ); + thread_params.heap = heap; + thread_params.lock = FALSE; + thread_params.flags = 0; + SetEvent( thread_params.start_event ); + res = WaitForSingleObject( thread_params.ready_event, 100 ); + todo_wine + ok( !res, "WaitForSingleObject returned %#lx, error %lu\n", res, GetLastError() ); + ret = HeapUnlock( heap ); + ok( ret, "HeapUnlock failed, error %lu\n", GetLastError() ); + if (res) res = WaitForSingleObject( thread_params.ready_event, 100 ); + + ret = HeapDestroy( heap ); + ok( ret, "HeapDestroy failed, error %lu\n", GetLastError() ); + + + thread_params.done = TRUE; + SetEvent( thread_params.start_event ); + res = WaitForSingleObject( thread, INFINITE ); + ok( !res, "WaitForSingleObject returned %#lx, error %lu\n", res, GetLastError() ); + CloseHandle( thread_params.start_event ); + CloseHandle( thread_params.ready_event ); + CloseHandle( thread ); } -- 2.35.1

1 4

[PATCH 0/16] MR10: use OEM code page for output
by eric pouech (＠epo) 28 Apr '22

28 Apr '22

review and fix the logic when writing text oriented output in programs/* - some where using GetConsoleCP() or GetConsoleOutputCP() if WriteConsoleW fails; this is wrong as if WriteConsole failed, then it could mean that program isn't attached to a console (or here running under shell-no-window)... Luckily, in these cases, the returned value by GetConsole*CP() is 0, and CP_ACP is also 0... but it's likely not what was expected at first glance - testing under windows shows that it's rather GetOEMCP() which is used in those cases - simplified some code and checked for allocation failure where missing Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> -- This merge request has too many patches to be relayed via email. Please visit the URL below to see the contents of the merge request. https://gitlab.winehq.org/wine/wine/-/merge_requests/10

1 0

[PATCH 3/3] opengl32/tests: Test wglCopyContext().
by Zhiyi Zhang 28 Apr '22

28 Apr '22

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/opengl32/tests/opengl.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 8b0e70ccf9c..f5ce9e6f983 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -1820,6 +1820,26 @@ static void test_wglChoosePixelFormatARB(HDC hdc) } } +static void test_copy_context(HDC hdc) +{ + HGLRC ctx, ctx2; + BOOL ret; + + ctx = wglCreateContext(hdc); + ok(!!ctx, "Failed to create GL context, last error %#lx.\n", GetLastError()); + ctx2 = wglCreateContext(hdc); + ok(!!ctx2, "Failed to create GL context, last error %#lx.\n", GetLastError()); + + ret = wglCopyContext(ctx, ctx2, GL_ALL_ATTRIB_BITS); + todo_wine + ok(ret, "Failed to copy GL context, last error %#lx.\n", GetLastError()); + + ret = wglDeleteContext(ctx2); + ok(ret, "Failed to delete GL context, last error %#lx.\n", GetLastError()); + ret = wglDeleteContext(ctx); + ok(ret, "Failed to delete GL context, last error %#lx.\n", GetLastError()); +} + START_TEST(opengl) { HWND hwnd; @@ -1905,6 +1925,7 @@ START_TEST(opengl) test_getprocaddress(hdc); test_deletecontext(hwnd, hdc); test_makecurrent(hdc); + test_copy_context(hdc); /* The lack of wglGetExtensionsStringARB in general means broken software rendering or the lack of decent OpenGL support, skip tests in such cases */ if (!pwglGetExtensionsStringARB) -- 2.32.0

1 0

[PATCH 2/3] winex11.drv: Lock display when expecting error events.
by Zhiyi Zhang 28 Apr '22

28 Apr '22

If the display is not locked, another thread could take the error event and handle it with the default error handlers and thus not handled by the current thread with the specified error handlers. Fix Cladun X2 crash at start. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/bitblt.c | 4 ++-- dlls/winex11.drv/clipboard.c | 2 +- dlls/winex11.drv/graphics.c | 2 +- dlls/winex11.drv/opengl.c | 6 +++--- dlls/winex11.drv/wintab.c | 6 +++--- dlls/winex11.drv/x11drv.h | 2 +- dlls/winex11.drv/x11drv_main.c | 4 +++- dlls/winex11.drv/xrandr.c | 4 ++-- dlls/winex11.drv/xvidmode.c | 12 ++++++------ 9 files changed, 22 insertions(+), 20 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 550c5f06f37..1461e1430c5 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1369,7 +1369,7 @@ DWORD CDECL X11DRV_GetImage( PHYSDEV dev, BITMAPINFO *info, image = XGetImage( gdi_display, physdev->drawable, physdev->dc_rect.left + x, physdev->dc_rect.top + y, width, height, AllPlanes, ZPixmap ); - if (X11DRV_check_error()) + if (X11DRV_check_error( gdi_display )) { /* use a temporary pixmap to avoid the BadMatch error */ Pixmap pixmap = XCreatePixmap( gdi_display, root_window, width, height, vis.depth ); @@ -1807,7 +1807,7 @@ static XImage *create_shm_image( const XVisualInfo *vis, int width, int height, X11DRV_expect_error( gdi_display, xshm_error_handler, NULL ); ok = (XShmAttach( gdi_display, shminfo ) != 0); XSync( gdi_display, False ); - if (!X11DRV_check_error() && ok) + if (!X11DRV_check_error( gdi_display ) && ok) { image->data = shminfo->shmaddr; shmctl( shminfo->shmid, IPC_RMID, 0 ); diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 6baa87c5ce1..6d6ee485385 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -397,7 +397,7 @@ static void register_x11_formats( const Atom *atoms, UINT size ) X11DRV_expect_error( display, is_atom_error, NULL ); if (!XGetAtomNames( display, new_atoms, count, names )) count = 0; - if (X11DRV_check_error()) + if (X11DRV_check_error( display )) { WARN( "got some bad atoms, ignoring\n" ); count = 0; diff --git a/dlls/winex11.drv/graphics.c b/dlls/winex11.drv/graphics.c index 7ab358c43c1..39e420231e9 100644 --- a/dlls/winex11.drv/graphics.c +++ b/dlls/winex11.drv/graphics.c @@ -1471,7 +1471,7 @@ BOOL CDECL X11DRV_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color, UINT physDev->dc_rect.left + rect.left, physDev->dc_rect.top + rect.top, rect.right - rect.left, rect.bottom - rect.top, AllPlanes, ZPixmap ); - if(X11DRV_check_error()) image = NULL; + if(X11DRV_check_error( gdi_display )) image = NULL; if (!image) return FALSE; if (X11DRV_SetupGCForBrush( physDev )) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index fd6eea05fa6..2718575922b 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1230,7 +1230,7 @@ static BOOL set_swap_interval(GLXDrawable drawable, int interval) X11DRV_expect_error(gdi_display, GLXErrorHandler, NULL); pglXSwapIntervalEXT(gdi_display, drawable, interval); XSync(gdi_display, False); - ret = !X11DRV_check_error(); + ret = !X11DRV_check_error(gdi_display); break; case GLX_SWAP_CONTROL_MESA: @@ -1706,7 +1706,7 @@ static BOOL WINAPI glxdrv_wglCopyContext(struct wgl_context *src, struct wgl_con X11DRV_expect_error( gdi_display, GLXErrorHandler, NULL ); pglXCopyContext( gdi_display, src->ctx, dst->ctx, mask ); XSync( gdi_display, False ); - if (X11DRV_check_error()) + if (X11DRV_check_error( gdi_display )) { static unsigned int once; @@ -2085,7 +2085,7 @@ static struct wgl_context *X11DRV_wglCreateContextAttribsARB( HDC hdc, struct wg X11DRV_expect_error(gdi_display, GLXErrorHandler, NULL); ret->ctx = create_glxcontext(gdi_display, ret, hShareContext ? hShareContext->ctx : NULL); XSync(gdi_display, False); - if ((err = X11DRV_check_error()) || !ret->ctx) + if ((err = X11DRV_check_error(gdi_display)) || !ret->ctx) { /* In the future we should convert the GLX error to a win32 one here if needed */ WARN("Context creation failed (error %#x).\n", err); diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index 331601c3325..269a1daaa4d 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -589,7 +589,7 @@ BOOL CDECL X11DRV_LoadTabletInfo(HWND hwnddefault) X11DRV_expect_error(data->display, Tablet_ErrorHandler, NULL); opendevice = pXOpenDevice(data->display,target->id); - if (!X11DRV_check_error() && opendevice) + if (!X11DRV_check_error(data->display) && opendevice) { unsigned char map[32]; int i; @@ -597,7 +597,7 @@ BOOL CDECL X11DRV_LoadTabletInfo(HWND hwnddefault) X11DRV_expect_error(data->display,Tablet_ErrorHandler,NULL); cursor.BUTTONS = pXGetDeviceButtonMapping(data->display, opendevice, map, 32); - if (X11DRV_check_error() || cursor.BUTTONS <= 0) + if (X11DRV_check_error(data->display) || cursor.BUTTONS <= 0) { TRACE("No buttons, Non Tablet Device\n"); pXCloseDevice(data->display, opendevice); @@ -1086,7 +1086,7 @@ int CDECL X11DRV_AttachEventQueueToTablet(HWND hOwner) } } XSync(data->display, False); - X11DRV_check_error(); + X11DRV_check_error(data->display); if (NULL != devices) pXFreeDeviceList(devices); return 0; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index f6d28122fc3..bde92d2eb89 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -700,7 +700,7 @@ extern HWND *build_hwnd_list(void) DECLSPEC_HIDDEN; typedef int (*x11drv_error_callback)( Display *display, XErrorEvent *event, void *arg ); extern void X11DRV_expect_error( Display *display, x11drv_error_callback callback, void *arg ) DECLSPEC_HIDDEN; -extern int X11DRV_check_error(void) DECLSPEC_HIDDEN; +extern int X11DRV_check_error( Display *display ) DECLSPEC_HIDDEN; extern void X11DRV_X_to_window_rect( struct x11drv_win_data *data, RECT *rect, int x, int y, int cx, int cy ) DECLSPEC_HIDDEN; extern POINT virtual_screen_to_root( INT x, INT y ) DECLSPEC_HIDDEN; extern POINT root_to_virtual_screen( INT x, INT y ) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 6042f2522b5..296f1c4d036 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -246,6 +246,7 @@ static inline BOOL ignore_error( Display *display, XErrorEvent *event ) void X11DRV_expect_error( Display *display, x11drv_error_callback callback, void *arg ) { pthread_mutex_lock( &error_mutex ); + XLockDisplay( display ); err_callback = callback; err_callback_display = display; err_callback_arg = arg; @@ -260,10 +261,11 @@ void X11DRV_expect_error( Display *display, x11drv_error_callback callback, void * Check if an expected X11 error occurred; return non-zero if yes. * The caller is responsible for calling XSync first if necessary. */ -int X11DRV_check_error(void) +int X11DRV_check_error( Display *display ) { int res = err_callback_result; err_callback = NULL; + XUnlockDisplay( display ); pthread_mutex_unlock( &error_mutex ); return res; } diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index b0619c0abcd..81ecbc4b9a8 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -707,7 +707,7 @@ static BOOL get_gpu_properties_from_vulkan( struct gdi_gpu *gpu, const XRRProvid vr = pvkGetRandROutputDisplayEXT( vk_physical_devices[device_idx], gdi_display, provider_info->outputs[output_idx], &vk_display ); XSync( gdi_display, FALSE ); - if (X11DRV_check_error() || vr != VK_SUCCESS || vk_display == VK_NULL_HANDLE) + if (X11DRV_check_error( gdi_display ) || vr != VK_SUCCESS || vk_display == VK_NULL_HANDLE) continue; memset( &id, 0, sizeof(id) ); @@ -1652,7 +1652,7 @@ void X11DRV_XRandR_Init(void) if (!pXRRQueryExtension( gdi_display, &event_base, &error_base )) return; X11DRV_expect_error( gdi_display, XRandRErrorHandler, NULL ); ok = pXRRQueryVersion( gdi_display, &major, &minor ); - if (X11DRV_check_error() || !ok) return; + if (X11DRV_check_error( gdi_display ) || !ok) return; TRACE("Found XRandR %d.%d.\n", major, minor); diff --git a/dlls/winex11.drv/xvidmode.c b/dlls/winex11.drv/xvidmode.c index 126e2bf2a69..8adbb3ffb5d 100644 --- a/dlls/winex11.drv/xvidmode.c +++ b/dlls/winex11.drv/xvidmode.c @@ -125,7 +125,7 @@ static BOOL xf86vm_get_modes(ULONG_PTR id, DWORD flags, DEVMODEW **new_modes, UI X11DRV_expect_error(gdi_display, XVidModeErrorHandler, NULL); ret = pXF86VidModeGetAllModeLines(gdi_display, DefaultScreen(gdi_display), &xf86vm_mode_count, &xf86vm_modes); - if (X11DRV_check_error() || !ret || !xf86vm_mode_count) + if (X11DRV_check_error(gdi_display) || !ret || !xf86vm_mode_count) return FALSE; /* Put a XF86VidModeModeInfo ** at the start to store the XF86VidMode modes pointer */ @@ -195,7 +195,7 @@ static BOOL xf86vm_get_current_mode(ULONG_PTR id, DEVMODEW *mode) X11DRV_expect_error(gdi_display, XVidModeErrorHandler, NULL); ret = pXF86VidModeGetModeLine(gdi_display, DefaultScreen(gdi_display), &dotclock, &xf86vm_mode); - if (X11DRV_check_error() || !ret) + if (X11DRV_check_error(gdi_display) || !ret) return FALSE; mode->dmBitsPerPel = screen_bpp; @@ -235,7 +235,7 @@ static LONG xf86vm_set_current_mode(ULONG_PTR id, DEVMODEW *mode) memcpy(&xf86vm_mode, (BYTE *)mode + sizeof(*mode), sizeof(xf86vm_mode)); X11DRV_expect_error(gdi_display, XVidModeErrorHandler, NULL); ret = pXF86VidModeSwitchToMode(gdi_display, DefaultScreen(gdi_display), xf86vm_mode); - if (X11DRV_check_error() || !ret) + if (X11DRV_check_error(gdi_display) || !ret) return DISP_CHANGE_FAILED; #if 0 /* it is said that SetViewPort causes problems with some X servers */ pXF86VidModeSetViewPort(gdi_display, DefaultScreen(gdi_display), 0, 0); @@ -287,7 +287,7 @@ void X11DRV_XF86VM_Init(void) X11DRV_expect_error(gdi_display, XVidModeErrorHandler, NULL); ok = pXF86VidModeQueryVersion(gdi_display, &xf86vm_major, &xf86vm_minor); - if (X11DRV_check_error() || !ok) return; + if (X11DRV_check_error(gdi_display) || !ok) return; #ifdef X_XF86VidModeSetGammaRamp if (xf86vm_major > 2 || (xf86vm_major == 2 && xf86vm_minor >= 1)) @@ -295,7 +295,7 @@ void X11DRV_XF86VM_Init(void) X11DRV_expect_error(gdi_display, XVidModeErrorHandler, NULL); pXF86VidModeGetGammaRampSize(gdi_display, DefaultScreen(gdi_display), &xf86vm_gammaramp_size); - if (X11DRV_check_error()) xf86vm_gammaramp_size = 0; + if (X11DRV_check_error(gdi_display)) xf86vm_gammaramp_size = 0; TRACE("Gamma ramp size %d.\n", xf86vm_gammaramp_size); if (xf86vm_gammaramp_size >= GAMMA_RAMP_SIZE) xf86vm_use_gammaramp = TRUE; @@ -495,7 +495,7 @@ static BOOL xf86vm_set_gamma_ramp(struct x11drv_gamma_ramp *ramp) ret = pXF86VidModeSetGammaRamp(gdi_display, DefaultScreen(gdi_display), xf86vm_gammaramp_size, red, green, blue); if (ret) XSync( gdi_display, FALSE ); - if (X11DRV_check_error()) ret = FALSE; + if (X11DRV_check_error(gdi_display)) ret = FALSE; if (red != ramp->red) free(red); -- 2.32.0

1 0

[PATCH 1/3] winex11.drv: Handle X errors from glXCopyContext().
by Zhiyi Zhang 28 Apr '22

28 Apr '22

glxCopyContext() may throw X errors and cause the current process to exit. For example, Mesa doesn't support glxCopyContext() for direct rendering contexts and ends up using the code path for indirect rendering contexts. When Xorg receives such requests, it rejects them because they're for direct rendering contexts and reports an X error. We also can't use indirect rendering context because it needs to be explicitly enabled in xorg.conf and has poor performance. So handle this error before graphics drivers implement the support. Fix Cladun X2 crash at start. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- See also https://github.com/mesa3d/mesa/blob/main/src/glx/glxcmds.c#L658 glXCopyContext() and https://github.com/freedesktop/xorg-xserver/blob/master/glx/glxcmds.c#L843 __glXDisp_CopyContext(). dlls/winex11.drv/opengl.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 92555841f71..fd6eea05fa6 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1703,9 +1703,21 @@ static BOOL WINAPI glxdrv_wglCopyContext(struct wgl_context *src, struct wgl_con { TRACE("%p -> %p mask %#x\n", src, dst, mask); - pglXCopyContext(gdi_display, src->ctx, dst->ctx, mask); + X11DRV_expect_error( gdi_display, GLXErrorHandler, NULL ); + pglXCopyContext( gdi_display, src->ctx, dst->ctx, mask ); + XSync( gdi_display, False ); + if (X11DRV_check_error()) + { + static unsigned int once; + + if (!once++) + { + ERR("glXCopyContext failed. glXCopyContext() for direct rendering contexts not " + "implemented in the host graphics driver?\n"); + } + return FALSE; + } - /* As opposed to wglCopyContext, glXCopyContext doesn't return anything, so hopefully we passed */ return TRUE; } -- 2.32.0

1 0

[PATCH 6/6] wineoss: Combine midReceiveChar() into handle_midi_data().
by Huw Davies 28 Apr '22

28 Apr '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/midi.c | 39 ++++++++++++++------------------------- 1 file changed, 14 insertions(+), 25 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index df22d427475..3786211c71e 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -304,39 +304,28 @@ static void handle_regular_data(struct midi_src *src, unsigned char value, UINT } } -/************************************************************************** - * midReceiveChar [internal] - */ -static void midReceiveChar(WORD wDevID, unsigned char value, DWORD dwTime) -{ - TRACE("Adding %02xh to %d[%d]\n", value, wDevID, MidiInDev[wDevID].incLen); - - if (wDevID >= MIDM_NumDevs) { - WARN("bad devID\n"); - return; - } - if (MidiInDev[wDevID].state <= 0) { - TRACE("disabled or input not started, thrown away\n"); - return; - } - - dwTime -= MidiInDev[wDevID].startTime; - - if (value == 0xf0 || MidiInDev[wDevID].state & 2) /* system exclusive */ - handle_sysex_data(MidiInDev + wDevID, value, dwTime); - else - handle_regular_data(MidiInDev + wDevID, value, dwTime); -} - static void handle_midi_data(unsigned char *buffer, unsigned int len) { unsigned int time = GetTickCount(), i; + struct midi_src *src; + unsigned char value; + WORD dev_id; for (i = 0; i < len; i += (buffer[i] & 0x80) ? 8 : 4) { if (buffer[i] != SEQ_MIDIPUTC) continue; - midReceiveChar(buffer[i + 2], buffer[i + 1], time); + dev_id = buffer[i + 2]; + value = buffer[i + 1]; + + if (dev_id >= MIDM_NumDevs) continue; + src = MidiInDev + dev_id; + if (src->state <= 0) continue; + + if (value == 0xf0 || src->state & 2) /* system exclusive */ + handle_sysex_data(src, value, time - src->startTime); + else + handle_regular_data(src, value, time - src->startTime); } } -- 2.25.1

1 0

[PATCH 5/6] wineoss: Make the MIM_LONGDATA time relative to the start time.
by Huw Davies 28 Apr '22

28 Apr '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/midi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index d474076011d..df22d427475 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -300,7 +300,6 @@ static void handle_regular_data(struct midi_src *src, unsigned char value, UINT if (to_send) { src->incLen = 0; - time -= src->startTime; MIDI_NotifyClient(src - MidiInDev, MIM_DATA, to_send, time); } } @@ -321,6 +320,8 @@ static void midReceiveChar(WORD wDevID, unsigned char value, DWORD dwTime) return; } + dwTime -= MidiInDev[wDevID].startTime; + if (value == 0xf0 || MidiInDev[wDevID].state & 2) /* system exclusive */ handle_sysex_data(MidiInDev + wDevID, value, dwTime); else -- 2.25.1

1 0

[PATCH 4/6] wineoss: Move the regular data handling to a separate helper.
by Huw Davies 28 Apr '22

28 Apr '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/midi.c | 120 ++++++++++++++++++++-------------------- 1 file changed, 59 insertions(+), 61 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index b4c42896a8c..d474076011d 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -247,86 +247,84 @@ static void handle_sysex_data(struct midi_src *src, unsigned char value, UINT ti in_buffer_unlock(); } -/************************************************************************** - * midReceiveChar [internal] - */ -static void midReceiveChar(WORD wDevID, unsigned char value, DWORD dwTime) +static void handle_regular_data(struct midi_src *src, unsigned char value, UINT time) { - DWORD toSend = 0; - - TRACE("Adding %02xh to %d[%d]\n", value, wDevID, MidiInDev[wDevID].incLen); + UINT to_send = 0; - if (wDevID >= MIDM_NumDevs) { - WARN("bad devID\n"); - return; - } - if (MidiInDev[wDevID].state <= 0) { - TRACE("disabled or input not started, thrown away\n"); - return; - } +#define IS_CMD(_x) (((_x) & 0x80) == 0x80) +#define IS_SYS_CMD(_x) (((_x) & 0xF0) == 0xF0) - if (value == 0xf0 || MidiInDev[wDevID].state & 2) /* system exclusive */ + if (!IS_CMD(value) && src->incLen == 0) /* try to reuse old cmd */ { - handle_sysex_data(MidiInDev + wDevID, value, dwTime); - return; - } - -#define IS_CMD(_x) (((_x) & 0x80) == 0x80) -#define IS_SYS_CMD(_x) (((_x) & 0xF0) == 0xF0) - - if (!IS_CMD(value) && MidiInDev[wDevID].incLen == 0) { /* try to reuse old cmd */ - if (IS_CMD(MidiInDev[wDevID].incPrev) && !IS_SYS_CMD(MidiInDev[wDevID].incPrev)) { - MidiInDev[wDevID].incoming[0] = MidiInDev[wDevID].incPrev; - MidiInDev[wDevID].incLen = 1; - TRACE("Reusing old command %02xh\n", MidiInDev[wDevID].incPrev); - } else { - FIXME("error for midi-in, should generate MIM_ERROR notification:" - " prev=%02Xh, incLen=%02Xh\n", - MidiInDev[wDevID].incPrev, MidiInDev[wDevID].incLen); - return; - } - } - MidiInDev[wDevID].incoming[(int)(MidiInDev[wDevID].incLen++)] = value; - if (MidiInDev[wDevID].incLen == 1 && !IS_SYS_CMD(MidiInDev[wDevID].incoming[0])) { - /* store new cmd, just in case */ - MidiInDev[wDevID].incPrev = MidiInDev[wDevID].incoming[0]; + if (IS_CMD(src->incPrev) && !IS_SYS_CMD(src->incPrev)) + { + src->incoming[0] = src->incPrev; + src->incLen = 1; + } + else + { + /* FIXME: should generate MIM_ERROR notification */ + return; + } } + src->incoming[(int)src->incLen++] = value; + if (src->incLen == 1 && !IS_SYS_CMD(src->incoming[0])) + /* store new cmd, just in case */ + src->incPrev = src->incoming[0]; #undef IS_CMD #undef IS_SYS_CMD - switch (MidiInDev[wDevID].incoming[0] & 0xF0) { + switch (src->incoming[0] & 0xF0) + { case MIDI_NOTEOFF: case MIDI_NOTEON: case MIDI_KEY_PRESSURE: case MIDI_CTL_CHANGE: case MIDI_PITCH_BEND: - if (MidiInDev[wDevID].incLen == 3) { - toSend = (MidiInDev[wDevID].incoming[2] << 16) | - (MidiInDev[wDevID].incoming[1] << 8) | - (MidiInDev[wDevID].incoming[0] << 0); - } - break; + if (src->incLen == 3) + to_send = (src->incoming[2] << 16) | (src->incoming[1] << 8) | + src->incoming[0]; + break; case MIDI_PGM_CHANGE: case MIDI_CHN_PRESSURE: - if (MidiInDev[wDevID].incLen == 2) { - toSend = (MidiInDev[wDevID].incoming[1] << 8) | - (MidiInDev[wDevID].incoming[0] << 0); - } - break; + if (src->incLen == 2) + to_send = (src->incoming[1] << 8) | src->incoming[0]; + break; case MIDI_SYSTEM_PREFIX: - if (MidiInDev[wDevID].incLen == 1) - toSend = (MidiInDev[wDevID].incoming[0] << 0); - break; - default: - WARN("This shouldn't happen (%02X)\n", MidiInDev[wDevID].incoming[0]); + if (src->incLen == 1) + to_send = src->incoming[0]; + break; + } + + if (to_send) + { + src->incLen = 0; + time -= src->startTime; + MIDI_NotifyClient(src - MidiInDev, MIM_DATA, to_send, time); + } +} + +/************************************************************************** + * midReceiveChar [internal] + */ +static void midReceiveChar(WORD wDevID, unsigned char value, DWORD dwTime) +{ + TRACE("Adding %02xh to %d[%d]\n", value, wDevID, MidiInDev[wDevID].incLen); + + if (wDevID >= MIDM_NumDevs) { + WARN("bad devID\n"); + return; } - if (toSend != 0) { - TRACE("Sending event %08x\n", toSend); - MidiInDev[wDevID].incLen = 0; - dwTime -= MidiInDev[wDevID].startTime; - MIDI_NotifyClient(wDevID, MIM_DATA, toSend, dwTime); + if (MidiInDev[wDevID].state <= 0) { + TRACE("disabled or input not started, thrown away\n"); + return; } + + if (value == 0xf0 || MidiInDev[wDevID].state & 2) /* system exclusive */ + handle_sysex_data(MidiInDev + wDevID, value, dwTime); + else + handle_regular_data(MidiInDev + wDevID, value, dwTime); } static void handle_midi_data(unsigned char *buffer, unsigned int len) -- 2.25.1

1 0

[PATCH 3/6] wineoss: Move the sysex handling to a separate helper.
by Huw Davies 28 Apr '22

28 Apr '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/midi.c | 67 ++++++++++++++++++++++++----------------- 1 file changed, 40 insertions(+), 27 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index d8cf3346a9c..b4c42896a8c 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -210,6 +210,43 @@ static int midiCloseSeq(int fd) return 0; } +static void handle_sysex_data(struct midi_src *src, unsigned char value, UINT time) +{ + MIDIHDR *hdr; + BOOL done = FALSE; + + src->state |= 2; + src->incLen = 0; + + in_buffer_lock(); + + hdr = src->lpQueueHdr; + if (hdr) + { + BYTE *data = (BYTE *)hdr->lpData; + + data[hdr->dwBytesRecorded++] = value; + if (hdr->dwBytesRecorded == hdr->dwBufferLength) + done = TRUE; + } + + if (value == 0xf7) /* end */ + { + src->state &= ~2; + done = TRUE; + } + + if (done && hdr) + { + src->lpQueueHdr = hdr->lpNext; + hdr->dwFlags &= ~MHDR_INQUEUE; + hdr->dwFlags |= MHDR_DONE; + MIDI_NotifyClient(src - MidiInDev, MIM_LONGDATA, (UINT_PTR)hdr, time); + } + + in_buffer_unlock(); +} + /************************************************************************** * midReceiveChar [internal] */ @@ -228,33 +265,9 @@ static void midReceiveChar(WORD wDevID, unsigned char value, DWORD dwTime) return; } - if (value == 0xf0 || MidiInDev[wDevID].state & 2) { /* system exclusive */ - LPMIDIHDR lpMidiHdr; - BOOL sbfb = FALSE; - - MidiInDev[wDevID].state |= 2; - MidiInDev[wDevID].incLen = 0; - in_buffer_lock(); - if ((lpMidiHdr = MidiInDev[wDevID].lpQueueHdr) != NULL) { - LPBYTE lpData = (LPBYTE) lpMidiHdr->lpData; - - lpData[lpMidiHdr->dwBytesRecorded++] = value; - if (lpMidiHdr->dwBytesRecorded == lpMidiHdr->dwBufferLength) { - sbfb = TRUE; - } - } - if (value == 0xF7) { /* then end */ - MidiInDev[wDevID].state &= ~2; - sbfb = TRUE; - } - if (sbfb && lpMidiHdr != NULL) { - lpMidiHdr = MidiInDev[wDevID].lpQueueHdr; - MidiInDev[wDevID].lpQueueHdr = lpMidiHdr->lpNext; - lpMidiHdr->dwFlags &= ~MHDR_INQUEUE; - lpMidiHdr->dwFlags |= MHDR_DONE; - MIDI_NotifyClient(wDevID, MIM_LONGDATA, (DWORD_PTR)lpMidiHdr, dwTime); - } - in_buffer_unlock(); + if (value == 0xf0 || MidiInDev[wDevID].state & 2) /* system exclusive */ + { + handle_sysex_data(MidiInDev + wDevID, value, dwTime); return; } -- 2.25.1

1 0

[PATCH 2/6] wineoss: Add the leading 0xf0 to the sysex data.
by Huw Davies 28 Apr '22

28 Apr '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/midi.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index 4da7a606248..d8cf3346a9c 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -228,10 +228,12 @@ static void midReceiveChar(WORD wDevID, unsigned char value, DWORD dwTime) return; } - if (MidiInDev[wDevID].state & 2) { /* system exclusive */ + if (value == 0xf0 || MidiInDev[wDevID].state & 2) { /* system exclusive */ LPMIDIHDR lpMidiHdr; BOOL sbfb = FALSE; + MidiInDev[wDevID].state |= 2; + MidiInDev[wDevID].incLen = 0; in_buffer_lock(); if ((lpMidiHdr = MidiInDev[wDevID].lpQueueHdr) != NULL) { LPBYTE lpData = (LPBYTE) lpMidiHdr->lpData; @@ -300,14 +302,8 @@ static void midReceiveChar(WORD wDevID, unsigned char value, DWORD dwTime) } break; case MIDI_SYSTEM_PREFIX: - if (MidiInDev[wDevID].incoming[0] == 0xF0) { - MidiInDev[wDevID].state |= 2; - MidiInDev[wDevID].incLen = 0; - } else { - if (MidiInDev[wDevID].incLen == 1) { - toSend = (MidiInDev[wDevID].incoming[0] << 0); - } - } + if (MidiInDev[wDevID].incLen == 1) + toSend = (MidiInDev[wDevID].incoming[0] << 0); break; default: WARN("This shouldn't happen (%02X)\n", MidiInDev[wDevID].incoming[0]); -- 2.25.1

1 0

[PATCH 1/6] wineoss: Simplify the midi in dispatcher.
by Huw Davies 28 Apr '22

28 Apr '22

The continue statement looks a bit awkward at the moment, but a future patch will introduce more code into the for loop. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/midi.c | 42 ++++++++++++++--------------------------- 1 file changed, 14 insertions(+), 28 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index fe73d97f5ab..4da7a606248 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -320,12 +320,23 @@ static void midReceiveChar(WORD wDevID, unsigned char value, DWORD dwTime) } } +static void handle_midi_data(unsigned char *buffer, unsigned int len) +{ + unsigned int time = GetTickCount(), i; + + for (i = 0; i < len; i += (buffer[i] & 0x80) ? 8 : 4) + { + if (buffer[i] != SEQ_MIDIPUTC) continue; + + midReceiveChar(buffer[i + 2], buffer[i + 1], time); + } +} + static DWORD WINAPI midRecThread(void *arg) { int fd = (int)(INT_PTR)arg; unsigned char buffer[256]; - int len, idx; - DWORD dwTime; + int len; struct pollfd pfd; TRACE("Thread startup\n"); @@ -349,32 +360,7 @@ static DWORD WINAPI midRecThread(void *arg) continue; } - dwTime = GetTickCount(); - - for (idx = 0; idx < len; ) { - if (buffer[idx] & 0x80) { - TRACE( - "Reading<8> %02x %02x %02x %02x %02x %02x %02x %02x\n", - buffer[idx + 0], buffer[idx + 1], - buffer[idx + 2], buffer[idx + 3], - buffer[idx + 4], buffer[idx + 5], - buffer[idx + 6], buffer[idx + 7]); - idx += 8; - } else { - switch (buffer[idx + 0]) { - case SEQ_WAIT: - case SEQ_ECHO: - break; - case SEQ_MIDIPUTC: - midReceiveChar(buffer[idx + 2], buffer[idx + 1], dwTime); - break; - default: - TRACE("Unsupported event %d\n", buffer[idx + 0]); - break; - } - idx += 4; - } - } + handle_midi_data(buffer, len); } return 0; } -- 2.25.1

1 0

[PATCH 0/1] MR2: kernelbase: Add support for progress callback in CopyFileEx.
by Alistair Leslie-Hughes (＠alesliehughes) 28 Apr '22

28 Apr '22

Based on patch by Michael Müller. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/2

3 3

[PATCH] include: Add IParentAndItem definition.
by Nikolay Sivov 28 Apr '22

28 Apr '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/actxprxy/usrmarshal.c | 20 ++++++++++++++++++++ dlls/shell32/tests/shlfolder.c | 1 - include/shobjidl.idl | 25 +++++++++++++++++++++++++ 3 files changed, 45 insertions(+), 1 deletion(-) diff --git a/dlls/actxprxy/usrmarshal.c b/dlls/actxprxy/usrmarshal.c index 33db1327a8d..e4eada6848f 100644 --- a/dlls/actxprxy/usrmarshal.c +++ b/dlls/actxprxy/usrmarshal.c @@ -227,3 +227,23 @@ HRESULT __RPC_STUB IFolderView2_GetGroupBy_Proxy( TRACE("(%p)->(%p %p)\n", This, pkey, ascending); return IFolderView2_RemoteGetGroupBy_Proxy(This, pkey, ascending); } + +HRESULT __RPC_STUB IParentAndItem_GetParentAndItem_Stub( + IParentAndItem *This, + PIDLIST_ABSOLUTE *parent, + IShellFolder **folder, + PITEMID_CHILD *child) +{ + TRACE("(%p)->(%p %p %p)\n", This, parent, folder, child); + return IParentAndItem_GetParentAndItem(This, parent, folder, child); +} + +HRESULT __RPC_STUB IParentAndItem_GetParentAndItem_Proxy( + IParentAndItem *This, + PIDLIST_ABSOLUTE *parent, + IShellFolder **folder, + PITEMID_CHILD *child) +{ + TRACE("(%p)->(%p %p %p)\n", This, parent, folder, child); + return IParentAndItem_RemoteGetParentAndItem_Proxy(This, parent, folder, child); +} diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index b690e979ab5..da606a9e707 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -40,7 +40,6 @@ #include "wine/test.h" #include <initguid.h> -DEFINE_GUID(IID_IParentAndItem, 0xB3A4B685, 0xB685, 0x4805, 0x99,0xD9, 0x5D,0xEA,0xD2,0x87,0x32,0x36); DEFINE_GUID(CLSID_ShellDocObjView, 0xe7e4bc40, 0xe76a, 0x11ce, 0xa9,0xbb, 0x00,0xaa,0x00,0x4a,0xe8,0x37); static HRESULT (WINAPI *pSHCreateItemFromIDList)(PCIDLIST_ABSOLUTE pidl, REFIID riid, void **ppv); diff --git a/include/shobjidl.idl b/include/shobjidl.idl index a23f3cfdd36..8113d9a7ff6 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -501,6 +501,31 @@ interface IShellItemImageFactory : IUnknown [out] HBITMAP *phbm); } +[ + object, + uuid(b3a4b685-b685-4805-99d9-5dead2873236), + pointer_default(unique) +] +interface IParentAndItem : IUnknown +{ + HRESULT SetParentAndItem( + [in, unique] PCIDLIST_ABSOLUTE parent, + [in, unique] IShellFolder *folder, + [in] PCUITEMID_CHILD child); + + [local] + HRESULT GetParentAndItem( + [out] PIDLIST_ABSOLUTE *parent, + [out] IShellFolder **folder, + [out] PITEMID_CHILD *child); + + [call_as(GetParentAndItem)] + HRESULT RemoteGetParentAndItem( + [out] PIDLIST_ABSOLUTE *parent, + [out] IShellFolder **folder, + [out] PITEMID_CHILD *child); +} + typedef [v1_enum] enum tagNWMF { NWMF_UNLOADING = 0x00000001, NWMF_USERINITED = 0x00000002, -- 2.35.1

2 1

[PATCH 1/9] d2d1: Add stubs for ID2D1EffectContext.
by Ziqing Hui 28 Apr '22

28 Apr '22

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d2d1/d2d1_private.h | 23 ++++ dlls/d2d1/effect.c | 256 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 278 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index aa8e8569455..98092d80951 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -34,6 +34,7 @@ #include "initguid.h" #endif #include "dwrite_2.h" +#include "d2d1effectauthor.h" enum d2d_brush_type { @@ -567,6 +568,14 @@ struct d2d_device void d2d_device_init(struct d2d_device *device, ID2D1Factory1 *factory, IDXGIDevice *dxgi_device) DECLSPEC_HIDDEN; +struct d2d_effect_context +{ + ID2D1EffectContext ID2D1EffectContext_iface; + LONG refcount; +}; + +void d2d_effect_context_init(struct d2d_effect_context *effect_context) DECLSPEC_HIDDEN; + struct d2d_effect_info { const CLSID *clsid; @@ -694,6 +703,13 @@ static inline const char *debug_d2d_point_2f(const D2D1_POINT_2F *point) return wine_dbg_sprintf("{%.8e, %.8e}", point->x, point->y); } +static inline const char *debug_d2d_point_2l(const D2D1_POINT_2L *point) +{ + if (!point) + return "(null)"; + return wine_dbg_sprintf("{%ld, %ld}", point->x, point->y); +} + static inline const char *debug_d2d_rect_f(const D2D1_RECT_F *rect) { if (!rect) @@ -701,6 +717,13 @@ static inline const char *debug_d2d_rect_f(const D2D1_RECT_F *rect) return wine_dbg_sprintf("(%.8e, %.8e)-(%.8e, %.8e)", rect->left, rect->top, rect->right, rect->bottom); } +static inline const char *debug_d2d_rect_l(const D2D1_RECT_L *rect) +{ + if (!rect) + return "(null)"; + return wine_dbg_sprintf("(%ld, %ld)-(%ld, %ld)", rect->left, rect->top, rect->right, rect->bottom); +} + static inline const char *debug_d2d_rounded_rect(const D2D1_ROUNDED_RECT *rounded_rect) { if (!rounded_rect) diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index 350ac3c7bbf..5709afed7a5 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -17,7 +17,6 @@ */ #include "d2d1_private.h" -#include "d2d1effectauthor.h" WINE_DEFAULT_DEBUG_CHANNEL(d2d); @@ -31,6 +30,261 @@ static const struct d2d_effect_info builtin_effects[] = {&CLSID_D2D1Grayscale, 1, 1, 1}, }; +static inline struct d2d_effect_context *impl_from_ID2D1EffectContext(ID2D1EffectContext *iface) +{ + return CONTAINING_RECORD(iface, struct d2d_effect_context, ID2D1EffectContext_iface); +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_QueryInterface(ID2D1EffectContext *iface, REFIID iid, void **out) +{ + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_ID2D1EffectContext) + || IsEqualGUID(iid, &IID_IUnknown)) + { + ID2D1EffectContext_AddRef(iface); + *out = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE d2d_effect_context_AddRef(ID2D1EffectContext *iface) +{ + struct d2d_effect_context *effect_context = impl_from_ID2D1EffectContext(iface); + ULONG refcount = InterlockedIncrement(&effect_context->refcount); + + TRACE("%p increasing refcount to %lu.\n", iface, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE d2d_effect_context_Release(ID2D1EffectContext *iface) +{ + struct d2d_effect_context *effect_context = impl_from_ID2D1EffectContext(iface); + ULONG refcount = InterlockedDecrement(&effect_context->refcount); + + TRACE("%p decreasing refcount to %lu.\n", iface, refcount); + + if (!refcount) + { + heap_free(effect_context); + } + + return refcount; +} + +static void STDMETHODCALLTYPE d2d_effect_context_GetDpi(ID2D1EffectContext *iface, float *dpi_x, float *dpi_y) +{ + FIXME("iface %p, dpi_x %p, dpi_y %p stub!\n", iface, dpi_x, dpi_y); +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateEffect(ID2D1EffectContext *iface, + REFCLSID clsid, ID2D1Effect **effect) +{ + FIXME("iface %p, clsid %s, effect %p stub!\n", iface, debugstr_guid(clsid), effect); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_GetMaximumSupportedFeatureLevel(ID2D1EffectContext *iface, + const D3D_FEATURE_LEVEL *levels, UINT32 level_count, D3D_FEATURE_LEVEL *max_level) +{ + FIXME("iface %p, levels %p, level_count %u, max_level %p stub!\n", iface, levels, level_count, max_level); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateTransformNodeFromEffect(ID2D1EffectContext *iface, + ID2D1Effect *effect, ID2D1TransformNode **node) +{ + FIXME("iface %p, effect %p, node %p stub!\n", iface, effect, node); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateBlendTransform(ID2D1EffectContext *iface, + UINT32 num_inputs, const D2D1_BLEND_DESCRIPTION *description, ID2D1BlendTransform **transform) +{ + FIXME("iface %p, num_inputs %u, description %p, transform %p stub!\n", iface, num_inputs, description, transform); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateBorderTransform(ID2D1EffectContext *iface, + D2D1_EXTEND_MODE mode_x, D2D1_EXTEND_MODE mode_y, ID2D1BorderTransform **transform) +{ + FIXME("iface %p, mode_x %#x, mode_y %#x, transform %p stub!\n", iface, mode_x, mode_y, transform); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateOffsetTransform(ID2D1EffectContext *iface, + D2D1_POINT_2L offset, ID2D1OffsetTransform **transform) +{ + FIXME("iface %p, offset %s, transform %p stub!\n", iface, debug_d2d_point_2l(&offset), transform); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateBoundsAdjustmentTransform(ID2D1EffectContext *iface, + const D2D1_RECT_L *output_rect, ID2D1BoundsAdjustmentTransform **transform) +{ + FIXME("iface %p, output_rect %s, transform %p stub!\n", iface, debug_d2d_rect_l(output_rect), transform); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_LoadPixelShader(ID2D1EffectContext *iface, + REFGUID shader_id, const BYTE *buffer, UINT32 buffer_size) +{ + FIXME("iface %p, shader_id %s, buffer %p, buffer_size %u stub!\n", + iface, debugstr_guid(shader_id), buffer, buffer_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_LoadVertexShader(ID2D1EffectContext *iface, + REFGUID shader_id, const BYTE *buffer, UINT32 buffer_size) +{ + FIXME("iface %p, shader_id %s, buffer %p, buffer_size %u stub!\n", + iface, debugstr_guid(shader_id), buffer, buffer_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_LoadComputeShader(ID2D1EffectContext *iface, + REFGUID shader_id, const BYTE *buffer, UINT32 buffer_size) +{ + FIXME("iface %p, shader_id %s, buffer %p, buffer_size %u stub!\n", + iface, debugstr_guid(shader_id), buffer, buffer_size); + + return E_NOTIMPL; +} + +static BOOL STDMETHODCALLTYPE d2d_effect_context_IsShaderLoaded(ID2D1EffectContext *iface, REFGUID shader_id) +{ + FIXME("iface %p, shader_id %s stub!\n", iface, debugstr_guid(shader_id)); + + return FALSE; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateResourceTexture(ID2D1EffectContext *iface, + const GUID *id, const D2D1_RESOURCE_TEXTURE_PROPERTIES *texture_properties, + const BYTE *data, const UINT32 *strides, UINT32 data_size, ID2D1ResourceTexture **texture) +{ + FIXME("iface %p, id %s, texture_properties %p, data %p, strides %s, data_size %u, texture %p stub!\n", + iface, debugstr_guid(id), texture_properties, data, + strides ? wine_dbg_sprintf("%u", *strides) : "(null)", data_size, texture); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_FindResourceTexture(ID2D1EffectContext *iface, + const GUID *id, ID2D1ResourceTexture **texture) +{ + FIXME("iface %p, id %s, texture %p stub!\n", iface, debugstr_guid(id), texture); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateVertexBuffer(ID2D1EffectContext *iface, + const D2D1_VERTEX_BUFFER_PROPERTIES *buffer_properties, const GUID *id, + const D2D1_CUSTOM_VERTEX_BUFFER_PROPERTIES *custom_buffer_properties, ID2D1VertexBuffer **buffer) +{ + FIXME("iface %p, buffer_properties %p, id %s, custom_buffer_properties %p, buffer %p stub!\n", + iface, buffer_properties, debugstr_guid(id), custom_buffer_properties, buffer); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_FindVertexBuffer(ID2D1EffectContext *iface, + const GUID *id, ID2D1VertexBuffer **buffer) +{ + FIXME("iface %p, id %s, buffer %p stub!\n", iface, debugstr_guid(id), buffer); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateColorContext(ID2D1EffectContext *iface, + D2D1_COLOR_SPACE space, const BYTE *profile, UINT32 profile_size, ID2D1ColorContext **color_context) +{ + FIXME("iface %p, space %#x, profile %p, profile_size %u, color_context %p stub!\n", + iface, space, profile, profile_size, color_context); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateColorContextFromFilename(ID2D1EffectContext *iface, + const WCHAR *filename, ID2D1ColorContext **color_context) +{ + FIXME("iface %p, filename %s, color_context %p stub!\n", iface, debugstr_w(filename), color_context); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateColorContextFromWicColorContext(ID2D1EffectContext *iface, + IWICColorContext *wic_color_context, ID2D1ColorContext **color_context) +{ + FIXME("iface %p, wic_color_context %p, color_context %p stub!\n", iface, wic_color_context, color_context); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_CheckFeatureSupport(ID2D1EffectContext *iface, + D2D1_FEATURE feature, void *data, UINT32 data_size) +{ + FIXME("iface %p, feature %#x, data %p, data_size %u stub!\n", iface, feature, data, data_size); + + return E_NOTIMPL; +} + +static BOOL STDMETHODCALLTYPE d2d_effect_context_IsBufferPrecisionSupported(ID2D1EffectContext *iface, + D2D1_BUFFER_PRECISION precision) +{ + FIXME("iface %p, precision %#x stub!\n", iface, precision); + + return FALSE; +} + +static const ID2D1EffectContextVtbl d2d_effect_context_vtbl = +{ + d2d_effect_context_QueryInterface, + d2d_effect_context_AddRef, + d2d_effect_context_Release, + d2d_effect_context_GetDpi, + d2d_effect_context_CreateEffect, + d2d_effect_context_GetMaximumSupportedFeatureLevel, + d2d_effect_context_CreateTransformNodeFromEffect, + d2d_effect_context_CreateBlendTransform, + d2d_effect_context_CreateBorderTransform, + d2d_effect_context_CreateOffsetTransform, + d2d_effect_context_CreateBoundsAdjustmentTransform, + d2d_effect_context_LoadPixelShader, + d2d_effect_context_LoadVertexShader, + d2d_effect_context_LoadComputeShader, + d2d_effect_context_IsShaderLoaded, + d2d_effect_context_CreateResourceTexture, + d2d_effect_context_FindResourceTexture, + d2d_effect_context_CreateVertexBuffer, + d2d_effect_context_FindVertexBuffer, + d2d_effect_context_CreateColorContext, + d2d_effect_context_CreateColorContextFromFilename, + d2d_effect_context_CreateColorContextFromWicColorContext, + d2d_effect_context_CheckFeatureSupport, + d2d_effect_context_IsBufferPrecisionSupported, +}; + +void d2d_effect_context_init(struct d2d_effect_context *effect_context) +{ + effect_context->ID2D1EffectContext_iface.lpVtbl = &d2d_effect_context_vtbl; + effect_context->refcount = 1; +} + static inline struct d2d_effect *impl_from_ID2D1Effect(ID2D1Effect *iface) { return CONTAINING_RECORD(iface, struct d2d_effect, ID2D1Effect_iface); -- 2.25.1

2 13

[PATCH 1/2] shell32: Only call HCR_GetFolderAttributes with simple pidls
by Fabian Maurer 28 Apr '22

28 Apr '22

The function returns false with not-simple pidls anyways. This fixes an "ERR" message when opening a control panel applet from explorer Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/shell32/shlfolder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shlfolder.c b/dlls/shell32/shlfolder.c index 10aafc160c0..8e3b561cfd1 100644 --- a/dlls/shell32/shlfolder.c +++ b/dlls/shell32/shlfolder.c @@ -412,7 +412,7 @@ HRESULT SHELL32_GetItemAttributes (IShellFolder2 *psf, LPCITEMIDLIST pidl, LPDWO if (_ILIsDrive (pidl)) { *pdwAttributes &= SFGAO_HASSUBFOLDER|SFGAO_FILESYSTEM|SFGAO_FOLDER|SFGAO_FILESYSANCESTOR| SFGAO_DROPTARGET|SFGAO_HASPROPSHEET|SFGAO_CANLINK; - } else if (has_guid && HCR_GetFolderAttributes(pidl, &dwAttributes)) { + } else if (has_guid && _ILIsPidlSimple(pidl) && HCR_GetFolderAttributes(pidl, &dwAttributes)) { *pdwAttributes = dwAttributes; } else if (_ILGetDataPointer (pidl)) { DWORD file_attr = _ILGetFileAttributes (pidl, NULL, 0); -- 2.34.1

2 5

[PATCH v2 1/5] server: Return void from sock_reselect().
by Zebediah Figura 27 Apr '22

27 Apr '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- server/sock.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/server/sock.c b/server/sock.c index b403541fcbf..a9d8d2ca2bd 100644 --- a/server/sock.c +++ b/server/sock.c @@ -567,7 +567,7 @@ void sock_init(void) } } -static int sock_reselect( struct sock *sock ) +static void sock_reselect( struct sock *sock ) { int ev = sock_get_poll_events( sock->fd ); @@ -575,7 +575,6 @@ static int sock_reselect( struct sock *sock ) fprintf(stderr,"sock_reselect(%p): new mask %x\n", sock, ev); set_fd_events( sock->fd, ev ); - return ev; } static unsigned int afd_poll_flag_to_win32( unsigned int flags ) -- 2.34.1

2 8

[PATCH 0/2] MR7: ntdll: Properly track refcount with forwarded exports.
by Jinoh Kang (＠iamahuman) 27 Apr '22

27 Apr '22

This fixes https://bugs.winehq.org/show_bug.cgi?id=52094. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/7

3 4

[PATCH v3 0/5] MR5: windows.media.speech: Backport tweaks from windows.gaming.input async.
by Rémi Bernon (＠rbernon) 27 Apr '22

27 Apr '22

Some being more cosmetic than others. -- v3: windows.media.speech: Assume that async_run_work cannot be NULL in IAsyncInfo_Close. windows.media.speech: Simplify error handling in async_operation_create. windows.media.speech: Initialize HRESULT variables consistently. windows.media.speech: Return E_ILLEGAL_METHOD_CALL from get_ErrorCode. windows.media.speech: Return operation error from IAsyncOperation_GetResults. https://gitlab.winehq.org/wine/wine/-/merge_requests/5

2 5

[PATCH v2 0/1] MR8: wineboot: Don't use ai_canonname for ComputerName if it is "localhost".
by Jinoh Kang (＠iamahuman) 27 Apr '22

27 Apr '22

-- v2: wineboot: Don't use ai_canonname for ComputerName if it is "localhost". https://gitlab.winehq.org/wine/wine/-/merge_requests/8

2 1

[PATCH v2 1/2] ntdll/tests: Test NtMapViewOfSection with a DLL and zero_bits.
by Brendan Shanks 27 Apr '22

27 Apr '22

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- The zero_bits mask test always passes on 32-bit (the pointer is either truncated, or version.dll is itself 32-bit). dlls/ntdll/tests/virtual.c | 41 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c index 30a97ba9d94..cd374cf2ea4 100644 --- a/dlls/ntdll/tests/virtual.c +++ b/dlls/ntdll/tests/virtual.c @@ -37,6 +37,8 @@ static ULONG64 (WINAPI *pRtlGetEnabledExtendedFeatures)(ULONG64); static NTSTATUS (WINAPI *pRtlFreeUserStack)(void *); static void * (WINAPI *pRtlFindExportedRoutineByName)(HMODULE,const char*); static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); +static BOOL (WINAPI *pWow64DisableWow64FsRedirection)(PVOID*); +static BOOL (WINAPI *pWow64RevertWow64FsRedirection)(PVOID); static NTSTATUS (WINAPI *pNtAllocateVirtualMemoryEx)(HANDLE, PVOID *, SIZE_T *, ULONG, ULONG, MEM_EXTENDED_PARAMETER *, ULONG); static const BOOL is_win64 = sizeof(void*) != sizeof(int); @@ -904,6 +906,43 @@ static void test_NtMapViewOfSection(void) CloseHandle(file); DeleteFileA(testfile); + /* test zero_bits > 31 with a 64-bit DLL if possible */ + if (is_wow64) + pWow64DisableWow64FsRedirection(&ptr2); + + file = CreateFileA("c:\\windows\\system32\\version.dll", GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "Failed to open version.dll\n"); + + if (is_wow64) + pWow64RevertWow64FsRedirection(ptr2); + + mapping = CreateFileMappingA(file, NULL, PAGE_READONLY|SEC_IMAGE, 0, 0, NULL); + ok(mapping != 0, "CreateFileMapping failed\n"); + + ptr = NULL; + size = 0; + offset.QuadPart = 0; + zero_bits = 0x7fffffff; + status = NtMapViewOfSection(mapping, process, &ptr, zero_bits, 0, &offset, &size, 1, 0, PAGE_READONLY); + + if (!is_win64 && !is_wow64) + { + ok(status == STATUS_INVALID_PARAMETER_4, "NtMapViewOfSection returned %08lx\n", status); + } + else + { + ok(status == STATUS_SUCCESS || status == STATUS_IMAGE_NOT_AT_BASE, "NtMapViewOfSection returned %08lx\n", status); + ok(!((ULONG_PTR)ptr & 0xffff), "returned memory %p is not aligned to 64k\n", ptr); + todo_wine + ok(((UINT_PTR)ptr & ~get_zero_bits_mask(zero_bits)) == 0, "NtMapViewOfSection returned address %p\n", ptr); + + status = NtUnmapViewOfSection(process, ptr); + ok(status == STATUS_SUCCESS, "NtUnmapViewOfSection returned %08lx\n", status); + } + + NtClose(mapping); + CloseHandle(file); + TerminateProcess(process, 0); CloseHandle(process); } @@ -1152,6 +1191,8 @@ START_TEST(virtual) mod = GetModuleHandleA("kernel32.dll"); pIsWow64Process = (void *)GetProcAddress(mod, "IsWow64Process"); + pWow64DisableWow64FsRedirection = (void *)GetProcAddress(mod, "Wow64DisableWow64FsRedirection"); + pWow64RevertWow64FsRedirection = (void *)GetProcAddress(mod, "Wow64RevertWow64FsRedirection"); pGetEnabledXStateFeatures = (void *)GetProcAddress(mod, "GetEnabledXStateFeatures"); mod = GetModuleHandleA("ntdll.dll"); pRtlCreateUserStack = (void *)GetProcAddress(mod, "RtlCreateUserStack"); -- 2.35.1

2 2

[PATCH v2 0/5] MR5: windows.media.speech: Backport tweaks from windows.gaming.input async.
by Rémi Bernon (＠rbernon) 27 Apr '22

27 Apr '22

Some being more cosmetic than others. -- v2: windows.media.speech: Assume that async_run_work cannot be NULL in IAsyncInfo_Close. windows.media.speech: Simplify error handling in async_operation_create. windows.media.speech: Initialize HRESULT variables consistently. windows.media.speech: Return E_ILLEGAL_METHOD_CALL from get_ErrorCode. https://gitlab.winehq.org/wine/wine/-/merge_requests/5

3 8

[PATCH v2 3/3] msvcp140_atomic_wait: Add __std_atomic_wait_direct implementation.
by Piotr Caban 27 Apr '22

27 Apr '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52821 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp140_atomic_wait/main.c | 7 ++ .../msvcp140_atomic_wait.spec | 2 +- .../tests/msvcp140_atomic_wait.c | 76 +++++++++++++++++++ 3 files changed, 84 insertions(+), 1 deletion(-)

1 0

[PATCH v2 2/3] msvcp140_atomic_wait: Add __std_atomic_notify_all_direct implementation.
by Piotr Caban 27 Apr '22

27 Apr '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp140_atomic_wait/main.c | 6 ++++++ dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-)

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-devel