May 2022 - Wine-commits - list.winehq.org

Brendan Shanks : include: Add WINE_ALLOC_SIZE attribute to MmAllocate functions.
by Alexandre Julliard 12 May '22

12 May '22

Module: wine Branch: master Commit: 7e973421d1e37f788118254722b058d37e6f1c19 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e973421d1e37f7881182547… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed May 11 15:22:20 2022 -0700 include: Add WINE_ALLOC_SIZE attribute to MmAllocate functions. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ddk/wdm.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 2abe5ad574d..b75f452d0da 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1791,8 +1791,8 @@ BOOLEAN WINAPI KeSignalCallDpcSynchronize(void*); NTSTATUS WINAPI KeWaitForMultipleObjects(ULONG,void*[],WAIT_TYPE,KWAIT_REASON,KPROCESSOR_MODE,BOOLEAN,LARGE_INTEGER*,KWAIT_BLOCK*); NTSTATUS WINAPI KeWaitForSingleObject(void*,KWAIT_REASON,KPROCESSOR_MODE,BOOLEAN,LARGE_INTEGER*); -PVOID WINAPI MmAllocateContiguousMemory(SIZE_T,PHYSICAL_ADDRESS); -PVOID WINAPI MmAllocateNonCachedMemory(SIZE_T); +PVOID WINAPI MmAllocateContiguousMemory(SIZE_T,PHYSICAL_ADDRESS) __WINE_ALLOC_SIZE(1); +PVOID WINAPI MmAllocateNonCachedMemory(SIZE_T) __WINE_ALLOC_SIZE(1); PMDL WINAPI MmAllocatePagesForMdl(PHYSICAL_ADDRESS,PHYSICAL_ADDRESS,PHYSICAL_ADDRESS,SIZE_T); void WINAPI MmBuildMdlForNonPagedPool(MDL*); NTSTATUS WINAPI MmCopyVirtualMemory(PEPROCESS,void*,PEPROCESS,void*,SIZE_T,KPROCESSOR_MODE,SIZE_T*);

1 0

Jactry Zeng : include: Add MIL/DWM HRESULT codes.
by Alexandre Julliard 12 May '22

12 May '22

