- Wine-Commits - list.winehq.org

Eric Pouech : wined3d: Reduce usage of long integral types in swapchain.c.
by Alexandre Julliard Dec. 6, 2022

Dec. 6, 2022

Module: wine Branch: master Commit: 14258485ea4ecec13c0385f5aad325a787a17926 URL: https://gitlab.winehq.org/wine/wine/-/commit/14258485ea4ecec13c0385f5aad325… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Dec 6 14:20:10 2022 +0100 wined3d: Reduce usage of long integral types in swapchain.c. --- dlls/wined3d/swapchain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index ab0660b9f6c..21ac353603a 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1339,7 +1339,7 @@ static const struct wined3d_swapchain_ops swapchain_no3d_ops = }; static void wined3d_swapchain_apply_sample_count_override(const struct wined3d_swapchain *swapchain, - enum wined3d_format_id format_id, enum wined3d_multisample_type *type, DWORD *quality) + enum wined3d_format_id format_id, enum wined3d_multisample_type *type, unsigned int *quality) { const struct wined3d_adapter *adapter; const struct wined3d_gl_info *gl_info;

1 0

Paul Gofman : windows.devices.enumeration/tests: Make test handlers structure static.
by Alexandre Julliard Dec. 6, 2022

Dec. 6, 2022

Module: wine Branch: master Commit: 0da7ad35f130a2ea59380dcad2179b972b3a909d URL: https://gitlab.winehq.org/wine/wine/-/commit/0da7ad35f130a2ea59380dcad2179b… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Dec 6 09:55:01 2022 -0600 windows.devices.enumeration/tests: Make test handlers structure static. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54085 --- dlls/windows.devices.enumeration/tests/devices.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windows.devices.enumeration/tests/devices.c b/dlls/windows.devices.enumeration/tests/devices.c index 72bce374410..c65312ea800 100644 --- a/dlls/windows.devices.enumeration/tests/devices.c +++ b/dlls/windows.devices.enumeration/tests/devices.c @@ -139,7 +139,7 @@ static void test_DeviceInformation( void ) { static const WCHAR *device_info_name = L"Windows.Devices.Enumeration.DeviceInformation"; - struct device_watcher_handler stopped_handler, added_handler; + static struct device_watcher_handler stopped_handler, added_handler; EventRegistrationToken stopped_token, added_token; IInspectable *inspectable, *inspectable2; IActivationFactory *factory;

1 0

Eric Pouech : wined3d: Enable long types in swapchain.c.
by Alexandre Julliard Dec. 6, 2022

Dec. 6, 2022

Module: wine Branch: master Commit: dabd4ac7368eb360851401f32d2988e185adefee URL: https://gitlab.winehq.org/wine/wine/-/commit/dabd4ac7368eb360851401f32d2988… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Dec 6 14:20:12 2022 +0100 wined3d: Enable long types in swapchain.c. --- dlls/wined3d/swapchain.c | 67 ++++++++++++++++++++++++------------------------ 1 file changed, 33 insertions(+), 34 deletions(-)

1 0

Paul Gofman : windows.devices.enumeration/tests: Fix reference count test in device_watcher_handler_Invoke().
by Alexandre Julliard Dec. 6, 2022

Dec. 6, 2022

Module: wine Branch: master Commit: c77f60df83254c902367f25d719d0b66d493cf2d URL: https://gitlab.winehq.org/wine/wine/-/commit/c77f60df83254c902367f25d719d0b… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Dec 6 09:36:57 2022 -0600 windows.devices.enumeration/tests: Fix reference count test in device_watcher_handler_Invoke(). --- dlls/windows.devices.enumeration/tests/devices.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/windows.devices.enumeration/tests/devices.c b/dlls/windows.devices.enumeration/tests/devices.c index b146f4b0698..72bce374410 100644 --- a/dlls/windows.devices.enumeration/tests/devices.c +++ b/dlls/windows.devices.enumeration/tests/devices.c @@ -110,8 +110,9 @@ static HRESULT WINAPI device_watcher_handler_Invoke( ITypedEventHandler_DeviceWa impl->invoked = TRUE; impl->args = args; + IDeviceWatcher_AddRef( sender ); ref = IDeviceWatcher_Release( sender ); - ok( ref == 2, "got ref %lu\n", ref ); + ok( ref == 3, "got ref %lu\n", ref ); SetEvent( impl->event );

