February 2022 - Wine-commits

Jacek Caban : win32u: Move GetWindowThreadProcessId implementation from user32.
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: wine Branch: master Commit: cb4c3b8d77d6f89e418cde3f3a4b7f9daea9d381 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb4c3b8d77d6f89e418cde3f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 25 16:03:05 2022 +0100 win32u: Move GetWindowThreadProcessId implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/win.c | 31 +------------------------- dlls/win32u/gdiobj.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/window.c | 53 ++++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/wrappers.c | 6 +++++ include/ntuser.h | 7 ++++++ 7 files changed, 70 insertions(+), 31 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index a63a650196c..cd36140e1aa 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -3091,36 +3091,7 @@ BOOL WINAPI IsWindow( HWND hwnd ) */ DWORD WINAPI GetWindowThreadProcessId( HWND hwnd, LPDWORD process ) { - WND *ptr; - DWORD tid = 0; - - if (!(ptr = WIN_GetPtr( hwnd ))) - { - SetLastError( ERROR_INVALID_WINDOW_HANDLE); - return 0; - } - - if (ptr != WND_OTHER_PROCESS && ptr != WND_DESKTOP) - { - /* got a valid window */ - tid = ptr->tid; - if (process) *process = GetCurrentProcessId(); - WIN_ReleasePtr( ptr ); - return tid; - } - - /* check other processes */ - SERVER_START_REQ( get_window_info ) - { - req->handle = wine_server_user_handle( hwnd ); - if (!wine_server_call_err( req )) - { - tid = (DWORD)reply->tid; - if (process) *process = (DWORD)reply->pid; - } - } - SERVER_END_REQ; - return tid; + return NtUserCallHwndParam( hwnd, (UINT_PTR)process, NtUserGetWindowThread ); } diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index 4075c202eaf..fe22c1ed2fe 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -1150,6 +1150,7 @@ static struct unix_funcs unix_funcs = NtGdiUpdateColors, NtGdiWidenPath, NtUserActivateKeyboardLayout, + NtUserCallHwndParam, NtUserCallNextHookEx, NtUserCallNoParam, NtUserCallOneParam, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 1c220163d50..f53c90990b5 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -772,7 +772,7 @@ @ stub NtUserCallHwndLock @ stub NtUserCallHwndLockSafe @ stub NtUserCallHwndOpt -@ stub NtUserCallHwndParam +@ stdcall NtUserCallHwndParam(long ptr long) @ stub NtUserCallHwndParamLock @ stub NtUserCallHwndParamLockSafe @ stub NtUserCallHwndSafe diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 1447469c19d..168694378d2 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -183,6 +183,7 @@ struct unix_funcs BOOL (WINAPI *pNtGdiUpdateColors)( HDC hdc ); BOOL (WINAPI *pNtGdiWidenPath)( HDC hdc ); HKL (WINAPI *pNtUserActivateKeyboardLayout)( HKL layout, UINT flags ); + DWORD (WINAPI *pNtUserCallHwndParam)( HWND hwnd, DWORD_PTR param, DWORD code ); LRESULT (WINAPI *pNtUserCallNextHookEx)( HHOOK hhook, INT code, WPARAM wparam, LPARAM lparam ); ULONG_PTR (WINAPI *pNtUserCallNoParam)( ULONG code ); ULONG_PTR (WINAPI *pNtUserCallOneParam)( ULONG_PTR arg, ULONG code ); diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index ca6d270fd06..985b68ff1c2 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -31,6 +31,9 @@ #include "win32u_private.h" #include "ntuser_private.h" #include "wine/server.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(win); #define NB_USER_HANDLES ((LAST_USER_HANDLE - FIRST_USER_HANDLE + 1) >> 1) #define USER_HANDLE_TO_INDEX(hwnd) ((LOWORD(hwnd) - FIRST_USER_HANDLE) >> 1) @@ -244,6 +247,41 @@ HWND is_current_thread_window( HWND hwnd ) return ret; } +/* see GetWindowThreadProcessId */ +static DWORD get_window_thread( HWND hwnd, DWORD *process ) +{ + WND *ptr; + DWORD tid = 0; + + if (!(ptr = get_win_ptr( hwnd ))) + { + SetLastError( ERROR_INVALID_WINDOW_HANDLE); + return 0; + } + + if (ptr != WND_OTHER_PROCESS && ptr != WND_DESKTOP) + { + /* got a valid window */ + tid = ptr->tid; + if (process) *process = GetCurrentProcessId(); + release_win_ptr( ptr ); + return tid; + } + + /* check other processes */ + SERVER_START_REQ( get_window_info ) + { + req->handle = wine_server_user_handle( hwnd ); + if (!wine_server_call_err( req )) + { + tid = (DWORD)reply->tid; + if (process) *process = (DWORD)reply->pid; + } + } + SERVER_END_REQ; + return tid; +} + /*********************************************************************** * NtUserGetProp (win32u.@) * @@ -361,3 +399,18 @@ NTSTATUS WINAPI NtUserBuildHwndList( HDESK desktop, ULONG unk2, ULONG unk3, ULON buffer[*size - 1] = HWND_BOTTOM; return STATUS_SUCCESS; } + +/***************************************************************************** + * NtUserCallHwndParam (win32u.@) + */ +DWORD WINAPI NtUserCallHwndParam( HWND hwnd, DWORD_PTR param, DWORD code ) +{ + switch (code) + { + case NtUserGetWindowThread: + return get_window_thread( hwnd, (DWORD *)param ); + default: + FIXME( "invalid code %u\n", code ); + return 0; + } +} diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index 9ea7ed0c09b..4fd01459374 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -725,6 +725,12 @@ ULONG_PTR WINAPI NtUserCallTwoParam( ULONG_PTR arg1, ULONG_PTR arg2, ULONG code return unix_funcs->pNtUserCallTwoParam( arg1, arg2, code ); } +DWORD WINAPI NtUserCallHwndParam( HWND hwnd, DWORD_PTR param, DWORD code ) +{ + if (!unix_funcs) return 0; + return unix_funcs->pNtUserCallHwndParam( hwnd, param, code ); +} + LONG WINAPI NtUserChangeDisplaySettings( UNICODE_STRING *devname, DEVMODEW *devmode, HWND hwnd, DWORD flags, void *lparam ) { diff --git a/include/ntuser.h b/include/ntuser.h index 9eb311b3e52..70a1df91113 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -134,6 +134,12 @@ enum NtUserSetHandlePtr, }; +/* NtUserCallHwndParam codes, not compatible with Windows */ +enum +{ + NtUserGetWindowThread, +}; + /* color index used to retrieve system 55aa brush */ #define COLOR_55AA_BRUSH 0x100 @@ -192,6 +198,7 @@ BOOL WINAPI NtUserAddClipboardFormatListener( HWND hwnd ); BOOL WINAPI NtUserAttachThreadInput( DWORD from, DWORD to, BOOL attach ); NTSTATUS WINAPI NtUserBuildHwndList( HDESK desktop, ULONG unk2, ULONG unk3, ULONG unk4, ULONG thread_id, ULONG count, HWND *buffer, ULONG *size ); +DWORD WINAPI NtUserCallHwndParam( HWND hwnd, DWORD_PTR param, DWORD code ); LRESULT WINAPI NtUserCallNextHookEx( HHOOK hhook, INT code, WPARAM wparam, LPARAM lparam ); ULONG_PTR WINAPI NtUserCallNoParam( ULONG code ); ULONG_PTR WINAPI NtUserCallOneParam( ULONG_PTR arg, ULONG code );

