December 2022 - Wine-commits

Jacek Caban : win32u: Move SetTaskmanWindow implementation from user32.
by Alexandre Julliard 09 Dec '22

09 Dec '22

Module: wine Branch: master Commit: 7d53e27cffbd15e618248515689de34268dc05b9 URL: https://gitlab.winehq.org/wine/wine/-/commit/7d53e27cffbd15e618248515689de3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 9 12:54:07 2022 +0100 win32u: Move SetTaskmanWindow implementation from user32. --- dlls/user32/focus.c | 11 ++--------- dlls/win32u/input.c | 15 +++++++++++++++ dlls/win32u/win32u_private.h | 1 + dlls/win32u/window.c | 3 +++ include/ntuser.h | 6 ++++++ 5 files changed, 27 insertions(+), 9 deletions(-) diff --git a/dlls/user32/focus.c b/dlls/user32/focus.c index 18084f7dbfd..4fde8a9df96 100644 --- a/dlls/user32/focus.c +++ b/dlls/user32/focus.c @@ -97,16 +97,9 @@ HWND WINAPI GetProgmanWindow(void) * hwnd = MSTaskSwWClass * |-> SysTabControl32 */ -HWND WINAPI SetTaskmanWindow ( HWND hwnd ) +HWND WINAPI SetTaskmanWindow( HWND hwnd ) { - SERVER_START_REQ(set_global_windows) - { - req->flags = SET_GLOBAL_TASKMAN_WINDOW; - req->taskman_window = wine_server_user_handle( hwnd ); - if (wine_server_call_err( req )) hwnd = 0; - } - SERVER_END_REQ; - return hwnd; + return NtUserSetTaskmanWindow( hwnd ); } /*********************************************************************** diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c index 6d727a934c8..e12a76f434e 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c @@ -2233,3 +2233,18 @@ HWND set_progman_window( HWND hwnd ) SERVER_END_REQ; return hwnd; } + +HWND set_taskman_window( HWND hwnd ) +{ + /* hwnd = MSTaskSwWClass + * |-> SysTabControl32 + */ + SERVER_START_REQ(set_global_windows) + { + req->flags = SET_GLOBAL_TASKMAN_WINDOW; + req->taskman_window = wine_server_user_handle( hwnd ); + if (wine_server_call_err( req )) hwnd = 0; + } + SERVER_END_REQ; + return hwnd; +} diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 67efa7ddefc..3b76d2f0d5b 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -279,6 +279,7 @@ extern BOOL set_caret_blink_time( unsigned int time ) DECLSPEC_HIDDEN; extern BOOL set_caret_pos( int x, int y ) DECLSPEC_HIDDEN; extern BOOL set_foreground_window( HWND hwnd, BOOL mouse ) DECLSPEC_HIDDEN; extern HWND set_progman_window( HWND hwnd ) DECLSPEC_HIDDEN; +extern HWND set_taskman_window( HWND hwnd ) DECLSPEC_HIDDEN; extern void toggle_caret( HWND hwnd ) DECLSPEC_HIDDEN; extern void update_mouse_tracking_info( HWND hwnd ) DECLSPEC_HIDDEN; diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index 91baca39eaa..19348338c46 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -5432,6 +5432,9 @@ ULONG_PTR WINAPI NtUserCallHwnd( HWND hwnd, DWORD code ) case NtUserCallHwnd_SetProgmanWindow: return HandleToUlong( set_progman_window( hwnd )); + case NtUserCallHwnd_SetTaskmanWindow: + return HandleToUlong( set_taskman_window( hwnd )); + /* temporary exports */ case NtUserGetFullWindowHandle: return HandleToUlong( get_full_window_handle( hwnd )); diff --git a/include/ntuser.h b/include/ntuser.h index 3fc0bc71cd4..5e94be6b9dc 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -1182,6 +1182,7 @@ enum NtUserCallHwnd_IsWindowVisible, NtUserCallHwnd_SetForegroundWindow, NtUserCallHwnd_SetProgmanWindow, + NtUserCallHwnd_SetTaskmanWindow, /* temporary exports */ NtUserGetFullWindowHandle, NtUserIsCurrehtProcessWindow, @@ -1284,6 +1285,11 @@ static inline HWND NtUserSetProgmanWindow( HWND hwnd ) return UlongToHandle( NtUserCallHwnd( hwnd, NtUserCallHwnd_SetProgmanWindow )); } +static inline HWND NtUserSetTaskmanWindow( HWND hwnd ) +{ + return UlongToHandle( NtUserCallHwnd( hwnd, NtUserCallHwnd_SetTaskmanWindow )); +} + /* NtUserCallHwndParam codes, not compatible with Windows */ enum {

1 0

Jacek Caban : win32u: Move GetTaskmanWindow implementation from user32.
by Alexandre Julliard 09 Dec '22

09 Dec '22