Module: wine Branch: master Commit: 3f7c08096af8143c6f5177ddb40ea18236903ee6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f7c08096af8143c6f5177dd… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Wed May 11 02:44:19 2022 -0500 include: Add MIL/DWM HRESULT codes. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winerror.h | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/include/winerror.h b/include/winerror.h index d51d5648cdb..fb44eaacbed 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -3884,6 +3884,47 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define WINCODEC_ERR_WIN32ERROR _HRESULT_TYPEDEF_(0x88982f94) #define WINCODEC_ERR_INVALIDPROGRESSIVELEVEL _HRESULT_TYPEDEF_(0x88982f95) +#define MILERR_OBJECTBUSY _HRESULT_TYPEDEF_(0x88980001) +#define MILERR_INSUFFICIENTBUFFER _HRESULT_TYPEDEF_(0x88980002) +#define MILERR_WIN32ERROR _HRESULT_TYPEDEF_(0x88980003) +#define MILERR_SCANNER_FAILED _HRESULT_TYPEDEF_(0x88980004) +#define MILERR_SCREENACCESSDENIED _HRESULT_TYPEDEF_(0x88980005) +#define MILERR_DISPLAYSTATEINVALID _HRESULT_TYPEDEF_(0x88980006) +#define MILERR_NONINVERTIBLEMATRIX _HRESULT_TYPEDEF_(0x88980007) +#define MILERR_ZEROVECTOR _HRESULT_TYPEDEF_(0x88980008) +#define MILERR_TERMINATED _HRESULT_TYPEDEF_(0x88980009) +#define MILERR_BADNUMBER _HRESULT_TYPEDEF_(0x8898000a) +#define MILERR_INTERNALERROR _HRESULT_TYPEDEF_(0x88980080) +#define MILERR_DISPLAYFORMATNOTSUPPORTED _HRESULT_TYPEDEF_(0x88980084) +#define MILERR_INVALIDCALL _HRESULT_TYPEDEF_(0x88980085) +#define MILERR_ALREADYLOCKED _HRESULT_TYPEDEF_(0x88980086) +#define MILERR_NOTLOCKED _HRESULT_TYPEDEF_(0x88980087) +#define MILERR_DEVICECANNOTRENDERTEXT _HRESULT_TYPEDEF_(0x88980088) +#define MILERR_GLYPHBITMAPMISSED _HRESULT_TYPEDEF_(0x88980089) +#define MILERR_MALFORMEDGLYPHCACHE _HRESULT_TYPEDEF_(0x8898008a) +#define MILERR_GENERIC_IGNORE _HRESULT_TYPEDEF_(0x8898008b) +#define MILERR_MALFORMED_GUIDELINE_DATA _HRESULT_TYPEDEF_(0x8898008c) +#define MILERR_NO_HARDWARE_DEVICE _HRESULT_TYPEDEF_(0x8898008d) +#define MILERR_NEED_RECREATE_AND_PRESENT _HRESULT_TYPEDEF_(0x8898008e) +#define MILERR_ALREADY_INITIALIZED _HRESULT_TYPEDEF_(0x8898008f) +#define MILERR_MISMATCHED_SIZE _HRESULT_TYPEDEF_(0x88980090) +#define MILERR_NO_REDIRECTION_SURFACE_AVAILABLE _HRESULT_TYPEDEF_(0x88980091) +#define MILERR_REMOTING_NOT_SUPPORTED _HRESULT_TYPEDEF_(0x88980092) +#define MILERR_QUEUED_PRESENT_NOT_SUPPORTED _HRESULT_TYPEDEF_(0x88980093) +#define MILERR_NOT_QUEUING_PRESENTS _HRESULT_TYPEDEF_(0x88980094) +#define MILERR_NO_REDIRECTION_SURFACE_RETRY_LATER _HRESULT_TYPEDEF_(0x88980095) +#define MILERR_TOOMANYSHADERELEMNTS _HRESULT_TYPEDEF_(0x88980096) +#define MILERR_MROW_READLOCK_FAILED _HRESULT_TYPEDEF_(0x88980097) +#define MILERR_MROW_UPDATE_FAILED _HRESULT_TYPEDEF_(0x88980098) +#define MILERR_SHADER_COMPILE_FAILED _HRESULT_TYPEDEF_(0x88980099) +#define MILERR_MAX_TEXTURE_SIZE_EXCEEDED _HRESULT_TYPEDEF_(0x8898009a) +#define MILERR_QPC_TIME_WENT_BACKWARD _HRESULT_TYPEDEF_(0x8898009b) +#define MILERR_DXGI_ENUMERATION_OUT_OF_SYNC _HRESULT_TYPEDEF_(0x8898009d) +#define MILERR_ADAPTER_NOT_FOUND _HRESULT_TYPEDEF_(0x8898009e) +#define MILERR_COLORSPACE_NOT_SUPPORTED _HRESULT_TYPEDEF_(0x8898009f) +#define MILERR_PREFILTER_NOT_SUPPORTED _HRESULT_TYPEDEF_(0x889800a0) +#define MILERR_DISPLAYID_ACCESS_DENIED _HRESULT_TYPEDEF_(0x889800a1) + #define DWRITE_E_FILEFORMAT _HRESULT_TYPEDEF_(0x88985000) #define DWRITE_E_UNEXPECTED _HRESULT_TYPEDEF_(0x88985001) #define DWRITE_E_NOFONT _HRESULT_TYPEDEF_(0x88985002)

1 0

Paul Gofman : crypt32/tests: Handle CERT_NAME_SEARCH_ALL_NAMES_FLAG being unsupported before Win8.
by Alexandre Julliard 12 May '22