1 0

Eric Pouech : wined3d: Enable long types in buffer.c.
by Alexandre Julliard Dec. 6, 2022

Dec. 6, 2022

Module: wine Branch: master Commit: 26b99cc14c3d0aa420d9eaf16944c10823b51b77 URL: https://gitlab.winehq.org/wine/wine/-/commit/26b99cc14c3d0aa420d9eaf16944c1… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Dec 6 14:12:23 2022 +0100 wined3d: Enable long types in buffer.c. --- dlls/wined3d/buffer.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 5896fbcc20a..2f6c52ef36f 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -21,7 +21,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * */ -#define WINE_NO_LONG_TYPES /* temporary */ #include "wined3d_private.h" @@ -1288,7 +1287,7 @@ static HRESULT wined3d_buffer_init(struct wined3d_buffer *buffer, struct wined3d WINED3D_MULTISAMPLE_NONE, 0, desc->usage, desc->bind_flags, access, desc->byte_width, 1, 1, desc->byte_width, parent, parent_ops, &buffer_resource_ops))) { - WARN("Failed to initialize resource, hr %#x.\n", hr); + WARN("Failed to initialize resource, hr %#lx.\n", hr); return hr; } buffer->buffer_ops = buffer_ops;

1 0

Eric Pouech : wined3d: Reduce usage of long integral types in buffer.c.
by Alexandre Julliard Dec. 6, 2022

Dec. 6, 2022

Module: wine Branch: master Commit: e95fec3789834cca80fa0bfd86f5fc737e930be1 URL: https://gitlab.winehq.org/wine/wine/-/commit/e95fec3789834cca80fa0bfd86f5fc… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Dec 6 14:12:22 2022 +0100 wined3d: Reduce usage of long integral types in buffer.c. --- dlls/wined3d/buffer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index f76a9f6fcfc..5896fbcc20a 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -242,7 +242,7 @@ static BOOL wined3d_buffer_gl_create_buffer_object(struct wined3d_buffer_gl *buf static BOOL buffer_process_converted_attribute(struct wined3d_buffer *buffer, const enum wined3d_buffer_conversion_type conversion_type, - const struct wined3d_stream_info_element *attrib, DWORD *stride_this_run) + const struct wined3d_stream_info_element *attrib, UINT *stride_this_run) { const struct wined3d_format *format = attrib->format; BOOL ret = FALSE; @@ -299,7 +299,7 @@ static BOOL buffer_process_converted_attribute(struct wined3d_buffer *buffer, #define WINED3D_BUFFER_FIXUP_XYZRHW 0x02 static BOOL buffer_check_attribute(struct wined3d_buffer *This, const struct wined3d_stream_info *si, - const struct wined3d_state *state, UINT attrib_idx, DWORD fixup_flags, DWORD *stride_this_run) + const struct wined3d_state *state, UINT attrib_idx, DWORD fixup_flags, UINT *stride_this_run) { const struct wined3d_stream_info_element *attrib = &si->elements[attrib_idx]; enum wined3d_format_id format;

1 0

Alex Henrie : msi: Remove wrappers around CRT memory allocation functions.
by Alexandre Julliard Dec. 6, 2022

Dec. 6, 2022

1 0

Eric Pouech : wined3d: Reduce usage of long integral types in vertexdeclaration.c.
by Alexandre Julliard Dec. 6, 2022

Dec. 6, 2022