Module: wine Branch: master Commit: 7fc68b7ac5a0aa0db1006c308b7a2a1be53f7d46 URL: https://gitlab.winehq.org/wine/wine/-/commit/7fc68b7ac5a0aa0db1006c308b7a2a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 9 12:56:06 2022 +0100 win32u: Move GetTaskmanWindow implementation from user32. --- dlls/user32/focus.c | 11 +---------- dlls/win32u/input.c | 14 ++++++++++++++ dlls/win32u/sysparams.c | 3 +++ dlls/win32u/win32u_private.h | 1 + include/ntuser.h | 6 ++++++ 5 files changed, 25 insertions(+), 10 deletions(-) diff --git a/dlls/user32/focus.c b/dlls/user32/focus.c index 4fde8a9df96..3d996b61510 100644 --- a/dlls/user32/focus.c +++ b/dlls/user32/focus.c @@ -107,14 +107,5 @@ HWND WINAPI SetTaskmanWindow( HWND hwnd ) */ HWND WINAPI GetTaskmanWindow(void) { - HWND ret = 0; - - SERVER_START_REQ(set_global_windows) - { - req->flags = 0; - if (!wine_server_call_err(req)) - ret = wine_server_ptr_handle( reply->old_taskman_window ); - } - SERVER_END_REQ; - return ret; + return NtUserGetTaskmanWindow(); } diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c index e12a76f434e..eaad697a63e 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c @@ -2234,6 +2234,20 @@ HWND set_progman_window( HWND hwnd ) return hwnd; } +HWND get_taskman_window(void) +{ + HWND ret = 0; + + SERVER_START_REQ(set_global_windows) + { + req->flags = 0; + if (!wine_server_call_err(req)) + ret = wine_server_ptr_handle( reply->old_taskman_window ); + } + SERVER_END_REQ; + return ret; +} + HWND set_taskman_window( HWND hwnd ) { /* hwnd = MSTaskSwWClass diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 1bd90d85332..13aaaa308c9 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -5443,6 +5443,9 @@ ULONG_PTR WINAPI NtUserCallNoParam( ULONG code ) case NtUserCallNoParam_GetShellWindow: return HandleToUlong( get_shell_window() ); + case NtUserCallNoParam_GetTaskmanWindow: + return HandleToUlong( get_taskman_window() ); + case NtUserCallNoParam_ReleaseCapture: return release_capture(); diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 3b76d2f0d5b..8e294b7924a 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -273,6 +273,7 @@ extern HWND get_focus(void) DECLSPEC_HIDDEN; extern DWORD get_input_state(void) DECLSPEC_HIDDEN; extern HWND get_progman_window(void) DECLSPEC_HIDDEN; extern HWND get_shell_window(void) DECLSPEC_HIDDEN; +extern HWND get_taskman_window(void) DECLSPEC_HIDDEN; extern BOOL WINAPI release_capture(void) DECLSPEC_HIDDEN; extern BOOL set_capture_window( HWND hwnd, UINT gui_flags, HWND *prev_ret ) DECLSPEC_HIDDEN; extern BOOL set_caret_blink_time( unsigned int time ) DECLSPEC_HIDDEN; diff --git a/include/ntuser.h b/include/ntuser.h index 5e94be6b9dc..7bbe7037f20 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -913,6 +913,7 @@ enum NtUserCallNoParam_GetProcessDefaultLayout, NtUserCallNoParam_GetProgmanWindow, NtUserCallNoParam_GetShellWindow, + NtUserCallNoParam_GetTaskmanWindow, NtUserCallNoParam_ReleaseCapture, /* temporary exports */ NtUserExitingThread, @@ -954,6 +955,11 @@ static inline HWND NtUserGetShellWindow(void) return UlongToHandle( NtUserCallNoParam( NtUserCallNoParam_GetShellWindow )); } +static inline HWND NtUserGetTaskmanWindow(void) +{ + return UlongToHandle( NtUserCallNoParam( NtUserCallNoParam_GetTaskmanWindow )); +} + static inline BOOL NtUserReleaseCapture(void) { return NtUserCallNoParam( NtUserCallNoParam_ReleaseCapture );

1 0

Jacek Caban : user32: Merge focus.c into input.c.
by Alexandre Julliard 09 Dec '22

09 Dec '22