12 May '22

Module: wine Branch: master Commit: fc4067a2ac897c8252a61c2e29bdddfab9f0e176 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc4067a2ac897c8252a61c2e… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed May 11 11:42:45 2022 -0500 crypt32/tests: Handle CERT_NAME_SEARCH_ALL_NAMES_FLAG being unsupported before Win8. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52961 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/tests/str.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/crypt32/tests/str.c b/dlls/crypt32/tests/str.c index 5fb05bdb836..29a948ed0e9 100644 --- a/dlls/crypt32/tests/str.c +++ b/dlls/crypt32/tests/str.c @@ -864,6 +864,13 @@ static void test_CertGetNameString_value_(unsigned int line, PCCERT_CONTEXT cont expectedW[expected_len++] = 0; len = CertGetNameStringA(context, type, flags, type_para, NULL, 0); + if (flags & CERT_NAME_SEARCH_ALL_NAMES_FLAG && ((type == CERT_NAME_DNS_TYPE && len < expected_len) + || (type != CERT_NAME_DNS_TYPE && len > expected_len))) + { + /* Supported since Win8. */ + win_skip("line %u: CERT_NAME_SEARCH_ALL_NAMES_FLAG is not supported.\n", line); + return; + } ok(len == expected_len, "line %u: unexpected length %ld, expected %ld.\n", line, len, expected_len); memset(str, 0xcc, len); retlen = CertGetNameStringA(context, type, flags, type_para, str, len);

1 0

Jacek Caban : win32u: Move default WM_GETICON implementation from user32.
by Alexandre Julliard 12 May '22

12 May '22

Module: wine Branch: master Commit: 1f296397cafbbd5bcf59f01bdf739ccc4a3658ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f296397cafbbd5bcf59f01b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 11 20:14:50 2022 +0200 win32u: Move default WM_GETICON implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/defwnd.c | 30 +++--------------------------- dlls/win32u/defwnd.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 27 deletions(-) diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index 047822d00d6..67cb77a3121 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -262,9 +262,6 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa case WM_NCACTIVATE: return NC_HandleNCActivate( hwnd, wParam, lParam ); - case WM_NCDESTROY: - return NtUserMessageCall( hwnd, msg, wParam, lParam, 0, NtUserDefWindowProc, FALSE ); - case WM_PRINT: DEFWND_Print(hwnd, (HDC)wParam, lParam); return 0; @@ -524,30 +521,6 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa return res; } - case WM_GETICON: - { - HICON ret; - WND *wndPtr = WIN_GetPtr( hwnd ); - - switch(wParam) - { - case ICON_SMALL: - ret = wndPtr->hIconSmall; - break; - case ICON_BIG: - ret = wndPtr->hIcon; - break; - case ICON_SMALL2: - ret = wndPtr->hIconSmall ? wndPtr->hIconSmall : wndPtr->hIconSmall2; - break; - default: - ret = 0; - break; - } - WIN_ReleasePtr( wndPtr ); - return (LRESULT)ret; - } - case WM_HELP: SendMessageW( GetParent(hwnd), msg, wParam, lParam ); break; @@ -614,6 +587,9 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa break; } + default: + return NtUserMessageCall( hwnd, msg, wParam, lParam, 0, NtUserDefWindowProc, FALSE ); + } return 0; diff --git a/dlls/win32u/defwnd.c b/dlls/win32u/defwnd.c index 1fa80928c65..3aa5a8286b3 100644 --- a/dlls/win32u/defwnd.c +++ b/dlls/win32u/defwnd.c @@ -112,6 +112,33 @@ static BOOL set_window_text( HWND hwnd, const void *text, BOOL ansi ) return TRUE; } +static HICON get_window_icon( HWND hwnd, WPARAM type ) +{ + HICON ret; + WND *win; + + if (!(win = get_win_ptr( hwnd ))) return 0; + + switch(type) + { + case ICON_SMALL: + ret = win->hIconSmall; + break; + case ICON_BIG: + ret = win->hIcon; + break; + case ICON_SMALL2: + ret = win->hIconSmall ? win->hIconSmall : win->hIconSmall2; + break; + default: + ret = 0; + break; + } + + release_win_ptr( win ); + return ret; +} + static HICON set_window_icon( HWND hwnd, WPARAM type, HICON icon ) { HICON ret = 0; @@ -227,6 +254,10 @@ LRESULT default_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, result = (LRESULT)set_window_icon( hwnd, wparam, (HICON)lparam ); break; + case WM_GETICON: + result = (LRESULT)get_window_icon( hwnd, wparam ); + break; + case WM_SYSCOMMAND: result = handle_sys_command( hwnd, wparam, lparam ); break;

1 0

Jacek Caban : win32u: Move default WM_PAINT implementation from user32.
by Alexandre Julliard 12 May '22

12 May '22

Module: wine Branch: master Commit: 0e0438bfaaee58d999340fd91db2bc5fcab433dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e0438bfaaee58d999340fd9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 11 20:39:30 2022 +0200 win32u: Move default WM_PAINT implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/defwnd.c | 25 ------------------------- dlls/win32u/defwnd.c | 26 +++++++++++++++++++++++++- 2 files changed, 25 insertions(+), 26 deletions(-) diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index 67cb77a3121..fdb100c9556 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -266,31 +266,6 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa DEFWND_Print(hwnd, (HDC)wParam, lParam); return 0; - case WM_PAINTICON: - case WM_PAINT: - { - PAINTSTRUCT ps; - HDC hdc = NtUserBeginPaint( hwnd, &ps ); - if( hdc ) - { - HICON hIcon; - if (IsIconic(hwnd) && ((hIcon = (HICON)GetClassLongPtrW( hwnd, GCLP_HICON))) ) - { - RECT rc; - int x, y; - - GetClientRect( hwnd, &rc ); - x = (rc.right - rc.left - GetSystemMetrics(SM_CXICON))/2; - y = (rc.bottom - rc.top - GetSystemMetrics(SM_CYICON))/2; - TRACE("Painting class icon: vis rect=(%s)\n", - wine_dbgstr_rect(&ps.rcPaint)); - DrawIcon( hdc, x, y, hIcon ); - } - NtUserEndPaint( hwnd, &ps ); - } - return 0; - } - case WM_SYNCPAINT: NtUserRedrawWindow ( hwnd, NULL, 0, RDW_ERASENOW | RDW_ERASE | RDW_ALLCHILDREN ); return 0; diff --git a/dlls/win32u/defwnd.c b/dlls/win32u/defwnd.c index 3aa5a8286b3..c345a6ab188 100644 --- a/dlls/win32u/defwnd.c +++ b/dlls/win32u/defwnd.c @@ -243,7 +243,31 @@ LRESULT default_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, if (user_callbacks) user_callbacks->free_win_ptr( win ); win->pScroll = NULL; release_win_ptr( win ); - return 0; + break; + } + + case WM_PAINTICON: + case WM_PAINT: + { + PAINTSTRUCT ps; + HDC hdc = NtUserBeginPaint( hwnd, &ps ); + if (hdc) + { + HICON icon; + if (is_iconic(hwnd) && ((icon = UlongToHandle( get_class_long( hwnd, GCLP_HICON, FALSE ))))) + { + RECT rc; + int x, y; + + get_client_rect( hwnd, &rc ); + x = (rc.right - rc.left - get_system_metrics( SM_CXICON )) / 2; + y = (rc.bottom - rc.top - get_system_metrics( SM_CYICON )) / 2; + TRACE( "Painting class icon: vis rect=(%s)\n", wine_dbgstr_rect(&ps.rcPaint) ); + NtUserDrawIconEx( hdc, x, y, icon, 0, 0, 0, 0, DI_NORMAL | DI_COMPAT | DI_DEFAULTSIZE ); + } + NtUserEndPaint( hwnd, &ps ); + } + break; } case WM_SETTEXT:

