wine-devel October 2021

wine-devel@winehq.org

81 participants
772 discussions

[PATCH] dinput: Avoid negating FAILED()
by Michael Stefaniuc 19 Oct '21

19 Oct '21

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dinput/joystick_hid.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index a6715463690..3e515f11fec 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -2720,7 +2720,7 @@ static HRESULT WINAPI hid_joystick_effect_Start( IDirectInputEffect *iface, DWOR hr = DIERR_NOTEXCLUSIVEACQUIRED; else if ((flags & DIES_NODOWNLOAD) && !impl->index) hr = DIERR_NOTDOWNLOADED; - else if ((flags & DIES_NODOWNLOAD) || !FAILED(hr = IDirectInputEffect_Download( iface ))) + else if ((flags & DIES_NODOWNLOAD) || SUCCEEDED(hr = IDirectInputEffect_Download( iface ))) { count = 1; status = HidP_InitializeReportForID( HidP_Output, effect_control->id, preparsed, @@ -2865,7 +2865,7 @@ static HRESULT WINAPI hid_joystick_effect_Download( IDirectInputEffect *iface ) hr = DIERR_NOTEXCLUSIVEACQUIRED; else if ((impl->flags & complete_mask) != complete_mask) hr = DIERR_INCOMPLETEEFFECT; - else if (!impl->index && !FAILED(hr = find_next_effect_id( impl->joystick, &impl->index ))) + else if (!impl->index && SUCCEEDED(hr = find_next_effect_id( impl->joystick, &impl->index ))) { if (!impl->type_specific_buf[0][0]) status = HIDP_STATUS_SUCCESS; else status = HidP_SetUsageValue( HidP_Output, HID_USAGE_PAGE_PID, 0, PID_USAGE_EFFECT_BLOCK_INDEX, @@ -3030,7 +3030,7 @@ static HRESULT WINAPI hid_joystick_effect_Unload( IDirectInputEffect *iface ) EnterCriticalSection( &joystick->base.crit ); if (!impl->index) hr = DI_NOEFFECT; - else if (!FAILED(hr = IDirectInputEffect_Stop( iface ))) + else if (SUCCEEDED(hr = IDirectInputEffect_Stop( iface ))) { impl->joystick->effect_inuse[impl->index - 1] = FALSE; impl->index = 0; -- 2.31.1

2 2

[PATCH v2 1/2] ws2_32: Validate pointers in select().
by Torge Matthies 19 Oct '21

19 Oct '21

The documentation says that SOCKET_ERROR is returned and the error is set to WSAEFAULT if any of the input pointers point to unmapped memory. Signed-off-by: Torge Matthies <openglfreak(a)googlemail.com> --- dlls/ws2_32/socket.c | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index b3dab22ae6e..7b7a985c40d 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2384,6 +2384,14 @@ int WINAPI select( int count, fd_set *read_ptr, fd_set *write_ptr, TRACE( "read %p, write %p, except %p, timeout %p\n", read_ptr, write_ptr, except_ptr, timeout ); + if ((read_ptr && IsBadWritePtr(read_ptr, sizeof(*read_ptr))) + || (write_ptr && IsBadWritePtr(write_ptr, sizeof(*write_ptr))) + || (except_ptr && IsBadWritePtr(except_ptr, sizeof(*except_ptr)))) + { + SetLastError( WSAEFAULT ); + return -1; + } + FD_ZERO( &read ); FD_ZERO( &write ); FD_ZERO( &except ); @@ -2393,11 +2401,6 @@ int WINAPI select( int count, fd_set *read_ptr, fd_set *write_ptr, if (!(sync_event = get_sync_event())) return -1; - if (timeout) - params->timeout = timeout->tv_sec * -10000000 + timeout->tv_usec * -10; - else - params->timeout = TIMEOUT_INFINITE; - for (i = 0; i < read.fd_count; ++i) { params->sockets[params->count].socket = read.fd_array[i]; @@ -2428,6 +2431,18 @@ int WINAPI select( int count, fd_set *read_ptr, fd_set *write_ptr, return -1; } + if (timeout) + { + if (IsBadReadPtr(timeout, sizeof(*timeout))) + { + SetLastError( WSAEFAULT ); + return -1; + } + params->timeout = timeout->tv_sec * -10000000 + timeout->tv_usec * -10; + } + else + params->timeout = TIMEOUT_INFINITE; + params_size = offsetof( struct afd_poll_params, sockets[params->count] ); status = NtDeviceIoControlFile( (HANDLE)poll_socket, sync_event, NULL, NULL, &io, -- 2.33.1

3 7

[PATCH v2 1/5] winemac.drv: Simplify cursor clipping code paths.
by Tim Clem 19 Oct '21

19 Oct '21

Centralizes all clipping behavior into -startClippingCursor: and -stopClippingCursor. Signed-off-by: Tim Clem <tclem(a)codeweavers.com> --- The current methods are confusingly named and, in some cases, broken. -updateCursorClippingState has an incomplete picture of when clipping should be enabled or disabled. Worse, -deactivateCursorClipping just disables the event tap without calling CGAssociateMouseAndMouseCursorPosition(true), so it will lock up the cursor if called while the app is active. There are two main scenarios where -updateCursorClippingState is called: when a window is being dragged and when the app is (de)activated. The drag-related calls can be removed entirely because the handlers in window.c call ClipCursor(NULL) when a window is being dragged. (This is in fact the only reason that the cursor doesn't get locked up when windows are dragged right now.) As for app (de)activation, the tap already ignores events if the app isn't active, so the -updateCursorClippingState calls there can be removed as well. (Moreover, Windows will cancel cursor clipping if the app loses focus; the next patch calls -stopClippingCursor when the app resigns active.) dlls/winemac.drv/cocoa_app.m | 52 +++++++++++------------------------- 1 file changed, 15 insertions(+), 37 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 2d18da7f99a8..806252651613 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1456,33 +1456,6 @@ - (BOOL) setCursorPosition:(CGPoint)pos return ret; } - - (void) activateCursorClipping - { - if (cursorClippingEventTap && !CGEventTapIsEnabled(cursorClippingEventTap)) - { - CGEventTapEnable(cursorClippingEventTap, TRUE); - [self setCursorPosition:NSPointToCGPoint([self flippedMouseLocation:[NSEvent mouseLocation]])]; - } - } - - - (void) deactivateCursorClipping - { - if (cursorClippingEventTap && CGEventTapIsEnabled(cursorClippingEventTap)) - { - CGEventTapEnable(cursorClippingEventTap, FALSE); - [warpRecords removeAllObjects]; - lastSetCursorPositionTime = [[NSProcessInfo processInfo] systemUptime]; - } - } - - - (void) updateCursorClippingState - { - if (clippingCursor && [NSApp isActive] && ![windowsBeingDragged count]) - [self activateCursorClipping]; - else - [self deactivateCursorClipping]; - } - - (void) updateWindowsForCursorClipping { WineWindow* window; @@ -1510,7 +1483,10 @@ - (BOOL) startClippingCursor:(CGRect)rect clippingCursor = TRUE; cursorClipRect = rect; - [self updateCursorClippingState]; + + CGEventTapEnable(cursorClippingEventTap, TRUE); + [self setCursorPosition:NSPointToCGPoint([self flippedMouseLocation:[NSEvent mouseLocation]])]; + [self updateWindowsForCursorClipping]; return TRUE; @@ -1518,12 +1494,21 @@ - (BOOL) startClippingCursor:(CGRect)rect - (BOOL) stopClippingCursor { - CGError err = CGAssociateMouseAndMouseCursorPosition(true); + CGError err; + + if (!clippingCursor) + return TRUE; + + err = CGAssociateMouseAndMouseCursorPosition(true); if (err != kCGErrorSuccess) return FALSE; clippingCursor = FALSE; - [self updateCursorClippingState]; + + CGEventTapEnable(cursorClippingEventTap, FALSE); + [warpRecords removeAllObjects]; + lastSetCursorPositionTime = [[NSProcessInfo processInfo] systemUptime]; + [self updateWindowsForCursorClipping]; return TRUE; @@ -1554,7 +1539,6 @@ - (void) window:(WineWindow*)window isBeingDragged:(BOOL)dragged [windowsBeingDragged addObject:window]; else [windowsBeingDragged removeObject:window]; - [self updateCursorClippingState]; } - (void) windowWillOrderOut:(WineWindow*)window @@ -1584,7 +1568,6 @@ - (void) handleWindowDrag:(WineWindow*)window begin:(BOOL)begin [windowsBeingDragged removeObject:window]; eventType = WINDOW_DRAG_END; } - [self updateCursorClippingState]; event = macdrv_create_event(eventType, window); if (eventType == WINDOW_DRAG_BEGIN) @@ -2161,7 +2144,6 @@ - (void) setupObservations }); } [windowsBeingDragged removeObject:window]; - [self updateCursorClippingState]; }]; if (useDragNotifications) { @@ -2305,8 +2287,6 @@ - (void)applicationDidBecomeActive:(NSNotification *)notification [self setMode:mode forDisplay:[displayID unsignedIntValue]]; } - [self updateCursorClippingState]; - [self updateFullscreenWindows]; [self adjustWindowLevels:YES]; @@ -2349,8 +2329,6 @@ - (void)applicationDidResignActive:(NSNotification *)notification macdrv_event* event; WineEventQueue* queue; - [self updateCursorClippingState]; - [self invalidateGotFocusEvents]; event = macdrv_create_event(APP_DEACTIVATED, nil); -- 2.33.0

1 4

[PATCH] msvcrt: support I width modifier in *scanf* family
by Eric Pouech 19 Oct '21

19 Oct '21

Despite what msdn states, I and I32 are supported width modifiers. V2: - better code structure - added support and tests for I32 v3: - fix 'test & copy & paste & don't test' error Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/msvcrt/scanf.h | 10 ++++++++-- dlls/msvcrt/tests/scanf.c | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/scanf.h b/dlls/msvcrt/scanf.h index 3ab2efef13d..02284379854 100644 --- a/dlls/msvcrt/scanf.h +++ b/dlls/msvcrt/scanf.h @@ -279,13 +279,19 @@ _FUNCTION_ { *(format + 2) == '4') { I64_prefix = 1; format += 2; + break; } - break; + else if (*(format + 1) == '3' && + *(format + 2) == '2') { + format += 2; + break; + } + /* fall through */ #if _MSVCR_VER == 0 || _MSVCR_VER >= 140 case 'z': +#endif if (sizeof(void *) == sizeof(LONGLONG)) I64_prefix = 1; break; -#endif default: prefix_finished = 1; } diff --git a/dlls/msvcrt/tests/scanf.c b/dlls/msvcrt/tests/scanf.c index e175342796b..a87b3b3d59e 100644 --- a/dlls/msvcrt/tests/scanf.c +++ b/dlls/msvcrt/tests/scanf.c @@ -74,6 +74,7 @@ static void test_sscanf( void ) int hour=21,min=59,sec=20; int number,number_so_far; HMODULE hmod = GetModuleHandleA("msvcrt.dll"); + DWORD_PTR result_ptr; p_sprintf = (void *)GetProcAddress( hmod, "sprintf" ); p_sscanf = (void *)GetProcAddress( hmod, "sscanf" ); @@ -264,6 +265,45 @@ static void test_sscanf( void ) if(ret == 14) ok(!strcmp(buffer, buffer1), "got %s, expected %s\n", buffer1, buffer); + strcpy(buffer,"12345678901234"); + ret = p_sscanf(buffer, "%I64d", &result64); + ok(ret == 1, "Wrong number of arguments read: %d\n", ret); + ret = p_sprintf(buffer1, "%I64d", result64); + ok(ret==14 || broken(ret==10), "sprintf returned %d\n", ret); + if(ret == 14) + ok(!strcmp(buffer, buffer1), "got %s, expected %s\n", buffer1, buffer); + + result = 0; + strcpy(buffer,"0x123456789"); + ret = p_sscanf(buffer, "%I32x", &result); + ok(ret == 1, "Wrong number of arguments read: %d\n", ret); + ok(result == 0x23456789, "got %x, expected 0x23456789\n", result); + + result_ptr = 0; + strcpy(buffer,"0x87654321"); + ret = p_sscanf(buffer, "%Ix", &result_ptr); + ok(ret == 1, "Wrong number of arguments read: %d\n", ret); + ret = p_sprintf(buffer1, "%#Ix", result_ptr); + ok(ret==10, "sprintf returned %d\n", ret); + if(ret == 10) + ok(!strcmp(buffer, buffer1), "got %s, expected %s\n", buffer1, buffer); + + result_ptr = 0; + strcpy(buffer,"0x123456789"); + ret = p_sscanf(buffer, "%Ix", &result_ptr); + ok(ret == 1, "Wrong number of arguments read: %d\n", ret); + if (sizeof(void*) == sizeof(LONGLONG)) + { + ret = p_sprintf(buffer1, "%#Ix", result_ptr); + ok(ret==11, "sprintf returned %d\n", ret); + if(ret == 11) + ok(!strcmp(buffer, buffer1), "got %s, expected %s\n", buffer1, buffer); + } + else + { + ok(result_ptr == 0x23456789, "got %x, expected 0x23456789\n", result); + } + /* Check %i according to bug 1878 */ strcpy(buffer,"123"); ret = p_sscanf(buffer, "%i", &result);

1 0

[PATCH] d3d11: Correctly handle optional arguments in OMGetDepthStencilState().
by Nikolay Sivov 19 Oct '21

19 Oct '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10core/tests/d3d10core.c | 11 ++++++++++ dlls/d3d11/device.c | 37 ++++++++++++++++++++++---------- dlls/d3d11/tests/d3d11.c | 10 +++++++++ 3 files changed, 47 insertions(+), 11 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index c1178749345..f4aff519745 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -5696,6 +5696,17 @@ float4 main(float4 color : COLOR) : SV_TARGET ok(tmp_ds_state == ds_state, "Got unexpected depth stencil state %p, expected %p.\n", tmp_ds_state, ds_state); ID3D10DepthStencilState_Release(tmp_ds_state); ok(stencil_ref == 3, "Got unexpected stencil ref %u.\n", stencil_ref); + /* For OMGetDepthStencilState() both arguments are optional. */ + ID3D10Device_OMGetDepthStencilState(device, NULL, NULL); + stencil_ref = 0; + ID3D10Device_OMGetDepthStencilState(device, NULL, &stencil_ref); + ok(stencil_ref == 3, "Got unexpected stencil ref %u.\n", stencil_ref); + tmp_ds_state = NULL; + ID3D10Device_OMGetDepthStencilState(device, &tmp_ds_state, NULL); + ok(stencil_ref == 3, "Got unexpected stencil ref %u.\n", stencil_ref); + ok(tmp_ds_state == ds_state, "Got unexpected depth stencil state %p, expected %p.\n", tmp_ds_state, ds_state); + ID3D10DepthStencilState_Release(tmp_ds_state); + ID3D10Device_OMGetRenderTargets(device, D3D10_SIMULTANEOUS_RENDER_TARGET_COUNT, tmp_rtv, &tmp_dsv); for (i = 0; i < D3D10_SIMULTANEOUS_RENDER_TARGET_COUNT; ++i) { diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 248634a245d..6d125e06ace 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2216,19 +2216,25 @@ static void STDMETHODCALLTYPE d3d11_device_context_OMGetDepthStencilState(ID3D11 struct d3d11_device_context *context = impl_from_ID3D11DeviceContext1(iface); struct wined3d_depth_stencil_state *wined3d_state; struct d3d_depthstencil_state *state_impl; + UINT stencil_ref_tmp; TRACE("iface %p, depth_stencil_state %p, stencil_ref %p.\n", iface, depth_stencil_state, stencil_ref); wined3d_mutex_lock(); - if ((wined3d_state = wined3d_device_context_get_depth_stencil_state(context->wined3d_context, stencil_ref))) + if (!stencil_ref) stencil_ref = &stencil_ref_tmp; + wined3d_state = wined3d_device_context_get_depth_stencil_state(context->wined3d_context, stencil_ref); + if (depth_stencil_state) { - state_impl = wined3d_depth_stencil_state_get_parent(wined3d_state); - ID3D11DepthStencilState_AddRef(*depth_stencil_state = &state_impl->ID3D11DepthStencilState_iface); - } - else - { - *depth_stencil_state = NULL; + if (wined3d_state) + { + state_impl = wined3d_depth_stencil_state_get_parent(wined3d_state); + ID3D11DepthStencilState_AddRef(*depth_stencil_state = &state_impl->ID3D11DepthStencilState_iface); + } + else + { + *depth_stencil_state = NULL; + } } wined3d_mutex_unlock(); } @@ -5554,7 +5560,7 @@ static void STDMETHODCALLTYPE d3d10_device_OMGetDepthStencilState(ID3D10Device1 ID3D10DepthStencilState **depth_stencil_state, UINT *stencil_ref) { struct d3d_device *device = impl_from_ID3D10Device(iface); - ID3D11DepthStencilState *d3d11_iface; + ID3D11DepthStencilState *d3d11_iface = NULL; TRACE("iface %p, depth_stencil_state %p, stencil_ref %p.\n", iface, depth_stencil_state, stencil_ref); @@ -5562,10 +5568,19 @@ static void STDMETHODCALLTYPE d3d10_device_OMGetDepthStencilState(ID3D10Device1 d3d11_device_context_OMGetDepthStencilState(&device->immediate_context.ID3D11DeviceContext1_iface, &d3d11_iface, stencil_ref); + if (depth_stencil_state) + { + if (d3d11_iface) + { + *depth_stencil_state = &impl_from_ID3D11DepthStencilState(d3d11_iface)->ID3D10DepthStencilState_iface; + ID3D10DepthStencilState_AddRef(*depth_stencil_state); + } + else + *depth_stencil_state = NULL; + } + if (d3d11_iface) - *depth_stencil_state = &impl_from_ID3D11DepthStencilState(d3d11_iface)->ID3D10DepthStencilState_iface; - else - *depth_stencil_state = NULL; + ID3D11DepthStencilState_Release(d3d11_iface); } static void STDMETHODCALLTYPE d3d10_device_SOGetTargets(ID3D10Device1 *iface, diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index eb8cde40dcc..e9a4cef211d 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -12599,6 +12599,16 @@ static void test_clear_state(void) ok(tmp_ds_state == ds_state, "Got unexpected depth stencil state %p, expected %p.\n", tmp_ds_state, ds_state); ID3D11DepthStencilState_Release(tmp_ds_state); ok(stencil_ref == 3, "Got unexpected stencil ref %u.\n", stencil_ref); + /* For OMGetDepthStencilState() both arguments are optional. */ + ID3D11DeviceContext_OMGetDepthStencilState(context, NULL, NULL); + stencil_ref = 0; + ID3D11DeviceContext_OMGetDepthStencilState(context, NULL, &stencil_ref); + ok(stencil_ref == 3, "Got unexpected stencil ref %u.\n", stencil_ref); + tmp_ds_state = NULL; + ID3D11DeviceContext_OMGetDepthStencilState(context, &tmp_ds_state, NULL); + ok(tmp_ds_state == ds_state, "Got unexpected depth stencil state %p, expected %p.\n", tmp_ds_state, ds_state); + ID3D11DepthStencilState_Release(tmp_ds_state); + ID3D11DeviceContext_OMGetRenderTargets(context, D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT, tmp_rtv, &tmp_dsv); for (i = 0; i < D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT - 1; ++i) { -- 2.33.0

2 1

[PATCH v2 1/3] wined3d: End transform feedback on SO buffer destruction even if the d3d buffer isn't bound.
by Zebediah Figura 19 Oct '21

19 Oct '21

From: Matteo Bruni <mbruni(a)codeweavers.com> It might still be bound in GL. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/buffer.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index d259b64bfaf..1d0d4d23cc5 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -145,12 +145,16 @@ static void wined3d_buffer_gl_destroy_buffer_object(struct wined3d_buffer_gl *bu if (!buffer_gl->b.buffer_object) return; - if (context_gl->c.transform_feedback_active && resource->bind_count - && resource->bind_flags & WINED3D_BIND_STREAM_OUTPUT) + if (context_gl->c.transform_feedback_active && (resource->bind_flags & WINED3D_BIND_STREAM_OUTPUT) + && isStateDirty(&context_gl->c, STATE_STREAM_OUTPUT)) { - /* We have to make sure that transform feedback is not active - * when deleting a potentially bound transform feedback buffer. - * This may happen when the device is being destroyed. */ + /* It's illegal to (un)bind GL_TRANSFORM_FEEDBACK_BUFFER while transform + * feedback is active. Deleting a buffer implicitly unbinds it, so we + * meed to end transform feedback here if this buffer was bound. + * + * This should only be possible if STATE_STREAM_OUTPUT is dirty; if we + * do a draw call before destroying this buffer then the draw call will + * already rebind the GL target. */ WARN("Deleting buffer object for buffer %p, disabling transform feedback.\n", buffer_gl); wined3d_context_gl_end_transform_feedback(context_gl); } -- 2.33.0

3 6

[PATCH] wined3d: End transform feedback on SO buffer destruction even if the D3D buffer isn't bound.
by Henri Verbeet 19 Oct '21

19 Oct '21

From: Matteo Bruni <mbruni(a)codeweavers.com> It might still be bound in GL. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- v3: - Invalidate state in wined3d_device_uninit_3d(). In some sense that's redundant, because the device is subsequently going to be destroyed. However, we now rely on STATE_STREAM_OUTPUT being invalidated during device destruction. (As shown by the test_index_buffer_offset() test.) - Avoid (deprecated) isStateDirty(). - Minor spelling fix. This supersedes patch 217693. dlls/wined3d/buffer.c | 16 ++++++++++------ dlls/wined3d/device.c | 2 +- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index d259b64bfaf..854fa71aefe 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -145,12 +145,16 @@ static void wined3d_buffer_gl_destroy_buffer_object(struct wined3d_buffer_gl *bu if (!buffer_gl->b.buffer_object) return; - if (context_gl->c.transform_feedback_active && resource->bind_count - && resource->bind_flags & WINED3D_BIND_STREAM_OUTPUT) - { - /* We have to make sure that transform feedback is not active - * when deleting a potentially bound transform feedback buffer. - * This may happen when the device is being destroyed. */ + if (context_gl->c.transform_feedback_active && (resource->bind_flags & WINED3D_BIND_STREAM_OUTPUT) + && wined3d_context_is_graphics_state_dirty(&context_gl->c, STATE_STREAM_OUTPUT)) + { + /* It's illegal to (un)bind GL_TRANSFORM_FEEDBACK_BUFFER while transform + * feedback is active. Deleting a buffer implicitly unbinds it, so we + * need to end transform feedback here if this buffer was bound. + * + * This should only be possible if STATE_STREAM_OUTPUT is dirty; if we + * do a draw call before destroying this buffer then the draw call will + * already rebind the GL target. */ WARN("Deleting buffer object for buffer %p, disabling transform feedback.\n", buffer_gl); wined3d_context_gl_end_transform_feedback(context_gl); } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 86945485e20..1c584b93fe0 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1182,7 +1182,7 @@ void wined3d_device_uninit_3d(struct wined3d_device *device) wined3d_texture_decref(texture); } - wined3d_device_context_emit_reset_state(&device->cs->c, false); + wined3d_device_context_emit_reset_state(&device->cs->c, true); state_cleanup(state); wine_rb_clear(&device->samplers, device_free_sampler, NULL); -- 2.20.1

1 0

[PATCH v2] winex11.drv: Add VRAM size to GPU hardware information if available.
by Paul Gofman 19 Oct '21

19 Oct '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v2: - add device local heap sizes instead of taking maximum (matches wined3d behaviour). dlls/winex11.drv/display.c | 11 +++++++++++ dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/xrandr.c | 11 +++++++++++ 3 files changed, 23 insertions(+) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index bf32e82cb3e..c1d405ae951 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -464,6 +464,8 @@ static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT g WCHAR *driver, LUID *gpu_luid) { static const WCHAR adapter_stringW[] = {'H','a','r','d','w','a','r','e','I','n','f','o','r','m','a','t','i','o','n','.','A','d','a','p','t','e','r','S','t','r','i','n','g',0}; + static const WCHAR qw_mem_sizeW[] = {'H','a','r','d','w','a','r','e','I','n','f','o','r','m','a','t','i','o','n','.','q','w','M','e','m','o','r','y','S','i','z','e',0}; + static const WCHAR mem_sizeW[] = {'H','a','r','d','w','a','r','e','I','n','f','o','r','m','a','t','i','o','n','.','M','e','m','o','r','y','S','i','z','e',0}; static const WCHAR bios_stringW[] = {'H','a','r','d','w','a','r','e','I','n','f','o','r','m','a','t','i','o','n','.','B','i','o','s','S','t','r','i','n','g',0}; static const WCHAR chip_typeW[] = {'H','a','r','d','w','a','r','e','I','n','f','o','r','m','a','t','i','o','n','.','C','h','i','p','T','y','p','e',0}; static const WCHAR dac_typeW[] = {'H','a','r','d','w','a','r','e','I','n','f','o','r','m','a','t','i','o','n','.','D','a','c','T','y','p','e',0}; @@ -566,6 +568,15 @@ static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT g if (RegSetValueExW(hkey, dac_typeW, 0, REG_BINARY, (const BYTE *)ramdacW, sizeof(ramdacW))) goto done; + if (gpu->vram_size) + { + size = min(0xfff00000, gpu->vram_size); + if (RegSetValueExW(hkey, mem_sizeW, 0, REG_DWORD, (const BYTE *)&size, sizeof(size))) + goto done; + if (RegSetValueExW(hkey, qw_mem_sizeW, 0, REG_QWORD, (const BYTE *)&gpu->vram_size, sizeof(gpu->vram_size))) + goto done; + } + RegCloseKey(hkey); /* Retrieve driver value for adapters */ diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index e82ee921830..07f83b6a5fc 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -732,6 +732,7 @@ struct x11drv_gpu UINT revision_id; /* Vulkan device UUID */ GUID vulkan_uuid; + UINT64 vram_size; }; /* Represent an adapter in EnumDisplayDevices context */ diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 8faece9023a..0ced47d4e57 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -650,8 +650,10 @@ static BOOL get_gpu_properties_from_vulkan( struct x11drv_gpu *gpu, const XRRPro }; const struct vulkan_funcs *vulkan_funcs = get_vulkan_driver( WINE_VULKAN_DRIVER_VERSION ); VkResult (*pvkGetRandROutputDisplayEXT)( VkPhysicalDevice, Display *, RROutput, VkDisplayKHR * ); + PFN_vkGetPhysicalDeviceMemoryProperties pvkGetPhysicalDeviceMemoryProperties; PFN_vkGetPhysicalDeviceProperties2KHR pvkGetPhysicalDeviceProperties2KHR; PFN_vkEnumeratePhysicalDevices pvkEnumeratePhysicalDevices; + VkPhysicalDeviceMemoryProperties memory_properties; uint32_t device_count, device_idx, output_idx; VkPhysicalDevice *vk_physical_devices = NULL; VkPhysicalDeviceProperties2 properties2; @@ -660,6 +662,7 @@ static BOOL get_gpu_properties_from_vulkan( struct x11drv_gpu *gpu, const XRRPro VkInstance vk_instance = NULL; VkDisplayKHR vk_display; BOOL ret = FALSE; + unsigned int i; VkResult vr; if (!vulkan_funcs) @@ -686,6 +689,7 @@ static BOOL get_gpu_properties_from_vulkan( struct x11drv_gpu *gpu, const XRRPro LOAD_VK_FUNC(vkEnumeratePhysicalDevices) LOAD_VK_FUNC(vkGetPhysicalDeviceProperties2KHR) + LOAD_VK_FUNC(vkGetPhysicalDeviceMemoryProperties) LOAD_VK_FUNC(vkGetRandROutputDisplayEXT) #undef LOAD_VK_FUNC @@ -724,6 +728,13 @@ static BOOL get_gpu_properties_from_vulkan( struct x11drv_gpu *gpu, const XRRPro pvkGetPhysicalDeviceProperties2KHR( vk_physical_devices[device_idx], &properties2 ); memcpy( &gpu->vulkan_uuid, id.deviceUUID, sizeof(id.deviceUUID) ); + pvkGetPhysicalDeviceMemoryProperties( vk_physical_devices[device_idx], &memory_properties ); + gpu->vram_size = 0; + for (i = 0; i < memory_properties.memoryHeapCount; ++i) + { + if (memory_properties.memoryHeaps[i].flags & VK_MEMORY_HEAP_DEVICE_LOCAL_BIT) + gpu->vram_size += memory_properties.memoryHeaps[i].size; + } /* Ignore Khronos vendor IDs */ if (properties2.properties.vendorID < 0x10000) { -- 2.31.1

1 0

[PATCH] winex11.drv: Add VRAM size to GPU hardware information if available.
by Paul Gofman 19 Oct '21

19 Oct '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/winex11.drv/display.c | 11 +++++++++++ dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/xrandr.c | 11 +++++++++++ 3 files changed, 23 insertions(+) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index bf32e82cb3e..c1d405ae951 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -464,6 +464,8 @@ static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT g WCHAR *driver, LUID *gpu_luid) { static const WCHAR adapter_stringW[] = {'H','a','r','d','w','a','r','e','I','n','f','o','r','m','a','t','i','o','n','.','A','d','a','p','t','e','r','S','t','r','i','n','g',0}; + static const WCHAR qw_mem_sizeW[] = {'H','a','r','d','w','a','r','e','I','n','f','o','r','m','a','t','i','o','n','.','q','w','M','e','m','o','r','y','S','i','z','e',0}; + static const WCHAR mem_sizeW[] = {'H','a','r','d','w','a','r','e','I','n','f','o','r','m','a','t','i','o','n','.','M','e','m','o','r','y','S','i','z','e',0}; static const WCHAR bios_stringW[] = {'H','a','r','d','w','a','r','e','I','n','f','o','r','m','a','t','i','o','n','.','B','i','o','s','S','t','r','i','n','g',0}; static const WCHAR chip_typeW[] = {'H','a','r','d','w','a','r','e','I','n','f','o','r','m','a','t','i','o','n','.','C','h','i','p','T','y','p','e',0}; static const WCHAR dac_typeW[] = {'H','a','r','d','w','a','r','e','I','n','f','o','r','m','a','t','i','o','n','.','D','a','c','T','y','p','e',0}; @@ -566,6 +568,15 @@ static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT g if (RegSetValueExW(hkey, dac_typeW, 0, REG_BINARY, (const BYTE *)ramdacW, sizeof(ramdacW))) goto done; + if (gpu->vram_size) + { + size = min(0xfff00000, gpu->vram_size); + if (RegSetValueExW(hkey, mem_sizeW, 0, REG_DWORD, (const BYTE *)&size, sizeof(size))) + goto done; + if (RegSetValueExW(hkey, qw_mem_sizeW, 0, REG_QWORD, (const BYTE *)&gpu->vram_size, sizeof(gpu->vram_size))) + goto done; + } + RegCloseKey(hkey); /* Retrieve driver value for adapters */ diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index e82ee921830..07f83b6a5fc 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -732,6 +732,7 @@ struct x11drv_gpu UINT revision_id; /* Vulkan device UUID */ GUID vulkan_uuid; + UINT64 vram_size; }; /* Represent an adapter in EnumDisplayDevices context */ diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 8faece9023a..3ce9d930784 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -650,8 +650,10 @@ static BOOL get_gpu_properties_from_vulkan( struct x11drv_gpu *gpu, const XRRPro }; const struct vulkan_funcs *vulkan_funcs = get_vulkan_driver( WINE_VULKAN_DRIVER_VERSION ); VkResult (*pvkGetRandROutputDisplayEXT)( VkPhysicalDevice, Display *, RROutput, VkDisplayKHR * ); + PFN_vkGetPhysicalDeviceMemoryProperties pvkGetPhysicalDeviceMemoryProperties; PFN_vkGetPhysicalDeviceProperties2KHR pvkGetPhysicalDeviceProperties2KHR; PFN_vkEnumeratePhysicalDevices pvkEnumeratePhysicalDevices; + VkPhysicalDeviceMemoryProperties memory_properties; uint32_t device_count, device_idx, output_idx; VkPhysicalDevice *vk_physical_devices = NULL; VkPhysicalDeviceProperties2 properties2; @@ -660,6 +662,7 @@ static BOOL get_gpu_properties_from_vulkan( struct x11drv_gpu *gpu, const XRRPro VkInstance vk_instance = NULL; VkDisplayKHR vk_display; BOOL ret = FALSE; + unsigned int i; VkResult vr; if (!vulkan_funcs) @@ -686,6 +689,7 @@ static BOOL get_gpu_properties_from_vulkan( struct x11drv_gpu *gpu, const XRRPro LOAD_VK_FUNC(vkEnumeratePhysicalDevices) LOAD_VK_FUNC(vkGetPhysicalDeviceProperties2KHR) + LOAD_VK_FUNC(vkGetPhysicalDeviceMemoryProperties) LOAD_VK_FUNC(vkGetRandROutputDisplayEXT) #undef LOAD_VK_FUNC @@ -724,6 +728,13 @@ static BOOL get_gpu_properties_from_vulkan( struct x11drv_gpu *gpu, const XRRPro pvkGetPhysicalDeviceProperties2KHR( vk_physical_devices[device_idx], &properties2 ); memcpy( &gpu->vulkan_uuid, id.deviceUUID, sizeof(id.deviceUUID) ); + pvkGetPhysicalDeviceMemoryProperties( vk_physical_devices[device_idx], &memory_properties ); + gpu->vram_size = 0; + for (i = 0; i < memory_properties.memoryHeapCount; ++i) + { + if (memory_properties.memoryHeaps[i].flags & VK_MEMORY_HEAP_DEVICE_LOCAL_BIT) + gpu->vram_size = max( gpu->vram_size, memory_properties.memoryHeaps[i].size ); + } /* Ignore Khronos vendor IDs */ if (properties2.properties.vendorID < 0x10000) { -- 2.31.1

2 3

[PATCH] server: ifdefs guards for unistd.h and sys/types.h
by Craig Andrews 19 Oct '21

19 Oct '21

unistd.h and sys/types.h should have ifdef HAVE_UNISTD_H and ifdef HAVE_SYS_TYPES_H guards, respectively. These includes were added in commit 8184bcc9 Signed-off-by: Craig Andrews <candrews(a)integralblue.com> --- server/token.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/server/token.c b/server/token.c index 820a7a0e07d..aec5aca12ac 100644 --- a/server/token.c +++ b/server/token.c @@ -26,8 +26,15 @@ #include <stdio.h> #include <stdlib.h> #include <stdarg.h> + +#ifdef HAVE_SYS_TYPES_H #include <sys/types.h> +#endif + +#ifdef HAVE_UNISTD_H #include <unistd.h> +#endif + #include "ntstatus.h" #define WIN32_NO_STATUS -- 2.32.0

2 3

← Newer
1
...
24
25
26
27
28
29
30
...
78
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-devel October 2021