Module: wine Branch: master Commit: f44cd1823f61acb83b353918b28850c75749550b URL: https://gitlab.winehq.org/wine/wine/-/commit/f44cd1823f61acb83b353918b28850… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 9 12:58:04 2022 +0100 user32: Merge focus.c into input.c. --- dlls/user32/Makefile.in | 1 - dlls/user32/focus.c | 111 ------------------------------------------------ dlls/user32/input.c | 84 ++++++++++++++++++++++++++++++++++++ 3 files changed, 84 insertions(+), 112 deletions(-) diff --git a/dlls/user32/Makefile.in b/dlls/user32/Makefile.in index 0cf2d575e87..112afa4c9a0 100644 --- a/dlls/user32/Makefile.in +++ b/dlls/user32/Makefile.in @@ -20,7 +20,6 @@ C_SRCS = \ dialog.c \ edit.c \ exticon.c \ - focus.c \ hook.c \ icontitle.c \ input.c \ diff --git a/dlls/user32/focus.c b/dlls/user32/focus.c deleted file mode 100644 index 3d996b61510..00000000000 --- a/dlls/user32/focus.c +++ /dev/null @@ -1,111 +0,0 @@ -/* - * Focus and activation functions - * - * Copyright 1993 David Metcalfe - * Copyright 1995 Alex Korobka - * Copyright 1994, 2002 Alexandre Julliard - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "user_private.h" -#include "wine/server.h" - - -/******************************************************************* - * SetForegroundWindow (USER32.@) - */ -BOOL WINAPI SetForegroundWindow( HWND hwnd ) -{ - return NtUserSetForegroundWindow( hwnd ); -} - - -/******************************************************************* - * GetActiveWindow (USER32.@) - */ -HWND WINAPI GetActiveWindow(void) -{ - GUITHREADINFO info; - info.cbSize = sizeof(info); - return NtUserGetGUIThreadInfo( GetCurrentThreadId(), &info ) ? info.hwndActive : 0; -} - - -/***************************************************************** - * GetFocus (USER32.@) - */ -HWND WINAPI GetFocus(void) -{ - GUITHREADINFO info; - info.cbSize = sizeof(info); - return NtUserGetGUIThreadInfo( GetCurrentThreadId(), &info ) ? info.hwndFocus : 0; -} - - -/******************************************************************* -* SetShellWindow (USER32.@) -*/ -BOOL WINAPI SetShellWindow( HWND hwnd ) -{ - return NtUserSetShellWindowEx( hwnd, hwnd ); -} - - -/******************************************************************* -* GetShellWindow (USER32.@) -*/ -HWND WINAPI GetShellWindow(void) -{ - return NtUserGetShellWindow(); -} - - -/*********************************************************************** - * SetProgmanWindow (USER32.@) - */ -HWND WINAPI SetProgmanWindow( HWND hwnd ) -{ - return NtUserSetProgmanWindow( hwnd ); -} - - -/*********************************************************************** - * GetProgmanWindow (USER32.@) - */ -HWND WINAPI GetProgmanWindow(void) -{ - return NtUserGetProgmanWindow(); -} - - -/*********************************************************************** - * SetTaskmanWindow (USER32.@) - * NOTES - * hwnd = MSTaskSwWClass - * |-> SysTabControl32 - */ -HWND WINAPI SetTaskmanWindow( HWND hwnd ) -{ - return NtUserSetTaskmanWindow( hwnd ); -} - -/*********************************************************************** - * GetTaskmanWindow (USER32.@) - */ -HWND WINAPI GetTaskmanWindow(void) -{ - return NtUserGetTaskmanWindow(); -} diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 34e3a620cc5..c5387cf9212 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -770,3 +770,87 @@ BOOL WINAPI GetPointerTouchInfoHistory( UINT32 id, UINT32 *count, POINTER_TOUCH_ SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); return FALSE; } + + +/******************************************************************* + * SetForegroundWindow (USER32.@) + */ +BOOL WINAPI SetForegroundWindow( HWND hwnd ) +{ + return NtUserSetForegroundWindow( hwnd ); +} + + +/******************************************************************* + * GetActiveWindow (USER32.@) + */ +HWND WINAPI GetActiveWindow(void) +{ + GUITHREADINFO info; + info.cbSize = sizeof(info); + return NtUserGetGUIThreadInfo( GetCurrentThreadId(), &info ) ? info.hwndActive : 0; +} + + +/***************************************************************** + * GetFocus (USER32.@) + */ +HWND WINAPI GetFocus(void) +{ + GUITHREADINFO info; + info.cbSize = sizeof(info); + return NtUserGetGUIThreadInfo( GetCurrentThreadId(), &info ) ? info.hwndFocus : 0; +} + + +/******************************************************************* + * SetShellWindow (USER32.@) + */ +BOOL WINAPI SetShellWindow( HWND hwnd ) +{ + return NtUserSetShellWindowEx( hwnd, hwnd ); +} + + +/******************************************************************* + * GetShellWindow (USER32.@) + */ +HWND WINAPI GetShellWindow(void) +{ + return NtUserGetShellWindow(); +} + + +/*********************************************************************** + * SetProgmanWindow (USER32.@) + */ +HWND WINAPI SetProgmanWindow( HWND hwnd ) +{ + return NtUserSetProgmanWindow( hwnd ); +} + + +/*********************************************************************** + * GetProgmanWindow (USER32.@) + */ +HWND WINAPI GetProgmanWindow(void) +{ + return NtUserGetProgmanWindow(); +} + + +/*********************************************************************** + * SetTaskmanWindow (USER32.@) + */ +HWND WINAPI SetTaskmanWindow( HWND hwnd ) +{ + return NtUserSetTaskmanWindow( hwnd ); +} + +/*********************************************************************** + * GetTaskmanWindow (USER32.@) + */ +HWND WINAPI GetTaskmanWindow(void) +{ + return NtUserGetTaskmanWindow(); +}