1 0

Jacek Caban : win32u: Move more default window commands from user32.
by Alexandre Julliard 12 May '22

12 May '22

Module: wine Branch: master Commit: 135e3176b64eb0ea139f40adb7f5b1c3e89e3577 URL: https://source.winehq.org/git/wine.git/?a=commit;h=135e3176b64eb0ea139f40ad… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 11 20:48:07 2022 +0200 win32u: Move more default window commands from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/defwnd.c | 43 ------------------------------------------- dlls/win32u/defwnd.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 43 deletions(-) diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index fdb100c9556..af2b32614bc 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -266,46 +266,6 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa DEFWND_Print(hwnd, (HDC)wParam, lParam); return 0; - case WM_SYNCPAINT: - NtUserRedrawWindow ( hwnd, NULL, 0, RDW_ERASENOW | RDW_ERASE | RDW_ALLCHILDREN ); - return 0; - - case WM_SETREDRAW: - if (wParam) WIN_SetStyle( hwnd, WS_VISIBLE, 0 ); - else - { - NtUserRedrawWindow( hwnd, NULL, 0, RDW_ALLCHILDREN | RDW_VALIDATE ); - WIN_SetStyle( hwnd, 0, WS_VISIBLE ); - } - return 0; - - case WM_CLOSE: - NtUserDestroyWindow( hwnd ); - return 0; - - case WM_MOUSEACTIVATE: - if (GetWindowLongW( hwnd, GWL_STYLE ) & WS_CHILD) - { - LONG ret = SendMessageW( GetParent(hwnd), WM_MOUSEACTIVATE, wParam, lParam ); - if (ret) return ret; - } - - /* Caption clicks are handled by NC_HandleNCLButtonDown() */ - return ( HIWORD(lParam) == WM_LBUTTONDOWN && LOWORD(lParam) == HTCAPTION ? MA_NOACTIVATE : MA_ACTIVATE ); - - case WM_ACTIVATE: - /* The default action in Windows is to set the keyboard focus to - * the window, if it's being activated and not minimized */ - if (LOWORD(wParam) != WA_INACTIVE) { - if (!IsIconic(hwnd)) NtUserSetFocus( hwnd ); - } - break; - - case WM_MOUSEWHEEL: - if (GetWindowLongW( hwnd, GWL_STYLE ) & WS_CHILD) - return SendMessageW( GetParent(hwnd), WM_MOUSEWHEEL, wParam, lParam ); - break; - case WM_ERASEBKGND: case WM_ICONERASEBKGND: { @@ -325,9 +285,6 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa return 1; } - case WM_GETDLGCODE: - return 0; - case WM_CTLCOLORMSGBOX: case WM_CTLCOLOREDIT: case WM_CTLCOLORLISTBOX: diff --git a/dlls/win32u/defwnd.c b/dlls/win32u/defwnd.c index c345a6ab188..72d9aa40164 100644 --- a/dlls/win32u/defwnd.c +++ b/dlls/win32u/defwnd.c @@ -270,6 +270,49 @@ LRESULT default_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, break; } + case WM_SYNCPAINT: + NtUserRedrawWindow ( hwnd, NULL, 0, RDW_ERASENOW | RDW_ERASE | RDW_ALLCHILDREN ); + return 0; + + case WM_SETREDRAW: + if (wparam) set_window_style( hwnd, WS_VISIBLE, 0 ); + else + { + NtUserRedrawWindow( hwnd, NULL, 0, RDW_ALLCHILDREN | RDW_VALIDATE ); + set_window_style( hwnd, 0, WS_VISIBLE ); + } + return 0; + + case WM_CLOSE: + NtUserDestroyWindow( hwnd ); + return 0; + + case WM_MOUSEACTIVATE: + if (get_window_long( hwnd, GWL_STYLE ) & WS_CHILD) + { + result = send_message( get_parent(hwnd), WM_MOUSEACTIVATE, wparam, lparam ); + if (result) break; + } + + /* Caption clicks are handled by NC_HandleNCLButtonDown() */ + result = HIWORD(lparam) == WM_LBUTTONDOWN && LOWORD(lparam) == HTCAPTION ? + MA_NOACTIVATE : MA_ACTIVATE; + break; + + case WM_ACTIVATE: + /* The default action in Windows is to set the keyboard focus to + * the window, if it's being activated and not minimized */ + if (LOWORD(wparam) != WA_INACTIVE && !is_iconic( hwnd )) NtUserSetFocus( hwnd ); + break; + + case WM_MOUSEWHEEL: + if (get_window_long( hwnd, GWL_STYLE ) & WS_CHILD) + result = send_message( get_parent( hwnd ), WM_MOUSEWHEEL, wparam, lparam ); + break; + + case WM_GETDLGCODE: + break; + case WM_SETTEXT: result = set_window_text( hwnd, (void *)lparam, ansi ); break;

