- Wine-Devel - list.winehq.org

[PATCH v2 1/2] user32/tests: Test intra-thread SendMessage and ReplyMessage behavior.
by Gabriel Ivăncescu June 10, 2022

June 10, 2022

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- v2: Add broken() check to fix w10pro64_ar testbot results. dlls/user32/tests/msg.c | 90 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 2705914..ce931d2 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -18521,6 +18521,12 @@ static void test_SendMessage_other_thread(int thread_n) CloseHandle(wnd_event.stop_event); } +static void CALLBACK msg_callback_nested( HWND hwnd, UINT msg, ULONG_PTR arg, LRESULT result ) +{ + ok( msg == WM_USER + 10, "wrong msg %x\n", msg ); + ok( result == 0, "wrong result %Ix\n", result ); +} + static LRESULT CALLBACK insendmessage_wnd_proc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) { DWORD flags = InSendMessageEx( NULL ); @@ -18561,6 +18567,80 @@ static LRESULT CALLBACK insendmessage_wnd_proc( HWND hwnd, UINT msg, WPARAM wp, ret = ReplyMessage( msg ); ok( !ret, "ReplyMessage succeeded\n" ); break; + case WM_USER + 4: + ok( flags == ISMEX_SEND, "wrong flags %lx\n", flags ); + ok( InSendMessage(), "InSendMessage returned false\n" ); + SendMessageCallbackA( hwnd, WM_USER + 10, 0, 0, msg_callback_nested, 0 ); + flags = InSendMessageEx( NULL ); + ok( flags == (ISMEX_SEND | ISMEX_REPLIED) || broken(flags == (ISMEX_NOTIFY | ISMEX_REPLIED)), "wrong flags %lx\n", flags ); + ret = ReplyMessage( msg ); + todo_wine + ok( !ret, "ReplyMessage returned %u\n", ret ); + flags = InSendMessageEx( NULL ); + ok( flags == (ISMEX_SEND | ISMEX_REPLIED) || broken(flags == (ISMEX_NOTIFY | ISMEX_REPLIED)), "wrong flags %lx\n", flags ); + ok( InSendMessage(), "InSendMessage returned false\n" ); + break; + case WM_USER + 5: + ok( flags == ISMEX_NOTIFY, "wrong flags %lx\n", flags ); + ok( InSendMessage(), "InSendMessage returned false\n" ); + SendMessageA( hwnd, WM_USER + 11, 0, 0 ); + flags = InSendMessageEx( NULL ); + ok( flags == ISMEX_NOTIFY, "wrong flags %lx\n", flags ); + ret = ReplyMessage( msg ); + ok( ret, "ReplyMessage failed err %lu\n", GetLastError() ); + flags = InSendMessageEx( NULL ); + ok( flags == ISMEX_NOTIFY, "wrong flags %lx\n", flags ); + ok( InSendMessage(), "InSendMessage returned false\n" ); + break; + case WM_USER + 6: + ok( flags == ISMEX_CALLBACK, "wrong flags %lx\n", flags ); + ok( InSendMessage(), "InSendMessage returned false\n" ); + SendMessageW( hwnd, WM_USER + 12, 0, 0 ); + flags = InSendMessageEx( NULL ); + ok( flags == (ISMEX_CALLBACK | ISMEX_REPLIED) || flags == ISMEX_SEND, "wrong flags %lx\n", flags ); + ok( InSendMessage(), "InSendMessage returned false\n" ); + ret = ReplyMessage( msg ); + todo_wine + ok( !ret, "ReplyMessage returned %u\n", ret ); + flags = InSendMessageEx( NULL ); + ok( flags == (ISMEX_CALLBACK | ISMEX_REPLIED) || flags == ISMEX_SEND, "wrong flags %lx\n", flags ); + ok( InSendMessage(), "InSendMessage returned false\n" ); + break; + case WM_USER + 7: + ok( flags == ISMEX_NOSEND, "wrong flags %lx\n", flags ); + ok( !InSendMessage(), "InSendMessage returned true\n" ); + SendNotifyMessageW( hwnd, WM_USER + 13, 0, 0 ); + flags = InSendMessageEx( NULL ); + ok( flags == ISMEX_NOSEND, "wrong flags %lx\n", flags ); + ok( !InSendMessage(), "InSendMessage returned true\n" ); + ret = ReplyMessage( msg ); + ok( !ret, "ReplyMessage succeeded\n" ); + break; + + case WM_USER + 10: + ok( flags == ISMEX_SEND, "wrong flags %lx\n", flags ); + ok( InSendMessage(), "InSendMessage returned false\n" ); + ret = ReplyMessage( msg ); + ok( ret, "ReplyMessage failed err %lu\n", GetLastError() ); + break; + case WM_USER + 11: + ok( flags == ISMEX_NOTIFY, "wrong flags %lx\n", flags ); + ok( InSendMessage(), "InSendMessage returned false\n" ); + ret = ReplyMessage( msg ); + ok( ret, "ReplyMessage failed err %lu\n", GetLastError() ); + break; + case WM_USER + 12: + ok( flags == ISMEX_CALLBACK, "wrong flags %lx\n", flags ); + ok( InSendMessage(), "InSendMessage returned false\n" ); + ret = ReplyMessage( msg ); + ok( ret, "ReplyMessage failed err %lu\n", GetLastError() ); + break; + case WM_USER + 13: + ok( flags == ISMEX_NOSEND, "wrong flags %lx\n", flags ); + ok( !InSendMessage(), "InSendMessage returned false\n" ); + ret = ReplyMessage( msg ); + ok( !ret, "ReplyMessage returned %u\n", ret ); + break; } return DefWindowProcA( hwnd, msg, wp, lp ); @@ -18572,6 +18652,12 @@ static void CALLBACK msg_callback( HWND hwnd, UINT msg, ULONG_PTR arg, LRESULT r ok( result == WM_USER + 2, "wrong result %Ix\n", result ); } +static void CALLBACK msg_callback2( HWND hwnd, UINT msg, ULONG_PTR arg, LRESULT result ) +{ + ok( msg == WM_USER + 6, "wrong msg %x\n", msg ); + ok( result == WM_USER + 6, "wrong result %Ix\n", result ); +} + static DWORD WINAPI send_message_thread( void *arg ) { HWND win = arg; @@ -18580,6 +18666,10 @@ static DWORD WINAPI send_message_thread( void *arg ) SendNotifyMessageA( win, WM_USER + 1, 0, 0 ); SendMessageCallbackA( win, WM_USER + 2, 0, 0, msg_callback, 0 ); PostMessageA( win, WM_USER + 3, 0, 0 ); + SendMessageA( win, WM_USER + 4, 0, 0 ); + SendNotifyMessageA( win, WM_USER + 5, 0, 0 ); + SendMessageCallbackA( win, WM_USER + 6, 0, 0, msg_callback2, 0 ); + PostMessageA( win, WM_USER + 7, 0, 0 ); PostMessageA( win, WM_QUIT, 0, 0 ); return 0; } -- 2.34.1

1 1

[PATCH v2 0/3] MR216: uiautomationcore: More UiaProviderFromIAccessible work.
by Connor McAdams (＠cmcadams) June 10, 2022

June 10, 2022

-- v2: uiautomationcore: Add ILegacyIAccessibleProvider implementation for MSAA providers. include: Add ILegacyIAccessibleProvider interface definition. uiautomationcore: Implement get_HostRawElementProvider for MSAA providers. https://gitlab.winehq.org/wine/wine/-/merge_requests/216

3 8

[PATCH v3 0/6] MR217: windows.media.speech: ISpeechSynthesisStream stub implementation.
by Bernhard Kölbl June 10, 2022

June 10, 2022

Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> -- v3: windows.media.speech: Add stub ISpeechSynthesisStream iface. windows.media.speech: Return IAsyncOperation from synthesizer_SynthesizeSsmlToStreamAsync. windows.media.speech: Return IAsyncOperation from synthesizer_SynthesizeTextToStreamAsync. windows.media.speech/tests: Add basic tests for ssml/text to stream functions. windows.media.speech/tests: Handle a possible race condition. https://gitlab.winehq.org/wine/wine/-/merge_requests/217

3 15

[PATCH 0/6] MR223: dinput/tests: Cleanup mouse and keyboard tests and merge them into device8.c.
by Rémi Bernon June 10, 2022

June 10, 2022

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

2 8

[PATCH 0/4] MR218: advapi32: Implement RegRenameKey()
by Nikolay Sivov (＠nsivov) June 10, 2022

June 10, 2022

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

4 6

[PATCH v4 0/1] MR167: d3drm: IDirect3DRMMeshBuilder3::Load support loading from resource
by Alistair Leslie-Hughes (＠alesliehughes) June 10, 2022

June 10, 2022

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> -- v4: d3drm: IDirect3DRMMeshBuilder3 Load support loading from resource https://gitlab.winehq.org/wine/wine/-/merge_requests/167

3 2

[PATCH v3 0/1] MR181: winebus: Optionally split joysticks with more than 6 axes.
by Timo Zuccarello (＠timozuccarello) June 10, 2022

June 10, 2022

Add registry option "Split Controllers" and optionally split joysticks with more than 6 axes to improve compatibility with applications that do not support more than 6 axes where on Windows a driver would be installed that splits the device. Signed-off-by: Timo Zuccarello <timo(a)zuccarello.eu> -- v3: winebus: Optionally split joysticks with more than 6 axes. https://gitlab.winehq.org/wine/wine/-/merge_requests/181

3 2

[PATCH 3/3]ntdll/tests: Add tests for _allshl and _allshr.
by Zhao Yi June 10, 2022

June 10, 2022

Signed-off-by: Zhao Yi <zhaoyi(a)uniontech.com> --- dlls/ntdll/tests/large_int.c | 57 ++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/dlls/ntdll/tests/large_int.c b/dlls/ntdll/tests/large_int.c index 9635cac24ad..793696f1e4d 100644 --- a/dlls/ntdll/tests/large_int.c +++ b/dlls/ntdll/tests/large_int.c @@ -40,6 +40,9 @@ static LONGLONG (WINAPI *p_allmul)( LONGLONG a, LONGLONG b ); static ULONGLONG (WINAPI *p_aulldiv)( ULONGLONG a, ULONGLONG b ); static ULONGLONG (WINAPI *p_aullrem)( ULONGLONG a, ULONGLONG b ); +static LONGLONG (CDECL *p_allshl)(void); +static LONGLONG (CDECL *p_allshr)(void); + static void InitFunctionPtrs(void) { hntdll = LoadLibraryA("ntdll.dll"); @@ -56,6 +59,8 @@ static void InitFunctionPtrs(void) p_allmul = (void *)GetProcAddress(hntdll, "_allmul"); p_aulldiv = (void *)GetProcAddress(hntdll, "_aulldiv"); p_aullrem = (void *)GetProcAddress(hntdll, "_aullrem"); + p_allshl = (void *)GetProcAddress(hntdll, "_allshl"); + p_allshr = (void *)GetProcAddress(hntdll, "_allshr"); } /* if */ } @@ -492,6 +497,56 @@ static void test_builtins(void) #endif /* __i386__ */ } +static void test_allshl(void) +{ + int c = 0; + + asm("mov $0x55667788,%eax"); + asm("mov $0x11223344,%edx"); + asm("mov $0x4,%cl"); + c = p_allshl(); + ok(c == 0x56677880, "1. _allshl returned 0x%x\n", c); + + asm("mov $0x55667788,%eax"); + asm("mov $0x11223344,%edx"); + asm("mov $0x28,%cl"); + c = p_allshl(); + ok(c == 0, "2. _allshl returned 0x%x\n", c); + + asm("mov $0x55667788,%eax"); + asm("mov $0x11223344,%edx"); + asm("mov $0x46,%cl"); + c = p_allshl(); + ok(c == 0, "3. _allshl returned 0x%x\n", c); + + return; +} + +static void test_allshr(void) +{ + int c = 0; + + asm("mov $0x55667788,%eax"); + asm("mov $0x11223344,%edx"); + asm("mov $0x4,%cl"); + c = p_allshr(); + ok(c == 0x45566778, "1. _allshr returned 0x%x\n", c); + + asm("mov $0x55667788,%eax"); + asm("mov $0x11223344,%edx"); + asm("mov $0x28,%cl"); + c = p_allshr(); + ok(c == 0x112233, "2. _allshr returned 0x%x\n", c); + + asm("mov $0x55667788,%eax"); + asm("mov $0x11223344,%edx"); + asm("mov $0x46,%cl"); + c = p_allshr(); + ok(c == 0, "3. _allshr returned 0x%x\n", c); + + return; +} + START_TEST(large_int) { InitFunctionPtrs(); @@ -503,4 +558,6 @@ START_TEST(large_int) if (pRtlLargeIntegerToChar) test_RtlLargeIntegerToChar(); test_builtins(); + test_allshl(); + test_allshr(); } -- 2.20.1