1 0

Nikolay Sivov : comctl32: Switch back to internal allocation function.
by Alexandre Julliard 09 Dec '22

09 Dec '22

Module: wine Branch: master Commit: df65aee9267638d56376d56516b12db6aed77339 URL: https://gitlab.winehq.org/wine/wine/-/commit/df65aee9267638d56376d56516b12d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 7 18:58:19 2022 +0300 comctl32: Switch back to internal allocation function. We are still using exported string functions internally, and that caused mismatches after recent incomplete switching to crt functions. There is also no evidence that crt functions are used at all there, so for now switch back to fix mismatching calls. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/animate.c | 28 +++++++-------- dlls/comctl32/button.c | 32 ++++++++--------- dlls/comctl32/combo.c | 21 ++++++----- dlls/comctl32/edit.c | 67 ++++++++++++++++++------------------ dlls/comctl32/header.c | 42 +++++++++++----------- dlls/comctl32/hotkey.c | 6 ++-- dlls/comctl32/imagelist.c | 49 +++++++++++++------------- dlls/comctl32/ipaddress.c | 4 +-- dlls/comctl32/listbox.c | 3 +- dlls/comctl32/listview.c | 88 +++++++++++++++++++++++------------------------ dlls/comctl32/monthcal.c | 26 +++++++------- dlls/comctl32/pager.c | 18 +++++----- dlls/comctl32/progress.c | 2 +- dlls/comctl32/static.c | 10 +++--- dlls/comctl32/treeview.c | 42 +++++++++++----------- dlls/comctl32/updown.c | 10 +++--- 16 files changed, 223 insertions(+), 225 deletions(-)

1 0

Eric Pouech : winedbg: Avoid passing a non allocated buffer to HeapFree.
by Alexandre Julliard 09 Dec '22

09 Dec '22

Module: wine Branch: master Commit: a92257798606e16ab67e982c8619e0fc950b879d URL: https://gitlab.winehq.org/wine/wine/-/commit/a92257798606e16ab67e982c8619e0… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Dec 9 17:37:50 2022 +0100 winedbg: Avoid passing a non allocated buffer to HeapFree. Latest changes to heap management can lead to a crash in this situation. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- programs/winedbg/types.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/winedbg/types.c b/programs/winedbg/types.c index be13c38a158..5f5f1346c67 100644 --- a/programs/winedbg/types.c +++ b/programs/winedbg/types.c @@ -820,7 +820,8 @@ BOOL types_print_type(const struct dbg_type* type, BOOL details, const WCHAR* va } if (varname && !printed) dbg_printf(" %ls", varname); - HeapFree(GetProcessHeap(), 0, ptr); + if (name == ptr) + HeapFree(GetProcessHeap(), 0, ptr); return TRUE; }

1 0

Eric Pouech : wined3d: Reduce usage of long integral types in shader_sm1.c.
by Alexandre Julliard 09 Dec '22

09 Dec '22

Module: wine Branch: master Commit: de990db0a5032dd647c6055edbf8f4c875cd63a3 URL: https://gitlab.winehq.org/wine/wine/-/commit/de990db0a5032dd647c6055edbf8f4… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Dec 9 10:25:21 2022 +0100 wined3d: Reduce usage of long integral types in shader_sm1.c. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/wined3d/shader_sm1.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/shader_sm1.c b/dlls/wined3d/shader_sm1.c index 553dff20fef..ff8d904e463 100644 --- a/dlls/wined3d/shader_sm1.c +++ b/dlls/wined3d/shader_sm1.c @@ -398,7 +398,7 @@ static const enum wined3d_shader_resource_type resource_type_table[] = * and possibly a relative addressing token. * Return the number of tokens read */ static unsigned int shader_get_param(const struct wined3d_sm1_data *priv, const DWORD *ptr, - DWORD *token, DWORD *addr_token) + unsigned int *token, unsigned int *addr_token) { unsigned int count = 1; @@ -427,7 +427,7 @@ static unsigned int shader_get_param(const struct wined3d_sm1_data *priv, const return count; } -static const struct wined3d_sm1_opcode_info *shader_get_opcode(const struct wined3d_sm1_data *priv, DWORD token) +static const struct wined3d_sm1_opcode_info *shader_get_opcode(const struct wined3d_sm1_data *priv, unsigned int token) { unsigned int shader_version = WINED3D_SHADER_VERSION(priv->shader_version.major, priv->shader_version.minor); const struct wined3d_sm1_opcode_info *opcode_table = priv->opcode_table; @@ -503,7 +503,7 @@ static unsigned int shader_skip_unrecognized(const struct wined3d_sm1_data *priv /* TODO: Think of a good name for 0x80000000 and replace it with a constant */ while (*ptr & 0x80000000) { - DWORD token, addr_token = 0; + unsigned int token, addr_token = 0; struct wined3d_shader_src_param rel_addr; tokens_read += shader_get_param(priv, ptr, &token, &addr_token); @@ -594,7 +594,7 @@ static void shader_sm1_read_header(void *data, const DWORD **ptr, struct wined3d static void shader_sm1_read_src_param(struct wined3d_sm1_data *priv, const DWORD **ptr, struct wined3d_shader_src_param *src_param, struct wined3d_shader_src_param *src_rel_addr) { - DWORD token, addr_token; + unsigned int token, addr_token; *ptr += shader_get_param(priv, *ptr, &token, &addr_token); if (token & WINED3D_SM1_ADDRESS_MODE_RELATIVE) @@ -611,7 +611,7 @@ static void shader_sm1_read_src_param(struct wined3d_sm1_data *priv, const DWORD static void shader_sm1_read_dst_param(struct wined3d_sm1_data *priv, const DWORD **ptr, struct wined3d_shader_dst_param *dst_param, struct wined3d_shader_src_param *dst_rel_addr) { - DWORD token, addr_token; + unsigned int token, addr_token; *ptr += shader_get_param(priv, *ptr, &token, &addr_token); if (token & WINED3D_SM1_ADDRESS_MODE_RELATIVE) @@ -724,7 +724,7 @@ static void shader_sm1_read_instruction(void *data, const DWORD **ptr, struct wi { const struct wined3d_sm1_opcode_info *opcode_info; struct wined3d_sm1_data *priv = data; - DWORD opcode_token; + unsigned int opcode_token; unsigned int i; const DWORD *p;