1 0

Zebediah Figura : xslt: Use win32config.h from the correct directory.
by Alexandre Julliard 12 May '22

12 May '22

Module: wine Branch: master Commit: c111332d1bd681c4955463939029d5a25138ec4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=c111332d1bd681c495546393… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed May 11 17:07:02 2022 -0500 xslt: Use win32config.h from the correct directory. This also fixes the build with external libxml2 but bundled libxslt. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index f507d5fe6f0..f77409da444 100755 --- a/configure +++ b/configure @@ -13321,7 +13321,7 @@ then : XSLT_PE_LIBS=xslt if ${XSLT_PE_CFLAGS:+false} : then : - XSLT_PE_CFLAGS="-I\$(top_srcdir)/libs/xslt -DLIBXSLT_STATIC" + XSLT_PE_CFLAGS="-I\$(top_srcdir)/libs/xslt/libxslt -I\$(top_srcdir)/libs/xslt -DLIBXSLT_STATIC" else $as_nop enable_xslt=no fi diff --git a/configure.ac b/configure.ac index a405bf1773f..630f0563527 100644 --- a/configure.ac +++ b/configure.ac @@ -1142,7 +1142,7 @@ WINE_EXTLIB_FLAGS(PNG, png, "png \$(ZLIB_PE_LIBS)", "-I\$(top_srcdir)/libs/png") WINE_EXTLIB_FLAGS(TIFF, tiff, "tiff \$(ZLIB_PE_LIBS)", "-I\$(top_srcdir)/libs/tiff/libtiff") WINE_EXTLIB_FLAGS(VKD3D, vkd3d, vkd3d, "-I\$(top_srcdir)/libs/vkd3d/include") WINE_EXTLIB_FLAGS(XML2, xml2, xml2, "-I\$(top_srcdir)/libs/xml2/include -DLIBXML_STATIC") -WINE_EXTLIB_FLAGS(XSLT, xslt, xslt, "-I\$(top_srcdir)/libs/xslt -DLIBXSLT_STATIC") +WINE_EXTLIB_FLAGS(XSLT, xslt, xslt, "-I\$(top_srcdir)/libs/xslt/libxslt -I\$(top_srcdir)/libs/xslt -DLIBXSLT_STATIC") WINE_EXTLIB_FLAGS(ZLIB, zlib, z, "-I\$(top_srcdir)/libs/zlib -DFAR= -DZ_SOLO") dnl **** Check for pthread ****

