[PATCH 0/6] MR1664: Actually start enabling long integral types in wined3d.

List overview All Threads

newer

older

[PATCH v3 0/3] MR1662:...

[PATCH 0/1] MR1677: quartz/tests:...

eric pouech (＠epo)

3 Dec 2022 3 Dec '22

9 a.m.

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/1664

Show replies by date

Eric Pouech

3 Dec 3 Dec

9 a.m.

New subject: [PATCH 1/6] wined3d: Transfer long types' enabling at file level.

From: Eric Pouech eric.pouech@gmail.com

diff --git a/dlls/wined3d/Makefile.in b/dlls/wined3d/Makefile.in index 23051f2a58b..07431281259 100644 --- a/dlls/wined3d/Makefile.in +++ b/dlls/wined3d/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wined3d.dll IMPORTLIB = wined3d IMPORTS = $(VKD3D_PE_LIBS) dxguid opengl32 user32 gdi32 advapi32 diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 7ea14a4abd5..2d2867b638e 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -20,6 +20,7 @@ * 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 <stdio.h>

diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 90ffec4b1f7..213d87a8738 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -15,6 +15,7 @@ * 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"

diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 4176eda91af..a3005a3cfe0 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -26,6 +26,7 @@ * 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 <stdio.h>

diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index 5aa6c0697e6..2ef05c3c0f6 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -17,6 +17,7 @@ * 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 <stdio.h>

diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 504d58b6dfe..f76a9f6fcfc 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -21,6 +21,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * */ +#define WINE_NO_LONG_TYPES /* temporary */

#include "wined3d_private.h"

diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 8c285f3eba7..9ddcc9a40d2 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -23,6 +23,7 @@ * 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"

diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 23780b40a76..9f5208c6bd9 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -15,6 +15,7 @@ * 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"

diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 589906d8804..9fead3e6e09 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -23,6 +23,7 @@ * 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"

diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index ed828615101..e0f8cca2845 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -20,6 +20,7 @@ * 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" #include "winternl.h" diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 1dbeb9351d8..e0e35b60d7c 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -20,6 +20,7 @@ * 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 */

/* * D3D shader asm has swizzles on source parameters, and write masks for diff --git a/dlls/wined3d/nvidia_texture_shader.c b/dlls/wined3d/nvidia_texture_shader.c index a0fdaa6a9ca..efa9f703d2f 100644 --- a/dlls/wined3d/nvidia_texture_shader.c +++ b/dlls/wined3d/nvidia_texture_shader.c @@ -19,6 +19,7 @@ * 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 <stdio.h>

diff --git a/dlls/wined3d/palette.c b/dlls/wined3d/palette.c index d15938f3962..40e2b6c7941 100644 --- a/dlls/wined3d/palette.c +++ b/dlls/wined3d/palette.c @@ -18,6 +18,7 @@ * 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"

diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 20fbd9bcd67..86a771389a0 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -21,6 +21,7 @@ * 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 <stdio.h> #include <string.h> diff --git a/dlls/wined3d/shader_sm1.c b/dlls/wined3d/shader_sm1.c index 1a2f0fe17dc..553dff20fef 100644 --- a/dlls/wined3d/shader_sm1.c +++ b/dlls/wined3d/shader_sm1.c @@ -21,6 +21,7 @@ * 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"

diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 62aba18a235..9c1cf185f24 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -15,6 +15,7 @@ * 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"

diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 5e5462c5652..3479b407974 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -24,6 +24,7 @@ * 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 <stdio.h>

diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index ab2b41f1c61..57f452111a2 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -21,6 +21,7 @@ * 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"

diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index f9b6ceedeab..ad854e7f790 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -25,6 +25,7 @@ * 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"

diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 83badc1c35b..ab0660b9f6c 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -19,6 +19,7 @@ * 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"

diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 6f2b2f02623..641bf0355eb 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -19,6 +19,7 @@ * 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"

diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 56f383dc763..16f660a9d71 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -23,6 +23,7 @@ * 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 <stdio.h>

diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index cd57853dab2..cc18d2ea9ec 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -21,6 +21,7 @@ * 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"

diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 0a502bf78b3..a650ab4c4bd 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * */ +#define WINE_NO_LONG_TYPES /* temporary */

#include "wined3d_private.h" #include "wined3d_shaders.h" diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 3aab52f9309..b52891c631e 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -21,6 +21,7 @@ * 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 */

#define VKD3D_NO_VULKAN_H #define VKD3D_NO_WIN32_TYPES

-- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1664

Eric Pouech

9 a.m.

New subject: [PATCH 2/6] wined3d: Store GetLastError() into an unsigned int.

From: Eric Pouech eric.pouech@gmail.com