1 0

Eric Pouech : wined3d: Enable long types in shader_sm1.c.
by Alexandre Julliard 09 Dec '22

09 Dec '22

Module: wine Branch: master Commit: 7bea5460ca364682cb954a062e9875597be83265 URL: https://gitlab.winehq.org/wine/wine/-/commit/7bea5460ca364682cb954a062e9875… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Dec 9 10:25:22 2022 +0100 wined3d: Enable long types in shader_sm1.c. --- dlls/wined3d/shader_sm1.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/shader_sm1.c b/dlls/wined3d/shader_sm1.c index ff8d904e463..ed4af5a0409 100644 --- a/dlls/wined3d/shader_sm1.c +++ b/dlls/wined3d/shader_sm1.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" @@ -537,13 +536,13 @@ static void *shader_sm1_init(const DWORD *byte_code, size_t byte_code_size, struct wined3d_sm1_data *priv; BYTE major, minor; - TRACE("Version: 0x%08x.\n", *byte_code); + TRACE("Version: 0x%08lx.\n", *byte_code); major = WINED3D_SM1_VERSION_MAJOR(*byte_code); minor = WINED3D_SM1_VERSION_MINOR(*byte_code); if (WINED3D_SHADER_VERSION(major, minor) > WINED3D_SHADER_VERSION(3, 0)) { - WARN("Invalid shader version %u.%u (%#x).\n", major, minor, *byte_code); + WARN("Invalid shader version %u.%u (%#lx).\n", major, minor, *byte_code); return NULL; } @@ -566,7 +565,7 @@ static void *shader_sm1_init(const DWORD *byte_code, size_t byte_code_size, break; default: - FIXME("Unrecognized shader type %#x.\n", *byte_code >> 16); + FIXME("Unrecognized shader type %#lx.\n", *byte_code >> 16); heap_free(priv); return NULL; }

1 0

Eric Pouech : wined3d: Reduce usage of long integral types in shader_sm4.c.
by Alexandre Julliard 09 Dec '22

09 Dec '22