1 0

Zebediah Figura : wineusb.sys: Mark transfer_cb() as LIBUSB_CALL.
by Alexandre Julliard 12 May '22

12 May '22

Module: wine Branch: master Commit: 2cb0cde3e5e8756274f4d172b08d4f0ff2d9c482 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2cb0cde3e5e8756274f4d172… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed May 11 19:01:47 2022 -0500 wineusb.sys: Mark transfer_cb() as LIBUSB_CALL. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineusb.sys/wineusb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c index c41ea580137..e0d4bab957d 100644 --- a/dlls/wineusb.sys/wineusb.c +++ b/dlls/wineusb.sys/wineusb.c @@ -483,7 +483,7 @@ static NTSTATUS usbd_status_from_libusb(enum libusb_transfer_status status) } } -static void transfer_cb(struct libusb_transfer *transfer) +static void LIBUSB_CALL transfer_cb(struct libusb_transfer *transfer) { IRP *irp = transfer->user_data; URB *urb = IoGetCurrentIrpStackLocation(irp)->Parameters.Others.Argument1;

1 0

Zebediah Figura : wineusb.sys: Avoid hard-coding ID string lengths.
by Alexandre Julliard 12 May '22

12 May '22

Module: wine Branch: master Commit: 9f835268212de17bb4bd620b08796b29e09597ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f835268212de17bb4bd620b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed May 11 19:01:48 2022 -0500 wineusb.sys: Avoid hard-coding ID string lengths. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineusb.sys/wineusb.c | 83 ++++++++++++++++++++++++++++++++-------------- 1 file changed, 58 insertions(+), 25 deletions(-) diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c index e0d4bab957d..261140165bc 100644 --- a/dlls/wineusb.sys/wineusb.c +++ b/dlls/wineusb.sys/wineusb.c @@ -300,30 +300,66 @@ static NTSTATUS fdo_pnp(IRP *irp) return IoCallDriver(bus_pdo, irp); } -static void get_device_id(const struct usb_device *device, WCHAR *buffer) +struct string_buffer +{ + WCHAR *string; + size_t len; +}; + +static void WINAPIV append_id(struct string_buffer *buffer, const WCHAR *format, ...) +{ + __ms_va_list args; + WCHAR *string; + int len; + + __ms_va_start(args, format); + + len = _vsnwprintf(NULL, 0, format, args) + 1; + if (!(string = ExAllocatePool(PagedPool, (buffer->len + len) * sizeof(WCHAR)))) + { + if (buffer->string) + ExFreePool(buffer->string); + buffer->string = NULL; + return; + } + if (buffer->string) + { + memcpy(string, buffer->string, buffer->len * sizeof(WCHAR)); + ExFreePool(buffer->string); + } + _vsnwprintf(string + buffer->len, len, format, args); + buffer->string = string; + buffer->len += len; + + __ms_va_end(args); +} + +static const WCHAR emptyW[] = {0}; + +static void get_device_id(const struct usb_device *device, struct string_buffer *buffer) { static const WCHAR formatW[] = {'U','S','B','\\','V','I','D','_','%','0','4','X', '&','P','I','D','_','%','0','4','X',0}; struct libusb_device_descriptor desc; libusb_get_device_descriptor(device->libusb_device, &desc); - sprintfW(buffer, formatW, desc.idVendor, desc.idProduct); + append_id(buffer, formatW, desc.idVendor, desc.idProduct); } -static void get_hardware_ids(const struct usb_device *device, WCHAR *buffer) +static void get_hardware_ids(const struct usb_device *device, struct string_buffer *buffer) { static const WCHAR formatW[] = {'U','S','B','\\','V','I','D','_','%','0','4','X', '&','P','I','D','_','%','0','4','X','&','R','E','V','_','%','0','4','X',0}; struct libusb_device_descriptor desc; libusb_get_device_descriptor(device->libusb_device, &desc); - buffer += sprintfW(buffer, formatW, desc.idVendor, desc.idProduct, desc.bcdDevice) + 1; + + append_id(buffer, formatW, desc.idVendor, desc.idProduct, desc.bcdDevice); get_device_id(device, buffer); - buffer += strlenW(buffer) + 1; - *buffer = 0; + append_id(buffer, emptyW); } -static void get_compatible_ids(const struct usb_device *device, WCHAR *buffer) +static void get_compatible_ids(const struct usb_device *device, struct string_buffer *buffer) { static const WCHAR prot_format[] = {'U','S','B','\\','C','l','a','s','s','_','%','0','2','x', '&','S','u','b','C','l','a','s','s','_','%','0','2','x', @@ -336,40 +372,34 @@ static void get_compatible_ids(const struct usb_device *device, WCHAR *buffer) libusb_get_device_descriptor(device->libusb_device, &device_desc); - buffer += sprintfW(buffer, prot_format, device_desc.bDeviceClass, device_desc.bDeviceSubClass, - device_desc.bDeviceProtocol) + 1; - buffer += sprintfW(buffer, subclass_format, device_desc.bDeviceClass, device_desc.bDeviceSubClass) + 1; - buffer += sprintfW(buffer, class_format, device_desc.bDeviceClass) + 1; - *buffer = 0; + append_id(buffer, prot_format, device_desc.bDeviceClass, + device_desc.bDeviceSubClass, device_desc.bDeviceProtocol); + append_id(buffer, subclass_format, device_desc.bDeviceClass, device_desc.bDeviceSubClass); + append_id(buffer, class_format, device_desc.bDeviceClass); + append_id(buffer, emptyW); } static NTSTATUS query_id(const struct usb_device *device, IRP *irp, BUS_QUERY_ID_TYPE type) { - WCHAR *id = NULL; + static const WCHAR instance_idW[] = {'0',0}; + struct string_buffer buffer = {0}; switch (type) { case BusQueryDeviceID: - if ((id = ExAllocatePool(PagedPool, 28 * sizeof(WCHAR)))) - get_device_id(device, id); + get_device_id(device, &buffer); break; case BusQueryInstanceID: - if ((id = ExAllocatePool(PagedPool, 2 * sizeof(WCHAR)))) - { - id[0] = '0'; - id[1] = 0; - } + append_id(&buffer, instance_idW); break; case BusQueryHardwareIDs: - if ((id = ExAllocatePool(PagedPool, (28 + 37 + 1) * sizeof(WCHAR)))) - get_hardware_ids(device, id); + get_hardware_ids(device, &buffer); break; case BusQueryCompatibleIDs: - if ((id = ExAllocatePool(PagedPool, (33 + 25 + 13 + 1) * sizeof(WCHAR)))) - get_compatible_ids(device, id); + get_compatible_ids(device, &buffer); break; default: @@ -377,7 +407,10 @@ static NTSTATUS query_id(const struct usb_device *device, IRP *irp, BUS_QUERY_ID return irp->IoStatus.Status; } - irp->IoStatus.Information = (ULONG_PTR)id; + if (!buffer.string) + return STATUS_NO_MEMORY; + + irp->IoStatus.Information = (ULONG_PTR)buffer.string; return STATUS_SUCCESS; }

1 0

Zebediah Figura : wineusb.sys: Trace the type in query_id().
by Alexandre Julliard 12 May '22

12 May '22

Module: wine Branch: master Commit: c3bdb5d156c510ca22cc1f2f4c0e7fc9c6d1e691 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c3bdb5d156c510ca22cc1f2f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed May 11 19:01:49 2022 -0500 wineusb.sys: Trace the type in query_id(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineusb.sys/wineusb.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c index 261140165bc..612c62f3f5f 100644 --- a/dlls/wineusb.sys/wineusb.c +++ b/dlls/wineusb.sys/wineusb.c @@ -384,6 +384,8 @@ static NTSTATUS query_id(const struct usb_device *device, IRP *irp, BUS_QUERY_ID static const WCHAR instance_idW[] = {'0',0}; struct string_buffer buffer = {0}; + TRACE("type %#x.\n", type); + switch (type) { case BusQueryDeviceID:

1 0