Signed-off-by: Eric Pouech eric.pouech@gmail.com --- dlls/wined3d/adapter_gl.c | 2 +- dlls/wined3d/context_gl.c | 4 ++-- dlls/wined3d/wined3d_main.c | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 2d2867b638e..8353a10a87a 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -264,7 +264,7 @@ static void wined3d_caps_gl_ctx_destroy(const struct wined3d_caps_gl_ctx *ctx)

if (!wglDeleteContext(ctx->gl_ctx)) { - DWORD err = GetLastError(); + unsigned int err = GetLastError(); ERR("wglDeleteContext(%p) failed, last error %#x.\n", ctx->gl_ctx, err); }

diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 9ddcc9a40d2..689b76fe64e 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -1543,7 +1543,7 @@ static void wined3d_context_gl_cleanup(struct wined3d_context_gl *context_gl)

if (!wglDeleteContext(context_gl->gl_ctx)) { - DWORD err = GetLastError(); + unsigned int err = GetLastError(); ERR("Failed to delete GL context %p, last error %#x.\n", context_gl->gl_ctx, err); }

@@ -1615,7 +1615,7 @@ BOOL wined3d_context_gl_set_current(struct wined3d_context_gl *context_gl) TRACE("Clearing current D3D context.\n"); if (!wglMakeCurrent(NULL, NULL)) { - DWORD err = GetLastError(); + unsigned int err = GetLastError(); ERR("Failed to clear current GL context, last error %#x.\n", err); TlsSetValue(wined3d_context_tls_idx, NULL); return FALSE; diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index b52891c631e..2837503f574 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -275,7 +275,7 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) wined3d_context_tls_idx = TlsAlloc(); if (wined3d_context_tls_idx == TLS_OUT_OF_INDEXES) { - DWORD err = GetLastError(); + unsigned int err = GetLastError(); ERR("Failed to allocate context TLS index, err %#x.\n", err); return FALSE; } @@ -300,7 +300,7 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) ERR("Failed to register window class 'WineD3D_OpenGL'!\n"); if (!TlsFree(wined3d_context_tls_idx)) { - DWORD err = GetLastError(); + unsigned int err = GetLastError(); ERR("Failed to free context TLS index, err %#x.\n", err); } return FALSE; @@ -502,7 +502,7 @@ static BOOL wined3d_dll_destroy(HINSTANCE hInstDLL)

if (!TlsFree(wined3d_context_tls_idx)) { - DWORD err = GetLastError(); + unsigned int err = GetLastError(); ERR("Failed to free context TLS index, err %#x.\n", err); }

-- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1664

Eric Pouech

9 a.m.

New subject: [PATCH 3/6] wined3d: Enable long types in adapter_vk.c.

From: Eric Pouech eric.pouech@gmail.com

--- dlls/wined3d/adapter_vk.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 213d87a8738..f7902dfb498 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -15,7 +15,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"