Module: wine Branch: master Commit: f1f234f44cc55cf9443e070995055d9dcbe36ac1 URL: https://gitlab.winehq.org/wine/wine/-/commit/f1f234f44cc55cf9443e070995055d… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Dec 9 10:25:24 2022 +0100 wined3d: Reduce usage of long integral types in shader_sm4.c. --- dlls/wined3d/shader_sm4.c | 49 ++++++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 9c1cf185f24..ea09d64eb9c 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -579,7 +579,7 @@ static void shader_sm4_read_dcl_resource(struct wined3d_shader_instruction *ins, enum wined3d_sm4_resource_type resource_type; enum wined3d_sm4_data_type data_type; enum wined3d_data_type reg_data_type; - DWORD components; + uint32_t components; resource_type = (opcode_token & WINED3D_SM4_RESOURCE_TYPE_MASK) >> WINED3D_SM4_RESOURCE_TYPE_SHIFT; if (!resource_type || (resource_type >= ARRAY_SIZE(resource_type_table))) @@ -1238,7 +1238,7 @@ static enum wined3d_data_type map_data_type(char t) static enum wined3d_shader_type wined3d_get_sm4_shader_type(const DWORD *byte_code, size_t byte_code_size) { - DWORD shader_type; + unsigned int shader_type; if (byte_code_size / sizeof(*byte_code) < 1) { @@ -1276,7 +1276,7 @@ static enum wined3d_shader_type wined3d_get_sm4_shader_type(const DWORD *byte_co static void *shader_sm4_init(const DWORD *byte_code, size_t byte_code_size, const struct wined3d_shader_signature *output_signature) { - DWORD version_token, token_count; + unsigned int version_token, token_count; struct wined3d_sm4_data *priv; unsigned int i; @@ -1415,7 +1415,7 @@ static BOOL shader_sm4_read_param(struct wined3d_sm4_data *priv, const DWORD **p enum wined3d_shader_src_modifier *modifier) { enum wined3d_sm4_register_type register_type; - DWORD token, order; + uint32_t token, order; if (*ptr >= end) { @@ -1439,7 +1439,7 @@ static BOOL shader_sm4_read_param(struct wined3d_sm4_data *priv, const DWORD **p if (token & WINED3D_SM4_REGISTER_MODIFIER) { - DWORD m; + unsigned int m; if (*ptr >= end) { @@ -1625,7 +1625,7 @@ static BOOL shader_sm4_read_dst_param(struct wined3d_sm4_data *priv, const DWORD return TRUE; } -static void shader_sm4_read_instruction_modifier(DWORD modifier, struct wined3d_shader_instruction *ins) +static void shader_sm4_read_instruction_modifier(uint32_t modifier, struct wined3d_shader_instruction *ins) { enum wined3d_sm4_instruction_modifier modifier_type = modifier & WINED3D_SM4_MODIFIER_MASK; @@ -1661,7 +1661,7 @@ static void shader_sm4_read_instruction_modifier(DWORD modifier, struct wined3d_ case WINED3D_SM5_MODIFIER_DATA_TYPE: { - DWORD components = (modifier & WINED3D_SM5_MODIFIER_DATA_TYPE_MASK) >> WINED3D_SM5_MODIFIER_DATA_TYPE_SHIFT; + uint32_t components = (modifier & WINED3D_SM5_MODIFIER_DATA_TYPE_MASK) >> WINED3D_SM5_MODIFIER_DATA_TYPE_SHIFT; enum wined3d_sm4_data_type data_type = components & 0xf; if ((components & 0xfff0) != (components & 0xf) * 0x1110) @@ -1687,8 +1687,9 @@ static void shader_sm4_read_instruction_modifier(DWORD modifier, struct wined3d_ static void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct wined3d_shader_instruction *ins) { const struct wined3d_sm4_opcode_info *opcode_info; - DWORD opcode_token, opcode, previous_token; + uint32_t opcode_token, previous_token; struct wined3d_sm4_data *priv = data; + unsigned int opcode; unsigned int i, len; SIZE_T remaining; const DWORD *p; @@ -1837,9 +1838,9 @@ const struct wined3d_shader_frontend sm4_shader_frontend = struct aon9_header { DWORD chunk_size; - DWORD shader_version; + unsigned int shader_version; DWORD unknown; - DWORD byte_code_offset; + unsigned int byte_code_offset; }; struct shader_handler_context @@ -1849,7 +1850,7 @@ struct shader_handler_context unsigned int max_version; }; -static void read_dword(const char **ptr, DWORD *d) +static void read_dword(const char **ptr, unsigned int *d) { memcpy(d, *ptr, sizeof(*d)); *ptr += sizeof(*d); @@ -1863,7 +1864,7 @@ static BOOL require_space(size_t offset, size_t count, size_t size, size_t data_ static void skip_dword_unknown(const char **ptr, unsigned int count) { unsigned int i; - DWORD d; + unsigned int d; WARN("Skipping %u unknown DWORDs:\n", count); for (i = 0; i < count; ++i) @@ -1874,15 +1875,15 @@ static void skip_dword_unknown(const char **ptr, unsigned int count) } static HRESULT parse_dxbc(const char *data, SIZE_T data_size, - HRESULT (*chunk_handler)(const char *data, DWORD data_size, DWORD tag, void *ctx), void *ctx) + HRESULT (*chunk_handler)(const char *data, unsigned int data_size, unsigned int tag, void *ctx), void *ctx) { const char *ptr = data; HRESULT hr = S_OK; - DWORD chunk_count; - DWORD total_size; + unsigned int chunk_count; + unsigned int total_size; unsigned int i; - DWORD version; - DWORD tag; + unsigned int version; + unsigned int tag; read_dword(&ptr, &tag); TRACE("tag: %s.\n", debugstr_an((const char *)&tag, 4)); @@ -1912,9 +1913,9 @@ static HRESULT parse_dxbc(const char *data, SIZE_T data_size, for (i = 0; i < chunk_count; ++i) { - DWORD chunk_tag, chunk_size; + unsigned int chunk_tag, chunk_size; const char *chunk_ptr; - DWORD chunk_offset; + unsigned int chunk_offset; read_dword(&ptr, &chunk_offset); TRACE("chunk %u at offset %#x\n", i, chunk_offset); @@ -1944,7 +1945,7 @@ static HRESULT parse_dxbc(const char *data, SIZE_T data_size, return hr; } -static const char *shader_get_string(const char *data, size_t data_size, DWORD offset) +static const char *shader_get_string(const char *data, size_t data_size, unsigned int offset) { if (offset >= data_size) { @@ -1958,14 +1959,14 @@ static const char *shader_get_string(const char *data, size_t data_size, DWORD o return data + offset; } -static HRESULT shader_parse_signature(DWORD tag, const char *data, DWORD data_size, +static HRESULT shader_parse_signature(DWORD tag, const char *data, unsigned int data_size, struct wined3d_shader_signature *s) { struct wined3d_shader_signature_element *e; bool has_stream_index, has_min_precision; const char *ptr = data; unsigned int i; - DWORD count; + unsigned int count; if (!require_space(0, 2, sizeof(DWORD), data_size)) { @@ -1995,7 +1996,7 @@ static HRESULT shader_parse_signature(DWORD tag, const char *data, DWORD data_si for (i = 0; i < count; ++i) { - DWORD name_offset; + unsigned int name_offset; if (has_stream_index) read_dword(&ptr, &e[i].stream_idx); @@ -2031,7 +2032,7 @@ static HRESULT shader_parse_signature(DWORD tag, const char *data, DWORD data_si return S_OK; } -static HRESULT shader_dxbc_chunk_handler(const char *data, DWORD data_size, DWORD tag, void *context) +static HRESULT shader_dxbc_chunk_handler(const char *data, unsigned int data_size, unsigned int tag, void *context) { struct shader_handler_context *ctx = context; struct wined3d_shader *shader = ctx->shader;