Module: wine Branch: master Commit: 286261f69ebc7e661f5f1d276ccfcf76ca44e363 URL: https://gitlab.winehq.org/wine/wine/-/commit/286261f69ebc7e661f5f1d276ccfcf… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Dec 6 14:12:13 2022 +0100 wined3d: Reduce usage of long integral types in vertexdeclaration.c. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/wined3d/vertexdeclaration.c | 10 +++++----- include/wine/wined3d.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index cc18d2ea9ec..befd0a934f9 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -323,7 +323,7 @@ static void append_decl_element(struct wined3d_fvf_convert_state *state, } static unsigned int convert_fvf_to_declaration(const struct wined3d_adapter *adapter, - DWORD fvf, struct wined3d_vertex_element **elements) + uint32_t fvf, struct wined3d_vertex_element **elements) { BOOL has_pos = !!(fvf & WINED3DFVF_POSITION_MASK); BOOL has_blend = (fvf & WINED3DFVF_XYZB5) > WINED3DFVF_XYZRHW; @@ -336,12 +336,12 @@ static unsigned int convert_fvf_to_declaration(const struct wined3d_adapter *ada BOOL has_diffuse = !!(fvf & WINED3DFVF_DIFFUSE); BOOL has_specular = !!(fvf & WINED3DFVF_SPECULAR); - DWORD num_textures = (fvf & WINED3DFVF_TEXCOUNT_MASK) >> WINED3DFVF_TEXCOUNT_SHIFT; - DWORD texcoords = (fvf & 0xffff0000) >> 16; + unsigned int num_textures = (fvf & WINED3DFVF_TEXCOUNT_MASK) >> WINED3DFVF_TEXCOUNT_SHIFT; + unsigned int texcoords = (fvf & 0xffff0000) >> 16; struct wined3d_fvf_convert_state state; unsigned int size; unsigned int idx; - DWORD num_blends = 1 + (((fvf & WINED3DFVF_XYZB5) - WINED3DFVF_XYZB1) >> 1); + unsigned int num_blends = 1 + (((fvf & WINED3DFVF_XYZB5) - WINED3DFVF_XYZB1) >> 1); if (has_blend_idx) num_blends--; /* Compute declaration size */ @@ -434,7 +434,7 @@ static unsigned int convert_fvf_to_declaration(const struct wined3d_adapter *ada } HRESULT CDECL wined3d_vertex_declaration_create_from_fvf(struct wined3d_device *device, - DWORD fvf, void *parent, const struct wined3d_parent_ops *parent_ops, + uint32_t fvf, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_vertex_declaration **declaration) { struct wined3d_vertex_element *elements; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index ae0bc309b3f..70ab06209d5 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2885,7 +2885,7 @@ HRESULT __cdecl wined3d_vertex_declaration_create(struct wined3d_device *device, const struct wined3d_vertex_element *elements, UINT element_count, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_vertex_declaration **declaration); HRESULT __cdecl wined3d_vertex_declaration_create_from_fvf(struct wined3d_device *device, - DWORD fvf, void *parent, const struct wined3d_parent_ops *parent_ops, + uint32_t fvf, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_vertex_declaration **declaration); ULONG __cdecl wined3d_vertex_declaration_decref(struct wined3d_vertex_declaration *declaration); void * __cdecl wined3d_vertex_declaration_get_parent(const struct wined3d_vertex_declaration *declaration);

1 0

Eric Pouech : wined3d: Enable long types in vertexdeclaration.c.
by Alexandre Julliard Dec. 6, 2022

Dec. 6, 2022

Module: wine Branch: master Commit: c9ef0ed6e46db64a3a31874e091d80d7b61efb82 URL: https://gitlab.winehq.org/wine/wine/-/commit/c9ef0ed6e46db64a3a31874e091d80… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Dec 6 14:12:14 2022 +0100 wined3d: Enable long types in vertexdeclaration.c. --- dlls/wined3d/vertexdeclaration.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index befd0a934f9..e1aaf6dc9bc 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -21,7 +21,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WINE_NO_LONG_TYPES /* temporary */ #include "wined3d_private.h" @@ -280,7 +279,7 @@ HRESULT CDECL wined3d_vertex_declaration_create(struct wined3d_device *device, hr = vertexdeclaration_init(object, device, elements, element_count, parent, parent_ops); if (FAILED(hr)) { - WARN("Failed to initialize vertex declaration, hr %#x.\n", hr); + WARN("Failed to initialize vertex declaration, hr %#lx.\n", hr); heap_free(object); return hr; }

1 0

Eric Pouech : wined3d: Enable long types in context_gl.c.
by Alexandre Julliard Dec. 6, 2022

Dec. 6, 2022