@@ -496,7 +495,7 @@ static HRESULT adapter_vk_create_device(struct wined3d *wined3d, const struct wi if (FAILED(hr = wined3d_device_init(&device_vk->d, wined3d, adapter->ordinal, device_type, focus_window, flags, surface_alignment, levels, level_count, vk_info->supported, device_parent))) { - WARN("Failed to initialize device, hr %#x.\n", hr); + WARN("Failed to initialize device, hr %#lx.\n", hr); wined3d_allocator_cleanup(&device_vk->allocator); goto fail; } @@ -676,7 +675,7 @@ static HRESULT adapter_vk_init_3d(struct wined3d_device *device) if (FAILED(hr = device->shader_backend->shader_alloc_private(device, device->adapter->vertex_pipe, device->adapter->fragment_pipe))) { - ERR("Failed to allocate shader private data, hr %#x.\n", hr); + ERR("Failed to allocate shader private data, hr %#lx.\n", hr); wined3d_context_vk_cleanup(context_vk); return hr; } @@ -1300,7 +1299,7 @@ static HRESULT adapter_vk_create_swapchain(struct wined3d_device *device, if (FAILED(hr = wined3d_swapchain_vk_init(swapchain_vk, device, desc, state_parent, parent, parent_ops))) { - WARN("Failed to initialise swapchain, hr %#x.\n", hr); + WARN("Failed to initialise swapchain, hr %#lx.\n", hr); heap_free(swapchain_vk); return hr; } @@ -1351,7 +1350,7 @@ static HRESULT adapter_vk_create_buffer(struct wined3d_device *device,

if (FAILED(hr = wined3d_buffer_vk_init(buffer_vk, device, desc, data, parent, parent_ops))) { - WARN("Failed to initialise buffer, hr %#x.\n", hr); + WARN("Failed to initialise buffer, hr %#lx.\n", hr); heap_free(buffer_vk); return hr; } @@ -1398,7 +1397,7 @@ static HRESULT adapter_vk_create_texture(struct wined3d_device *device, if (FAILED(hr = wined3d_texture_vk_init(texture_vk, device, desc, layer_count, level_count, flags, parent, parent_ops))) { - WARN("Failed to initialise texture, hr %#x.\n", hr); + WARN("Failed to initialise texture, hr %#lx.\n", hr); heap_free(texture_vk); return hr; } @@ -1449,7 +1448,7 @@ static HRESULT adapter_vk_create_rendertarget_view(const struct wined3d_view_des

if (FAILED(hr = wined3d_rendertarget_view_vk_init(view_vk, desc, resource, parent, parent_ops))) { - WARN("Failed to initialise view, hr %#x.\n", hr); + WARN("Failed to initialise view, hr %#lx.\n", hr); heap_free(view_vk); return hr; } @@ -1591,7 +1590,7 @@ static HRESULT adapter_vk_create_shader_resource_view(const struct wined3d_view_

if (FAILED(hr = wined3d_shader_resource_view_vk_init(view_vk, desc, resource, parent, parent_ops))) { - WARN("Failed to initialise view, hr %#x.\n", hr); + WARN("Failed to initialise view, hr %#lx.\n", hr); heap_free(view_vk); return hr; } @@ -1644,7 +1643,7 @@ static HRESULT adapter_vk_create_unordered_access_view(const struct wined3d_view

if (FAILED(hr = wined3d_unordered_access_view_vk_init(view_vk, desc, resource, parent, parent_ops))) { - WARN("Failed to initialise view, hr %#x.\n", hr); + WARN("Failed to initialise view, hr %#lx.\n", hr); heap_free(view_vk); return hr; }

-- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1664

Eric Pouech

9 a.m.

New subject: [PATCH 4/6] wined3d: Enable long types in ati_fragment_shader.c.

From: Eric Pouech eric.pouech@gmail.com

--- dlls/wined3d/ati_fragment_shader.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index 2ef05c3c0f6..46fa5d4d64f 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -17,7 +17,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 <stdio.h>

@@ -258,7 +257,7 @@ static void wrap_op3(const struct wined3d_gl_info *gl_info, GLuint op, GLuint ds } }

-static GLuint register_for_arg(DWORD arg, const struct wined3d_gl_info *gl_info, +static GLuint register_for_arg(unsigned int arg, const struct wined3d_gl_info *gl_info, unsigned int stage, GLuint *mod, GLuint *rep, GLuint tmparg) { GLenum ret;

-- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1664

Eric Pouech

9 a.m.

New subject: [PATCH 5/6] wined3d: Reduce long integral type usage in wined3d_main.c.

From: Eric Pouech eric.pouech@gmail.com

--- dlls/wined3d/wined3d_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 2837503f574..68114256cf1 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -204,7 +204,7 @@ static DWORD get_config_key(HKEY defkey, HKEY appkey, const char *env, const cha return ERROR_FILE_NOT_FOUND; }

-static DWORD get_config_key_dword(HKEY defkey, HKEY appkey, const char *env, const char *name, DWORD *value) +static DWORD get_config_key_dword(HKEY defkey, HKEY appkey, const char *env, const char *name, unsigned int *value) { DWORD type, data, size; const char *env_value; @@ -269,7 +269,7 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) const char *env; HKEY hkey = 0; HKEY appkey = 0; - DWORD tmpvalue; + unsigned int tmpvalue; WNDCLASSA wc;

wined3d_context_tls_idx = TlsAlloc();

-- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1664

Eric Pouech

9 a.m.

New subject: [PATCH 6/6] wined3d: Enable long types in wined3d_main.c.

From: Eric Pouech eric.pouech@gmail.com

--- dlls/wined3d/wined3d_main.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 68114256cf1..bcaf1651db8 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.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 */

#define VKD3D_NO_VULKAN_H #define VKD3D_NO_WIN32_TYPES @@ -146,7 +145,7 @@ struct wined3d * CDECL wined3d_create(uint32_t flags)

if (FAILED(hr = wined3d_init(object, flags))) { - WARN("Failed to initialize wined3d object, hr %#x.\n", hr); + WARN("Failed to initialize wined3d object, hr %#lx.\n", hr); heap_free(object); return NULL; } @@ -570,7 +569,7 @@ static struct wined3d_output * wined3d_get_output_from_window(const struct wined monitor_info.cbSize = sizeof(monitor_info); if (!GetMonitorInfoW(monitor, (MONITORINFO *)&monitor_info)) { - ERR("GetMonitorInfoW failed, error %#x.\n", GetLastError()); + ERR("GetMonitorInfoW failed, error %#lx.\n", GetLastError()); return NULL; }

-- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1664

Zebediah Figura (＠zfigura)

5 Dec 5 Dec

7:56 p.m.

New subject: [PATCH 0/6] MR1664: Actually start enabling long integral types in wined3d. - approved

This merge request was approved by Zebediah Figura.

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/1664

794

Age (days ago)

796

Last active (days ago)

wine-gitlab@winehq.org

7 comments

3 participants

tags (0)

participants (3)

Eric Pouech
eric pouech (＠epo)
Zebediah Figura (＠zfigura)