1 0

Eric Pouech : wined3d: Enable long integral types in shader_sm4.c.
by Alexandre Julliard 09 Dec '22

09 Dec '22

Module: wine Branch: master Commit: 0ddce7525b71da489818300d55248f5b556f8d96 URL: https://gitlab.winehq.org/wine/wine/-/commit/0ddce7525b71da489818300d55248f… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Dec 9 10:25:25 2022 +0100 wined3d: Enable long integral types in shader_sm4.c. --- dlls/wined3d/shader_sm4.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index ea09d64eb9c..d5ca8ea9501 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.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" @@ -759,7 +758,7 @@ static void shader_sm5_read_dcl_function_table(struct wined3d_shader_instruction struct wined3d_sm4_data *priv) { ins->declaration.index = *tokens++; - FIXME("Ignoring set of function bodies (count %u).\n", *tokens); + FIXME("Ignoring set of function bodies (count %lu).\n", *tokens); } static void shader_sm5_read_dcl_interface(struct wined3d_shader_instruction *ins, @@ -1729,7 +1728,7 @@ static void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct wi TRACE_(d3d_bytecode)("[ %08x ", opcode_token); for (i = 0; i < len; ++i) { - TRACE_(d3d_bytecode)("%08x ", (*ptr)[i]); + TRACE_(d3d_bytecode)("%08lx ", (*ptr)[i]); } TRACE_(d3d_bytecode)("]\n"); } @@ -2125,7 +2124,7 @@ static HRESULT shader_dxbc_chunk_handler(const char *data, unsigned int data_siz shader->function = (const DWORD *)byte_code; shader->functionLength = data_size - header->byte_code_offset; *ctx->format = WINED3D_SHADER_BYTE_CODE_FORMAT_SM1; - TRACE("Feature level 9 shader version 0%08x, 0%08x.\n", + TRACE("Feature level 9 shader version 0%08x, 0%08lx.\n", header->shader_version, *shader->function); } else @@ -2157,7 +2156,7 @@ HRESULT shader_extract_from_dxbc(struct wined3d_shader *shader, hr = E_INVALIDARG; if (FAILED(hr)) - WARN("Failed to parse DXBC, hr %#x.\n", hr); + WARN("Failed to parse DXBC, hr %#lx.\n", hr); return hr; }

1 0

Eric Pouech : wined3d: Let sampler_states and texture_states be 2D arrays of uint32_t.
by Alexandre Julliard 09 Dec '22

09 Dec '22