Module: wine Branch: master Commit: d77b31e728133ae8f6ce02ad48662614fd42eb79 URL: https://gitlab.winehq.org/wine/wine/-/commit/d77b31e728133ae8f6ce02ad486626… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Dec 6 14:12:20 2022 +0100 wined3d: Enable long types in context_gl.c. --- dlls/wined3d/context_gl.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 689b76fe64e..65d40f05ab2 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -23,7 +23,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WINE_NO_LONG_TYPES /* temporary */ #include "wined3d_private.h" @@ -1240,7 +1239,7 @@ static BOOL wined3d_context_gl_set_pixel_format(struct wined3d_context_gl *conte else if (!SetPixelFormat(dc, format, NULL)) { /* This may also happen if the dc belongs to a destroyed window. */ - WARN("Failed to set pixel format %d on device context %p, last error %#x.\n", + WARN("Failed to set pixel format %d on device context %p, last error %#lx.\n", format, dc, GetLastError()); return FALSE; } @@ -1273,7 +1272,7 @@ static BOOL wined3d_context_gl_set_gl_context(struct wined3d_context_gl *context if (backup || !wglMakeCurrent(context_gl->dc, context_gl->gl_ctx)) { - WARN("Failed to make GL context %p current on device context %p, last error %#x.\n", + WARN("Failed to make GL context %p current on device context %p, last error %#lx.\n", context_gl->gl_ctx, context_gl->dc, GetLastError()); context_gl->valid = 0; WARN("Trying fallback to the backup window.\n"); @@ -1305,7 +1304,7 @@ static BOOL wined3d_context_gl_set_gl_context(struct wined3d_context_gl *context if (!wglMakeCurrent(context_gl->dc, context_gl->gl_ctx)) { - ERR("Fallback to backup window (dc %p) failed too, last error %#x.\n", + ERR("Fallback to backup window (dc %p) failed too, last error %#lx.\n", context_gl->dc, GetLastError()); wined3d_context_gl_set_current(NULL); return FALSE; @@ -1322,7 +1321,7 @@ static void context_restore_gl_context(const struct wined3d_gl_info *gl_info, HD { if (!wglMakeCurrent(dc, gl_ctx)) { - ERR("Failed to restore GL context %p on device context %p, last error %#x.\n", + ERR("Failed to restore GL context %p on device context %p, last error %#lx.\n", gl_ctx, dc, GetLastError()); wined3d_context_gl_set_current(NULL); } @@ -1910,7 +1909,7 @@ HGLRC context_create_wgl_attribs(const struct wined3d_gl_info *gl_info, HDC hdc, ctx_attribs[ctx_attrib_idx] = 0; } if (!(ctx = gl_info->p_wglCreateContextAttribsARB(hdc, share_ctx, ctx_attribs))) - WARN("Failed to create a WGL context with wglCreateContextAttribsARB, last error %#x.\n", + WARN("Failed to create a WGL context with wglCreateContextAttribsARB, last error %#lx.\n", GetLastError()); } } @@ -2065,10 +2064,10 @@ static BOOL wined3d_context_gl_create_wgl_ctx(struct wined3d_context_gl *context if (share_ctx && !wglShareLists(share_ctx, ctx)) { - ERR("wglShareLists(%p, %p) failed, last error %#x.\n", share_ctx, ctx, GetLastError()); + ERR("wglShareLists(%p, %p) failed, last error %#lx.\n", share_ctx, ctx, GetLastError()); context_release(context); if (!wglDeleteContext(ctx)) - ERR("wglDeleteContext(%p) failed, last error %#x.\n", ctx, GetLastError()); + ERR("wglDeleteContext(%p) failed, last error %#lx.\n", ctx, GetLastError()); return FALSE; } } @@ -2179,7 +2178,7 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi ERR("Cannot activate context to set up defaults.\n"); context_release(context); if (!wglDeleteContext(context_gl->gl_ctx)) - ERR("wglDeleteContext(%p) failed, last error %#x.\n", context_gl->gl_ctx, GetLastError()); + ERR("wglDeleteContext(%p) failed, last error %#lx.\n", context_gl->gl_ctx, GetLastError()); goto fail; } @@ -2707,7 +2706,7 @@ void wined3d_context_gl_submit_command_fence(struct wined3d_context_gl *context_ f = &context_gl->submitted.fences[context_gl->submitted.fence_count++]; f->id = device_gl->current_fence_id; if (FAILED(hr = wined3d_fence_create(&device_gl->d, &f->fence))) - ERR("Failed to create fence, hr %#x.\n", hr); + ERR("Failed to create fence, hr %#lx.\n", hr); wined3d_fence_issue(f->fence, &device_gl->d); /* We don't expect this to ever happen, but handle it anyway. */

1 0