1 0

Jacek Caban : win32u: Move IsWindow implementation from user32.
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: wine Branch: master Commit: bde39137cf4d8d392b8ca844b70b32d8ae922124 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bde39137cf4d8d392b8ca844… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 25 16:25:30 2022 +0100 win32u: Move IsWindow implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/win.c | 21 +-------------------- dlls/win32u/gdiobj.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/window.c | 40 ++++++++++++++++++++++++++++++++++++++++ dlls/win32u/wrappers.c | 6 ++++++ include/ntuser.h | 7 +++++++ 7 files changed, 57 insertions(+), 21 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index cd36140e1aa..c580d040bf1 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -3063,26 +3063,7 @@ INT WINAPI GetWindowTextLengthW( HWND hwnd ) */ BOOL WINAPI IsWindow( HWND hwnd ) { - WND *ptr; - BOOL ret; - - if (!(ptr = WIN_GetPtr( hwnd ))) return FALSE; - if (ptr == WND_DESKTOP) return TRUE; - - if (ptr != WND_OTHER_PROCESS) - { - WIN_ReleasePtr( ptr ); - return TRUE; - } - - /* check other processes */ - SERVER_START_REQ( get_window_info ) - { - req->handle = wine_server_user_handle( hwnd ); - ret = !wine_server_call_err( req ); - } - SERVER_END_REQ; - return ret; + return NtUserCallHwnd( hwnd, NtUserIsWindow ); } diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index fe22c1ed2fe..589143e99a6 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -1150,6 +1150,7 @@ static struct unix_funcs unix_funcs = NtGdiUpdateColors, NtGdiWidenPath, NtUserActivateKeyboardLayout, + NtUserCallHwnd, NtUserCallHwndParam, NtUserCallNextHookEx, NtUserCallNoParam, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index f53c90990b5..0b63c43c6f6 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -768,7 +768,7 @@ @ stub NtUserBuildPropList @ stub NtUserCalcMenuBar @ stub NtUserCalculatePopupWindowPosition -@ stub NtUserCallHwnd +@ stdcall NtUserCallHwnd(long long) @ stub NtUserCallHwndLock @ stub NtUserCallHwndLockSafe @ stub NtUserCallHwndOpt diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 168694378d2..e6a5105dcf5 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -183,6 +183,7 @@ struct unix_funcs BOOL (WINAPI *pNtGdiUpdateColors)( HDC hdc ); BOOL (WINAPI *pNtGdiWidenPath)( HDC hdc ); HKL (WINAPI *pNtUserActivateKeyboardLayout)( HKL layout, UINT flags ); + DWORD (WINAPI *pNtUserCallHwnd)( HWND hwnd, DWORD code ); DWORD (WINAPI *pNtUserCallHwndParam)( HWND hwnd, DWORD_PTR param, DWORD code ); LRESULT (WINAPI *pNtUserCallNextHookEx)( HHOOK hhook, INT code, WPARAM wparam, LPARAM lparam ); ULONG_PTR (WINAPI *pNtUserCallNoParam)( ULONG code ); diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index 985b68ff1c2..7725ba7bd53 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -247,6 +247,31 @@ HWND is_current_thread_window( HWND hwnd ) return ret; } +/* see IsWindow */ +static BOOL is_window( HWND hwnd ) +{ + WND *win; + BOOL ret; + + if (!(win = get_win_ptr( hwnd ))) return FALSE; + if (win == WND_DESKTOP) return TRUE; + + if (win != WND_OTHER_PROCESS) + { + release_win_ptr( win ); + return TRUE; + } + + /* check other processes */ + SERVER_START_REQ( get_window_info ) + { + req->handle = wine_server_user_handle( hwnd ); + ret = !wine_server_call_err( req ); + } + SERVER_END_REQ; + return ret; +} + /* see GetWindowThreadProcessId */ static DWORD get_window_thread( HWND hwnd, DWORD *process ) { @@ -400,6 +425,21 @@ NTSTATUS WINAPI NtUserBuildHwndList( HDESK desktop, ULONG unk2, ULONG unk3, ULON return STATUS_SUCCESS; } +/***************************************************************************** + * NtUserCallHwnd (win32u.@) + */ +DWORD WINAPI NtUserCallHwnd( HWND hwnd, DWORD code ) +{ + switch (code) + { + case NtUserIsWindow: + return is_window( hwnd ); + default: + FIXME( "invalid code %u\n", code ); + return 0; + } +} + /***************************************************************************** * NtUserCallHwndParam (win32u.@) */ diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index 4fd01459374..06af8cab20f 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -725,6 +725,12 @@ ULONG_PTR WINAPI NtUserCallTwoParam( ULONG_PTR arg1, ULONG_PTR arg2, ULONG code return unix_funcs->pNtUserCallTwoParam( arg1, arg2, code ); } +DWORD WINAPI NtUserCallHwnd( HWND hwnd, DWORD code ) +{ + if (!unix_funcs) return 0; + return unix_funcs->pNtUserCallHwnd( hwnd, code ); +} + DWORD WINAPI NtUserCallHwndParam( HWND hwnd, DWORD_PTR param, DWORD code ) { if (!unix_funcs) return 0; diff --git a/include/ntuser.h b/include/ntuser.h index 70a1df91113..a899c03e66e 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -134,6 +134,12 @@ enum NtUserSetHandlePtr, }; +/* NtUserCallHwnd codes, not compatible with Windows */ +enum +{ + NtUserIsWindow, +}; + /* NtUserCallHwndParam codes, not compatible with Windows */ enum { @@ -198,6 +204,7 @@ BOOL WINAPI NtUserAddClipboardFormatListener( HWND hwnd ); BOOL WINAPI NtUserAttachThreadInput( DWORD from, DWORD to, BOOL attach ); NTSTATUS WINAPI NtUserBuildHwndList( HDESK desktop, ULONG unk2, ULONG unk3, ULONG unk4, ULONG thread_id, ULONG count, HWND *buffer, ULONG *size ); +DWORD WINAPI NtUserCallHwnd( HWND hwnd, DWORD code ); DWORD WINAPI NtUserCallHwndParam( HWND hwnd, DWORD_PTR param, DWORD code ); LRESULT WINAPI NtUserCallNextHookEx( HHOOK hhook, INT code, WPARAM wparam, LPARAM lparam ); ULONG_PTR WINAPI NtUserCallNoParam( ULONG code );

1 0

Zebediah Figura : winegstreamer: Don't unlink pads before dereferencing them.
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: wine Branch: master Commit: d2f653a854ccd17688813d6b7f585acbfb45b9ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2f653a854ccd17688813d6b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Feb 25 11:42:58 2022 -0600 winegstreamer: Don't unlink pads before dereferencing them. GStreamer pads are automatically unlinked when destroyed. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wg_parser.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index f36feead9c6..46a298f13c1 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -683,14 +683,10 @@ static void free_stream(struct wg_parser_stream *stream) { if (stream->post_sink) { - gst_pad_unlink(stream->their_src, stream->post_sink); - gst_pad_unlink(stream->post_src, stream->my_sink); gst_object_unref(stream->post_src); gst_object_unref(stream->post_sink); stream->post_src = stream->post_sink = NULL; } - else - gst_pad_unlink(stream->their_src, stream->my_sink); gst_object_unref(stream->their_src); } gst_object_unref(stream->my_sink); @@ -1286,7 +1282,6 @@ out: gst_element_set_state(parser->container, GST_STATE_NULL); if (parser->their_sink) { - gst_pad_unlink(parser->my_src, parser->their_sink); gst_object_unref(parser->their_sink); parser->my_src = parser->their_sink = NULL; } @@ -1327,7 +1322,6 @@ static NTSTATUS wg_parser_disconnect(void *args) pthread_mutex_unlock(&parser->mutex); gst_element_set_state(parser->container, GST_STATE_NULL); - gst_pad_unlink(parser->my_src, parser->their_sink); gst_object_unref(parser->my_src); gst_object_unref(parser->their_sink); parser->my_src = parser->their_sink = NULL;

1 0

Henri Verbeet : vkd3d-shader: Add a function pointer type for vkd3d_shader_preprocess().
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: vkd3d Branch: master Commit: 3a971932468aa80e54269b0eedea767b2f3ab51f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3a971932468aa80e54269b0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 25 19:36:35 2022 +0100 vkd3d-shader: Add a function pointer type for vkd3d_shader_preprocess(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 5a60b37..0e958b2 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -1822,6 +1822,10 @@ typedef struct vkd3d_shader_signature_element * (*PFN_vkd3d_shader_find_signatur /** Type of vkd3d_shader_free_shader_signature(). */ typedef void (*PFN_vkd3d_shader_free_shader_signature)(struct vkd3d_shader_signature *signature); +/** Type of vkd3d_shader_preprocess(). \since 1.3 */ +typedef void (*PFN_vkd3d_shader_preprocess)(struct vkd3d_shader_compile_info *compile_info, + struct vkd3d_shader_code *out, char **messages); + #ifdef __cplusplus } #endif /* __cplusplus */

1 0

Henri Verbeet : vkd3d-shader: Callers of vkd3d_shader_get_supported_source_types() should ignore unrecognised source types.
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: vkd3d Branch: master Commit: 63098ba8fa72db5d2bcb021c84c9cee12c2587fd URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=63098ba8fa72db5d2bcb021… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 25 19:36:36 2022 +0100 vkd3d-shader: Callers of vkd3d_shader_get_supported_source_types() should ignore unrecognised source types. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 0e958b2..3c7cc4d 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -1461,7 +1461,8 @@ static inline uint32_t vkd3d_shader_create_swizzle(enum vkd3d_shader_swizzle_com VKD3D_SHADER_API const char *vkd3d_shader_get_version(unsigned int *major, unsigned int *minor); /** * Returns the source types supported, with any target type, by - * vkd3d_shader_compile(). + * vkd3d_shader_compile(). Future versions of the library may introduce + * additional source types; callers should ignore unrecognised source types. * * Use vkd3d_shader_get_supported_target_types() to determine which target types * are supported for each source type.

1 0

Henri Verbeet : vkd3d-shader: Callers of vkd3d_shader_get_supported_target_types() should ignore unrecognised target types.
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: vkd3d Branch: master Commit: c97d7f5bff8e577c95a2bb14606677ac3f8a93c1 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c97d7f5bff8e577c95a2bb1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 25 19:36:37 2022 +0100 vkd3d-shader: Callers of vkd3d_shader_get_supported_target_types() should ignore unrecognised target types. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 3c7cc4d..6ce9819 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -1477,7 +1477,8 @@ VKD3D_SHADER_API const char *vkd3d_shader_get_version(unsigned int *major, unsig VKD3D_SHADER_API const enum vkd3d_shader_source_type *vkd3d_shader_get_supported_source_types(unsigned int *count); /** * Returns the target types supported, with the given source type, by - * vkd3d_shader_compile(). + * vkd3d_shader_compile(). Future versions of the library may introduce + * additional target types; callers should ignore unrecognised target types. * * \param source_type Source type for which to enumerate supported target types. *

1 0

Henri Verbeet : vkd3d-utils: Return an ID3DBlob pointer from D3DCreateBlob().
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: vkd3d Branch: master Commit: c07e6536a9b360e6b05ec40902a31b8e52d73500 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c07e6536a9b360e6b05ec40… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 25 19:36:38 2022 +0100 vkd3d-utils: Return an ID3DBlob pointer from D3DCreateBlob(). ID3DBlob is a typedef for ID3D10Blob, so this isn't all that consequential, but we're using ID3DBlob for the other vkd3d-utils exports. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_d3dcompiler.h | 2 +- include/vkd3d_utils.h | 2 +- libs/vkd3d-utils/vkd3d_utils_main.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/vkd3d_d3dcompiler.h b/include/vkd3d_d3dcompiler.h index c70a7d7..c934835 100644 --- a/include/vkd3d_d3dcompiler.h +++ b/include/vkd3d_d3dcompiler.h @@ -66,7 +66,7 @@ HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filen const char *profile, UINT flags, UINT effect_flags, UINT secondary_flags, const void *secondary_data, SIZE_T secondary_data_size, ID3DBlob **shader, ID3DBlob **error_messages); -HRESULT WINAPI D3DCreateBlob(SIZE_T size, ID3D10Blob **blob); +HRESULT WINAPI D3DCreateBlob(SIZE_T size, ID3DBlob **blob); HRESULT WINAPI D3DPreprocess(const void *data, SIZE_T size, const char *filename, const D3D_SHADER_MACRO *macros, ID3DInclude *include, ID3DBlob **shader, ID3DBlob **error_messages); diff --git a/include/vkd3d_utils.h b/include/vkd3d_utils.h index a81f229..5652478 100644 --- a/include/vkd3d_utils.h +++ b/include/vkd3d_utils.h @@ -70,7 +70,7 @@ VKD3D_UTILS_API HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, c const char *target, UINT flags, UINT effect_flags, UINT secondary_flags, const void *secondary_data, SIZE_T secondary_data_size, ID3DBlob **shader, ID3DBlob **error_messages); -VKD3D_UTILS_API HRESULT WINAPI D3DCreateBlob(SIZE_T data_size, ID3D10Blob **blob); +VKD3D_UTILS_API HRESULT WINAPI D3DCreateBlob(SIZE_T data_size, ID3DBlob **blob); VKD3D_UTILS_API HRESULT WINAPI D3DPreprocess(const void *data, SIZE_T size, const char *filename, const D3D_SHADER_MACRO *defines, ID3DInclude *include, ID3DBlob **shader, ID3DBlob **error_messages); diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c index 7fb042c..26df283 100644 --- a/libs/vkd3d-utils/vkd3d_utils_main.c +++ b/libs/vkd3d-utils/vkd3d_utils_main.c @@ -471,7 +471,7 @@ void vkd3d_destroy_event(HANDLE event) #endif /* _WIN32 */ -HRESULT WINAPI D3DCreateBlob(SIZE_T data_size, ID3D10Blob **blob) +HRESULT WINAPI D3DCreateBlob(SIZE_T data_size, ID3DBlob **blob) { HRESULT hr; void *data;

1 0

Henri Verbeet : vkd3d-utils: Set a value for the VKD3D_SHADER_COMPILE_OPTION_STRIP_DEBUG option in D3DCompile2().
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: vkd3d Branch: master Commit: 79ae688140375fb99f7acf8ee1d89102aaf627b5 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=79ae688140375fb99f7acf8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 25 19:36:39 2022 +0100 vkd3d-utils: Set a value for the VKD3D_SHADER_COMPILE_OPTION_STRIP_DEBUG option in D3DCompile2(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-utils/vkd3d_utils_main.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c index 26df283..ee3bfb4 100644 --- a/libs/vkd3d-utils/vkd3d_utils_main.c +++ b/libs/vkd3d-utils/vkd3d_utils_main.c @@ -160,6 +160,7 @@ HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filen struct vkd3d_shader_hlsl_source_info hlsl_info; struct vkd3d_shader_compile_option options[1]; struct vkd3d_shader_compile_info compile_info; + struct vkd3d_shader_compile_option *option; struct vkd3d_shader_code byte_code; const D3D_SHADER_MACRO *macro; char *messages; @@ -215,7 +216,11 @@ HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filen hlsl_info.secondary_code.size = secondary_data_size; if (!(flags & D3DCOMPILE_DEBUG)) - options[compile_info.option_count++].name = VKD3D_SHADER_COMPILE_OPTION_STRIP_DEBUG; + { + option = &options[compile_info.option_count++]; + option->name = VKD3D_SHADER_COMPILE_OPTION_STRIP_DEBUG; + option->value = true; + } ret = vkd3d_shader_compile(&compile_info, &byte_code, &messages); if (messages)

1 0

Alexandre Julliard : Wine release 6.0.3
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: website Branch: master Commit: fd14c502f5b66a22b5ca043622c622af7a074ab3 URL: https://source.winehq.org/git/website.git/?a=commit;h=fd14c502f5b66a22b5ca0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 25 14:32:27 2022 +0100 Wine release 6.0.3 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2022022501.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/news/en/2022022501.xml b/news/en/2022022501.xml new file mode 100644 index 00000000..fe5bd44a --- /dev/null +++ b/news/en/2022022501.xml @@ -0,0 +1,13 @@ +<news> +<date>February 25, 2022</date> +<title>Wine 6.0.3 Released</title> +<body> + The Wine maintenance release 6.0.3 is now available. + <a href="{$root}/announce/6.0.3">What's new</a> in this release: +<ul> + <li>Various bug fixes</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/6.0/wine-6.0.3.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Piotr Caban : ucrtbase: Fix fopen x mode test failures.
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: wine Branch: oldstable Commit: 56b6abd5ea9cff53d1fd06e6aacb8173bc48c5cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=56b6abd5ea9cff53d1fd06e6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 18 14:57:29 2021 +0200 ucrtbase: Fix fopen x mode test failures. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51894 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 658473332756991b2db05dd3fa70ea6dcc520750) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ucrtbase/tests/misc.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index 8dc1a1b2f8e..876b0f7b989 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -1377,17 +1377,18 @@ static void test_fopen_exclusive( void ) DWORD len; FILE *fp; - if (!GetProcAddress(GetModuleHandleA("ucrtbase.dll"), "__std_terminate")) - { - win_skip("skipping fopen x mode tests.\n"); - return; - } - len = GetTempPathA(MAX_PATH, path); ok(len, "GetTempPathA failed\n"); strcat(path, "\\fileexcl.tst"); + SET_EXPECT(global_invalid_parameter_handler); fp = fopen(path, "wx"); + if(called_global_invalid_parameter_handler) + { + win_skip("skipping fopen x mode tests.\n"); + return; + } + expect_global_invalid_parameter_handler = FALSE; ok(fp != NULL, "creating file with mode wx failed\n"); fclose(fp); @@ -1414,7 +1415,7 @@ static void test_fopen_exclusive( void ) ok(!fp, "creating file with mode xw succeeded\n"); fp = fopen(path, "wbx"); - ok(fp != NULL, "creating file with mode wx failed\n"); + ok(fp != NULL, "creating file with mode wbx failed\n"); fclose(fp); unlink(path); }

1 0