Module: wine Branch: master Commit: e213d17d4cf7ca2f2e89645358a01b7805a760b9 URL: https://gitlab.winehq.org/wine/wine/-/commit/e213d17d4cf7ca2f2e89645358a01b… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Dec 9 10:25:27 2022 +0100 wined3d: Let sampler_states and texture_states be 2D arrays of uint32_t. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/wined3d/state.c | 4 ++-- dlls/wined3d/stateblock.c | 4 ++-- dlls/wined3d/wined3d_private.h | 6 +++--- include/wine/wined3d.h | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 3479b407974..557db3c9759 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3696,7 +3696,7 @@ static enum wined3d_texture_address wined3d_texture_gl_address_mode(const struct } static void wined3d_sampler_desc_from_sampler_states(struct wined3d_sampler_desc *desc, - const struct wined3d_context_gl *context_gl, const DWORD *sampler_states, + const struct wined3d_context_gl *context_gl, const uint32_t *sampler_states, const struct wined3d_texture_gl *texture_gl) { union @@ -3777,7 +3777,7 @@ static void sampler(struct wined3d_context *context, const struct wined3d_state if (state->textures[sampler_idx]) { struct wined3d_texture_gl *texture_gl = wined3d_texture_gl(state->textures[sampler_idx]); - const DWORD *sampler_states = state->sampler_states[sampler_idx]; + const uint32_t *sampler_states = state->sampler_states[sampler_idx]; struct wined3d_device *device = context->device; BOOL srgb = is_srgb_enabled(sampler_states); struct wined3d_sampler_desc desc; diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index ad9f29b72f9..d678a6ea2a0 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1782,7 +1782,7 @@ static void init_default_render_states(unsigned int rs[WINEHIGHEST_RENDER_STATE rs[WINED3D_RS_BLENDOPALPHA] = WINED3D_BLEND_OP_ADD; } -static void init_default_texture_state(unsigned int i, DWORD stage[WINED3D_HIGHEST_TEXTURE_STATE + 1]) +static void init_default_texture_state(unsigned int i, uint32_t stage[WINED3D_HIGHEST_TEXTURE_STATE + 1]) { stage[WINED3D_TSS_COLOR_OP] = i ? WINED3D_TOP_DISABLE : WINED3D_TOP_MODULATE; stage[WINED3D_TSS_COLOR_ARG1] = WINED3DTA_TEXTURE; @@ -1803,7 +1803,7 @@ static void init_default_texture_state(unsigned int i, DWORD stage[WINED3D_HIGHE stage[WINED3D_TSS_RESULT_ARG] = WINED3DTA_CURRENT; } -static void init_default_sampler_states(DWORD states[WINED3D_MAX_COMBINED_SAMPLERS][WINED3D_HIGHEST_SAMPLER_STATE + 1]) +static void init_default_sampler_states(uint32_t states[WINED3D_MAX_COMBINED_SAMPLERS][WINED3D_HIGHEST_SAMPLER_STATE + 1]) { unsigned int i; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e4104d2c61a..449db821249 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3897,8 +3897,8 @@ struct wined3d_state BOOL ps_consts_b[WINED3D_MAX_CONSTS_B]; struct wined3d_texture *textures[WINED3D_MAX_COMBINED_SAMPLERS]; - DWORD sampler_states[WINED3D_MAX_COMBINED_SAMPLERS][WINED3D_HIGHEST_SAMPLER_STATE + 1]; - DWORD texture_states[WINED3D_MAX_TEXTURES][WINED3D_HIGHEST_TEXTURE_STATE + 1]; + uint32_t sampler_states[WINED3D_MAX_COMBINED_SAMPLERS][WINED3D_HIGHEST_SAMPLER_STATE + 1]; + uint32_t texture_states[WINED3D_MAX_TEXTURES][WINED3D_HIGHEST_TEXTURE_STATE + 1]; struct wined3d_matrix transforms[WINED3D_HIGHEST_TRANSFORM_STATE + 1]; struct wined3d_vec4 clip_planes[WINED3D_MAX_CLIP_DISTANCES]; @@ -6365,7 +6365,7 @@ static inline void context_apply_state(struct wined3d_context *context, state_table[rep].apply(context, state, rep); } -static inline BOOL is_srgb_enabled(const DWORD *sampler_states) +static inline BOOL is_srgb_enabled(const uint32_t *sampler_states) { /* Only use the LSB of the WINED3D_SAMP_SRGB_TEXTURE value. This matches * the behaviour of the AMD Windows driver. diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 2e709543127..0070a7dd4c0 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2173,8 +2173,8 @@ struct wined3d_stateblock_state BOOL alpha_to_coverage; struct wined3d_texture *textures[WINED3D_MAX_COMBINED_SAMPLERS]; - DWORD sampler_states[WINED3D_MAX_COMBINED_SAMPLERS][WINED3D_HIGHEST_SAMPLER_STATE + 1]; - DWORD texture_states[WINED3D_MAX_TEXTURES][WINED3D_HIGHEST_TEXTURE_STATE + 1]; + uint32_t sampler_states[WINED3D_MAX_COMBINED_SAMPLERS][WINED3D_HIGHEST_SAMPLER_STATE + 1]; + uint32_t texture_states[WINED3D_MAX_TEXTURES][WINED3D_HIGHEST_TEXTURE_STATE + 1]; struct wined3d_matrix transforms[WINED3D_HIGHEST_TRANSFORM_STATE + 1]; struct wined3d_vec4 clip_planes[WINED3D_MAX_CLIP_DISTANCES];

1 0