2 1

[PATCH v3] comctl32/listview: Add partial support for LVM_SETBKIMAGE.
by Dmitry Timoshkov June 10, 2022

June 10, 2022

v2: Formatting fixes, add some tests. v3: Add v6 tests, make v6 behaviour the default one. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/comctl32/listview.c | 81 +++++++++++++++++++++++++++++++--- dlls/comctl32/tests/listview.c | 78 ++++++++++++++++++++++++++++++++ 2 files changed, 152 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 730bf4aaddd..0ad88f779b7 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -91,7 +91,7 @@ * * Messages: * -- LVM_ENABLEGROUPVIEW - * -- LVM_GETBKIMAGE, LVM_SETBKIMAGE + * -- LVM_GETBKIMAGE * -- LVM_GETGROUPINFO, LVM_SETGROUPINFO * -- LVM_GETGROUPMETRICS, LVM_SETGROUPMETRICS * -- LVM_GETINSERTMARK, LVM_SETINSERTMARK @@ -297,6 +297,7 @@ typedef struct tagLISTVIEW_INFO COLORREF clrBk; COLORREF clrText; COLORREF clrTextBk; + HBITMAP hBkBitmap; /* font */ HFONT hDefaultFont; @@ -4565,13 +4566,32 @@ static INT LISTVIEW_GetTopIndex(const LISTVIEW_INFO *infoPtr) * Success: TRUE * Failure: FALSE */ -static inline BOOL LISTVIEW_FillBkgnd(const LISTVIEW_INFO *infoPtr, HDC hdc, const RECT *lprcBox) +static BOOL LISTVIEW_FillBkgnd(const LISTVIEW_INFO *infoPtr, HDC hdc, const RECT *lprcBox) { - if (!infoPtr->hBkBrush) return FALSE; + BOOL ret = FALSE; - TRACE("(hdc=%p, lprcBox=%s, hBkBrush=%p)\n", hdc, wine_dbgstr_rect(lprcBox), infoPtr->hBkBrush); + if (infoPtr->hBkBrush) + { + TRACE("(hdc=%p, lprcBox=%s, hBkBrush=%p)\n", hdc, wine_dbgstr_rect(lprcBox), infoPtr->hBkBrush); + + ret = FillRect(hdc, lprcBox, infoPtr->hBkBrush); + } + + if (infoPtr->hBkBitmap) + { + HDC hdc_src = CreateCompatibleDC(hdc); + + TRACE("(hdc=%p, lprcBox=%s, hBkBitmap=%p)\n", hdc, wine_dbgstr_rect(lprcBox), infoPtr->hBkBitmap); + + SelectObject(hdc_src, infoPtr->hBkBitmap); + BitBlt(hdc, lprcBox->left, lprcBox->top, lprcBox->right - lprcBox->left, + lprcBox->bottom - lprcBox->top, hdc_src, lprcBox->left, lprcBox->top, SRCCOPY); + + DeleteDC(hdc_src); + ret = TRUE; + } - return FillRect(hdc, lprcBox, infoPtr->hBkBrush); + return ret; } /* Draw main item or subitem */ @@ -8028,7 +8048,51 @@ static BOOL LISTVIEW_SetBkColor(LISTVIEW_INFO *infoPtr, COLORREF color) return TRUE; } -/* LISTVIEW_SetBkImage */ +static BOOL LISTVIEW_SetBkImage(LISTVIEW_INFO *infoPtr, const LVBKIMAGEW *image, BOOL isW) +{ + TRACE("%08lx, %p, %p, %u, %d, %d\n", image->ulFlags, image->hbm, image->pszImage, + image->cchImageMax, image->xOffsetPercent, image->yOffsetPercent); + + if (image->ulFlags & ~LVBKIF_SOURCE_MASK) + FIXME("not supported flags %08lx\n", image->ulFlags & ~LVBKIF_SOURCE_MASK); + + if (image->xOffsetPercent || image->yOffsetPercent) + FIXME("not supported offset %d,%d\n", image->xOffsetPercent, image->yOffsetPercent); + + switch (image->ulFlags & LVBKIF_SOURCE_MASK) + { + case LVBKIF_SOURCE_NONE: + if (infoPtr->hBkBitmap) + { + DeleteObject(infoPtr->hBkBitmap); + infoPtr->hBkBitmap = 0; + } + break; + + case LVBKIF_SOURCE_HBITMAP: + { + BITMAP bm; + + if (infoPtr->hBkBitmap) + { + DeleteObject(infoPtr->hBkBitmap); + infoPtr->hBkBitmap = 0; + } + if (GetObjectW(image->hbm, sizeof(bm), &bm) == sizeof(bm)) + { + infoPtr->hBkBitmap = image->hbm; + return TRUE; + } + break; + } + + case LVBKIF_SOURCE_URL: + FIXME("LVBKIF_SOURCE_URL: %s\n", isW ? debugstr_w(image->pszImage) : debugstr_a((LPCSTR)image->pszImage)); + break; + } + + return FALSE; +} /*** Helper for {Insert,Set}ColumnT *only* */ static void column_fill_hditem(const LISTVIEW_INFO *infoPtr, HDITEMW *lphdi, INT nColumn, @@ -10406,6 +10470,7 @@ static LRESULT LISTVIEW_NCDestroy(LISTVIEW_INFO *infoPtr) infoPtr->hFont = 0; if (infoPtr->hDefaultFont) DeleteObject(infoPtr->hDefaultFont); if (infoPtr->clrBk != CLR_NONE) DeleteObject(infoPtr->hBkBrush); + if (infoPtr->hBkBitmap) DeleteObject(infoPtr->hBkBitmap); SetWindowLongPtrW(infoPtr->hwndSelf, 0, 0); @@ -11554,7 +11619,9 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case LVM_SETBKCOLOR: return LISTVIEW_SetBkColor(infoPtr, (COLORREF)lParam); - /* case LVM_SETBKIMAGE: */ + case LVM_SETBKIMAGEA: + case LVM_SETBKIMAGEW: + return LISTVIEW_SetBkImage(infoPtr, (LVBKIMAGEW *)lParam, uMsg == LVM_SETBKIMAGEW); case LVM_SETCALLBACKMASK: infoPtr->uCallbackMask = (UINT)wParam; diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 6ac7f53137d..3a78f5f670c 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -23,6 +23,7 @@ #include <stdio.h> #include <windows.h> #include <commctrl.h> +#include <objbase.h> #include "wine/test.h" #include "v6util.h" @@ -6924,6 +6925,81 @@ static void test_LVM_GETNEXTITEMINDEX(void) DestroyWindow(hwnd); } +static void test_LVM_SETBKIMAGE(BOOL is_v6) +{ + HWND hwnd; + int ret; + HBITMAP hbmp; + BITMAP bm; + LVBKIMAGEA image; + + CoInitialize(NULL); + + hbmp = CreateBitmap(32, 32, 1, 1, NULL); + hwnd = create_listview_control(LVS_REPORT); + + image.ulFlags = LVBKIF_SOURCE_NONE; + image.hbm = 0; + image.pszImage = NULL; + image.cchImageMax = 0; + image.xOffsetPercent = 0; + image.yOffsetPercent = 0; + ret = SendMessageA(hwnd, LVM_SETBKIMAGEA, 0, (LPARAM)&image); + ok(!ret, "got %d\n", ret); + + ret = GetObjectA(hbmp, sizeof(bm), &bm); + ok(ret == sizeof(bm), "got %d\n", ret); + + image.ulFlags = LVBKIF_SOURCE_HBITMAP; + image.hbm = hbmp; + ret = SendMessageA(hwnd, LVM_SETBKIMAGEA, 0, (LPARAM)&image); + if (is_v6) + ok(ret, "got %d\n", ret); + else + todo_wine ok(!ret, "got %d\n", ret); + + ret = GetObjectA(hbmp, sizeof(bm), &bm); + ok(ret == sizeof(bm), "got %d\n", ret); + + image.ulFlags = LVBKIF_SOURCE_NONE; + image.hbm = 0; + ret = SendMessageA(hwnd, LVM_SETBKIMAGEA, 0, (LPARAM)&image); + ok(!ret, "got %d\n", ret); + + ret = GetObjectA(hbmp, sizeof(bm), &bm); + ok(!ret, "got %d\n", ret); + + hbmp = CreateBitmap(32, 32, 1, 1, NULL); + + image.ulFlags = LVBKIF_SOURCE_HBITMAP; + image.hbm = hbmp; + ret = SendMessageA(hwnd, LVM_SETBKIMAGEA, 0, (LPARAM)&image); + if (is_v6) + ok(ret, "got %d\n", ret); + else + todo_wine ok(!ret, "got %d\n", ret); + + ret = GetObjectA(hbmp, sizeof(bm), &bm); + ok(ret == sizeof(bm), "got %d\n", ret); + + image.ulFlags = LVBKIF_SOURCE_HBITMAP; + image.hbm = hbmp; + ret = SendMessageA(hwnd, LVM_SETBKIMAGEA, 0, (LPARAM)&image); + ok(!ret, "got %d\n", ret); + + ret = GetObjectA(hbmp, sizeof(bm), &bm); + ok(!ret, "got %d\n", ret); + + image.ulFlags = LVBKIF_SOURCE_NONE; + image.hbm = 0; + ret = SendMessageA(hwnd, LVM_SETBKIMAGEA, 0, (LPARAM)&image); + ok(!ret, "got %d\n", ret); + + DestroyWindow(hwnd); + + CoUninitialize(); +} + START_TEST(listview) { ULONG_PTR ctx_cookie; @@ -6987,6 +7063,7 @@ START_TEST(listview) test_LVN_ENDLABELEDIT(); test_LVM_GETCOUNTPERPAGE(); test_item_state_change(); + test_LVM_SETBKIMAGE(FALSE); if (!load_v6_module(&ctx_cookie, &hCtx)) { @@ -7034,6 +7111,7 @@ START_TEST(listview) test_item_state_change(); test_selected_column(); test_LVM_GETNEXTITEMINDEX(); + test_LVM_SETBKIMAGE(TRUE); unload_v6_module(ctx_cookie, hCtx); -- 2.36.1

1 0

[PATCH 2/3]ntdll: Reimplement function _allshl and _allshr.
by Zhao Yi June 10, 2022

June 10, 2022

Signed-off-by: Zhao Yi <zhaoyi(a)uniontech.com> --- dlls/ntdll/large_int.c | 46 ++++++++++++++++++++++++++++++++++-------- dlls/ntdll/ntdll.spec | 4 ++-- 2 files changed, 40 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/large_int.c b/dlls/ntdll/large_int.c index b38074158c8..2f6e27eff10 100644 --- a/dlls/ntdll/large_int.c +++ b/dlls/ntdll/large_int.c @@ -821,10 +821,25 @@ ULONGLONG WINAPI _aulldiv( ULONGLONG a, ULONGLONG b ) * RETURNS * The left-shifted value. */ -LONGLONG WINAPI _allshl( LONGLONG a, LONG b ) -{ - return a << b; -} +__ASM_GLOBAL_FUNC( _allshl, +"cmp $0x40, %cl\n\t" +"jnb 1f\n\t" +"cmp $0x20, %cl\n\t" +"jnb 2f\n\t" +"shld %cl, %eax, %edx\n\t" +"shl %cl, %eax\n\t" +"ret\n\t" +"2:\n\t" +"mov %eax, %edx\n\t" +"xor %eax, %eax\n\t" +"and $0x1f, %cl\n\t" +"shl %cl, %edx\n\t" +"ret\n\t" +"1:\n\t" +"xor %eax, %eax\n\t" +"xor %edx, %edx\n\t" +"ret\n\t" +) /****************************************************************************** * _allshr (NTDLL.@) @@ -838,10 +853,25 @@ LONGLONG WINAPI _allshl( LONGLONG a, LONG b ) * RETURNS * The right-shifted value. */ -LONGLONG WINAPI _allshr( LONGLONG a, LONG b ) -{ - return a >> b; -} +__ASM_GLOBAL_FUNC( _allshr, +"cmp $0x40, %cl\n\t" +"jnb 1f\n\t" +"cmp $0x20, %cl\n\t" +"jnb 2f\n\t" +"shrd %cl,%edx,%eax\n\t" +"sar %cl,%edx\n\t" +"ret\n\t" +"2:\n\t" +"mov %edx,%eax\n\t" +"sar $0x1f,%edx\n\t" +"and $0x1f,%cl\n\t" +"sar %cl,%eax\n\t" +"ret\n\t" +"1:\n\t" +"sar $0x1f,%edx\n\t" +"mov %edx,%eax\n\t" +"ret\n\t" +) /****************************************************************************** * _alldvrm (NTDLL.@) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index b1650ab4306..6b96b0433fd 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1492,8 +1492,8 @@ @ cdecl -norelay -arch=i386 -ret64 _allmul(int64 int64) @ cdecl -arch=i386 -norelay _alloca_probe() @ cdecl -norelay -arch=i386 -ret64 _allrem(int64 int64) -@ stdcall -arch=i386 -ret64 _allshl(int64 long) -@ stdcall -arch=i386 -ret64 _allshr(int64 long) +@ cdecl -arch=i386 -ret64 _allshl() +@ cdecl -arch=i386 -ret64 _allshr() @ cdecl -ret64 _atoi64(str) @ cdecl -norelay -arch=i386 -ret64 _aulldiv(int64 int64) @ cdecl -arch=i386 -norelay _aulldvrm(int64 int64) -- 2.20.1

1 0