- Wine-Devel - list.winehq.org

[PATCH] kernelbase: Fix infinite loop in Internal_EnumCalendarInfo.
by Jinoh Kang Nov. 30, 2021

Nov. 30, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52129 Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- dlls/kernelbase/locale.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 10f3b2698b5..779d6071ab0 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -2722,13 +2722,13 @@ static DWORD get_timezone_id( const TIME_ZONE_INFORMATION *info, LARGE_INTEGER t /****************************************************************************** * Internal_EnumCalendarInfo (kernelbase.@) */ -BOOL WINAPI DECLSPEC_HOTPATCH Internal_EnumCalendarInfo( CALINFO_ENUMPROCW proc, LCID lcid, CALID id, +BOOL WINAPI DECLSPEC_HOTPATCH Internal_EnumCalendarInfo( CALINFO_ENUMPROCW proc, LCID lcid, CALID id_or_all, CALTYPE type, BOOL unicode, BOOL ex, BOOL exex, LPARAM lparam ) { WCHAR buffer[256]; - DWORD optional = 0; - INT ret; + CALID calendars[2], id; + INT ret, i; if (!proc) { @@ -2736,16 +2736,24 @@ BOOL WINAPI DECLSPEC_HOTPATCH Internal_EnumCalendarInfo( CALINFO_ENUMPROCW proc, return FALSE; } - if (id == ENUM_ALL_CALENDARS) + if (id_or_all == ENUM_ALL_CALENDARS) { if (!GetLocaleInfoW( lcid, LOCALE_ICALENDARTYPE | LOCALE_RETURN_NUMBER, - (WCHAR *)&id, sizeof(id) / sizeof(WCHAR) )) return FALSE; + (WCHAR *)&calendars[0], sizeof(calendars[0]) / sizeof(WCHAR) )) return FALSE; if (!GetLocaleInfoW( lcid, LOCALE_IOPTIONALCALENDAR | LOCALE_RETURN_NUMBER, - (WCHAR *)&optional, sizeof(optional) / sizeof(WCHAR) )) optional = 0; + (WCHAR *)&calendars[1], sizeof(calendars[1]) / sizeof(WCHAR) )) calendars[1] = 0; + } + else + { + calendars[0] = id_or_all; + calendars[1] = 0; } - for (;;) + for (i = 0; i < ARRAY_SIZE(calendars); i++) { + id = calendars[i]; + if (!id) continue; + if (type & CAL_RETURN_NUMBER) ret = GetCalendarInfoW( lcid, id, type, NULL, 0, (LPDWORD)buffer ); else if (unicode) @@ -2764,8 +2772,6 @@ BOOL WINAPI DECLSPEC_HOTPATCH Internal_EnumCalendarInfo( CALINFO_ENUMPROCW proc, else ret = proc( buffer ); } if (!ret) break; - if (!optional) break; - id = optional; } return TRUE; } -- 2.31.1

1 0

[PATCH 1/2] strmbase: Remove the no longer used output queue helper.
by Zebediah Figura Nov. 30, 2021

Nov. 30, 2021

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- include/wine/strmbase.h | 36 ----- libs/strmbase/Makefile.in | 1 - libs/strmbase/outputqueue.c | 275 ------------------------------------ 3 files changed, 312 deletions(-) delete mode 100644 libs/strmbase/outputqueue.c diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index b01bac89aa6..72aa49847c4 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -201,42 +201,6 @@ HRESULT WINAPI SourceSeekingImpl_SetRate(IMediaSeeking * iface, double dRate); HRESULT WINAPI SourceSeekingImpl_GetRate(IMediaSeeking * iface, double * dRate); HRESULT WINAPI SourceSeekingImpl_GetPreroll(IMediaSeeking * iface, LONGLONG * pPreroll); -/* Output Queue */ -typedef struct tagOutputQueue { - CRITICAL_SECTION csQueue; - - struct strmbase_source *pInputPin; - - HANDLE hThread; - HANDLE hProcessQueue; - - LONG lBatchSize; - BOOL bBatchExact; - BOOL bTerminate; - BOOL bSendAnyway; - - struct list SampleList; - - const struct OutputQueueFuncTable* pFuncsTable; -} OutputQueue; - -typedef DWORD (WINAPI *OutputQueue_ThreadProc)(OutputQueue *This); - -typedef struct OutputQueueFuncTable -{ - OutputQueue_ThreadProc pfnThreadProc; -} OutputQueueFuncTable; - -HRESULT WINAPI OutputQueue_Construct( struct strmbase_source *pin, BOOL bAuto, - BOOL bQueue, LONG lBatchSize, BOOL bBatchExact, DWORD dwPriority, - const OutputQueueFuncTable* pFuncsTable, OutputQueue **ppOutputQueue ); -HRESULT WINAPI OutputQueue_Destroy(OutputQueue *pOutputQueue); -HRESULT WINAPI OutputQueue_ReceiveMultiple(OutputQueue *pOutputQueue, IMediaSample **ppSamples, LONG nSamples, LONG *nSamplesProcessed); -HRESULT WINAPI OutputQueue_Receive(OutputQueue *pOutputQueue, IMediaSample *pSample); -VOID WINAPI OutputQueue_EOS(OutputQueue *pOutputQueue); -VOID WINAPI OutputQueue_SendAnyway(OutputQueue *pOutputQueue); -DWORD WINAPI OutputQueueImpl_ThreadProc(OutputQueue *pOutputQueue); - enum strmbase_type_id { IBasicAudio_tid, diff --git a/libs/strmbase/Makefile.in b/libs/strmbase/Makefile.in index 077abc1da50..8b6ea8a3b43 100644 --- a/libs/strmbase/Makefile.in +++ b/libs/strmbase/Makefile.in @@ -4,7 +4,6 @@ C_SRCS = \ dispatch.c \ filter.c \ mediatype.c \ - outputqueue.c \ pin.c \ pospass.c \ renderer.c \ diff --git a/libs/strmbase/outputqueue.c b/libs/strmbase/outputqueue.c deleted file mode 100644 index 4ac3ef72bd5..00000000000 --- a/libs/strmbase/outputqueue.c +++ /dev/null @@ -1,275 +0,0 @@ -/* - * Generic Implementation of COutputQueue - * - * Copyright 2011 Aric Stewart, CodeWeavers - * - * 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 "strmbase_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(quartz); - -enum {SAMPLE_PACKET, EOS_PACKET}; - -typedef struct tagQueuedEvent { - int type; - struct list entry; - - IMediaSample *pSample; -} QueuedEvent; - -static DWORD WINAPI OutputQueue_InitialThreadProc(LPVOID data) -{ - OutputQueue *This = (OutputQueue *)data; - return This->pFuncsTable->pfnThreadProc(This); -} - -static void OutputQueue_FreeSamples(OutputQueue *pOutputQueue) -{ - struct list *cursor, *cursor2; - LIST_FOR_EACH_SAFE(cursor, cursor2, &pOutputQueue->SampleList) - { - QueuedEvent *qev = LIST_ENTRY(cursor, QueuedEvent, entry); - list_remove(cursor); - HeapFree(GetProcessHeap(),0,qev); - } -} - -HRESULT WINAPI OutputQueue_Construct(struct strmbase_source *pInputPin, BOOL bAuto, - BOOL bQueue, LONG lBatchSize, BOOL bBatchExact, DWORD dwPriority, - const OutputQueueFuncTable *pFuncsTable, OutputQueue **ppOutputQueue) - -{ - BOOL threaded = FALSE; - DWORD tid; - - OutputQueue *This; - - if (!pInputPin || !pFuncsTable || !ppOutputQueue) - return E_INVALIDARG; - - *ppOutputQueue = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(OutputQueue)); - if (!*ppOutputQueue) - return E_OUTOFMEMORY; - - This = *ppOutputQueue; - This->pFuncsTable = pFuncsTable; - This->lBatchSize = lBatchSize; - This->bBatchExact = bBatchExact; - InitializeCriticalSection(&This->csQueue); - This->csQueue.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": OutputQueue.csQueue"); - list_init(&This->SampleList); - - This->pInputPin = pInputPin; - IPin_AddRef(&pInputPin->pin.IPin_iface); - - EnterCriticalSection(&This->csQueue); - if (bAuto && pInputPin->pMemInputPin) - threaded = IMemInputPin_ReceiveCanBlock(pInputPin->pMemInputPin) == S_OK; - else - threaded = bQueue; - - if (threaded) - { - This->hThread = CreateThread(NULL, 0, OutputQueue_InitialThreadProc, This, 0, &tid); - if (This->hThread) - { - SetThreadPriority(This->hThread, dwPriority); - This->hProcessQueue = CreateEventW(NULL, 0, 0, NULL); - } - } - LeaveCriticalSection(&This->csQueue); - - return S_OK; -} - -HRESULT WINAPI OutputQueue_Destroy(OutputQueue *pOutputQueue) -{ - EnterCriticalSection(&pOutputQueue->csQueue); - OutputQueue_FreeSamples(pOutputQueue); - pOutputQueue->bTerminate = TRUE; - SetEvent(pOutputQueue->hProcessQueue); - LeaveCriticalSection(&pOutputQueue->csQueue); - - pOutputQueue->csQueue.DebugInfo->Spare[0] = 0; - DeleteCriticalSection(&pOutputQueue->csQueue); - CloseHandle(pOutputQueue->hProcessQueue); - - IPin_Release(&pOutputQueue->pInputPin->pin.IPin_iface); - HeapFree(GetProcessHeap(),0,pOutputQueue); - return S_OK; -} - -HRESULT WINAPI OutputQueue_ReceiveMultiple(OutputQueue *pOutputQueue, IMediaSample **ppSamples, LONG nSamples, LONG *nSamplesProcessed) -{ - HRESULT hr = S_OK; - int i; - - if (!pOutputQueue->pInputPin->pin.peer || !pOutputQueue->pInputPin->pMemInputPin) - return VFW_E_NOT_CONNECTED; - - if (!pOutputQueue->hThread) - { - IMemInputPin_AddRef(pOutputQueue->pInputPin->pMemInputPin); - hr = IMemInputPin_ReceiveMultiple(pOutputQueue->pInputPin->pMemInputPin,ppSamples, nSamples, nSamplesProcessed); - IMemInputPin_Release(pOutputQueue->pInputPin->pMemInputPin); - } - else - { - EnterCriticalSection(&pOutputQueue->csQueue); - *nSamplesProcessed = 0; - - for (i = 0; i < nSamples; i++) - { - QueuedEvent *qev = HeapAlloc(GetProcessHeap(),0,sizeof(QueuedEvent)); - if (!qev) - { - ERR("Out of Memory\n"); - hr = E_OUTOFMEMORY; - break; - } - qev->type = SAMPLE_PACKET; - qev->pSample = ppSamples[i]; - IMediaSample_AddRef(ppSamples[i]); - list_add_tail(&pOutputQueue->SampleList, &qev->entry); - (*nSamplesProcessed)++; - } - - if (!pOutputQueue->bBatchExact || list_count(&pOutputQueue->SampleList) >= pOutputQueue->lBatchSize) - SetEvent(pOutputQueue->hProcessQueue); - LeaveCriticalSection(&pOutputQueue->csQueue); - } - return hr; -} - -HRESULT WINAPI OutputQueue_Receive(OutputQueue *pOutputQueue, IMediaSample *pSample) -{ - LONG processed; - return OutputQueue_ReceiveMultiple(pOutputQueue,&pSample,1,&processed); -} - -VOID WINAPI OutputQueue_SendAnyway(OutputQueue *pOutputQueue) -{ - if (pOutputQueue->hThread) - { - EnterCriticalSection(&pOutputQueue->csQueue); - if (!list_empty(&pOutputQueue->SampleList)) - { - pOutputQueue->bSendAnyway = TRUE; - SetEvent(pOutputQueue->hProcessQueue); - } - LeaveCriticalSection(&pOutputQueue->csQueue); - } -} - -VOID WINAPI OutputQueue_EOS(OutputQueue *pOutputQueue) -{ - IPin *peer; - - EnterCriticalSection(&pOutputQueue->csQueue); - if (pOutputQueue->hThread) - { - QueuedEvent *qev = HeapAlloc(GetProcessHeap(),0,sizeof(QueuedEvent)); - if (!qev) - { - ERR("Out of Memory\n"); - LeaveCriticalSection(&pOutputQueue->csQueue); - return; - } - qev->type = EOS_PACKET; - qev->pSample = NULL; - list_add_tail(&pOutputQueue->SampleList, &qev->entry); - } - else if ((peer = pOutputQueue->pInputPin->pin.peer)) - IPin_EndOfStream(peer); - LeaveCriticalSection(&pOutputQueue->csQueue); - /* Covers sending the Event to the worker Thread */ - OutputQueue_SendAnyway(pOutputQueue); -} - -DWORD WINAPI OutputQueueImpl_ThreadProc(OutputQueue *pOutputQueue) -{ - do - { - EnterCriticalSection(&pOutputQueue->csQueue); - if (!list_empty(&pOutputQueue->SampleList) && - (!pOutputQueue->bBatchExact || - list_count(&pOutputQueue->SampleList) >= pOutputQueue->lBatchSize || - pOutputQueue->bSendAnyway - ) - ) - { - while (!list_empty(&pOutputQueue->SampleList)) - { - IMediaSample **ppSamples; - LONG nSamples; - LONG nSamplesProcessed; - struct list *cursor, *cursor2; - int i = 0; - - /* First Pass Process Samples */ - i = list_count(&pOutputQueue->SampleList); - ppSamples = HeapAlloc(GetProcessHeap(),0,sizeof(IMediaSample*) * i); - nSamples = 0; - LIST_FOR_EACH_SAFE(cursor, cursor2, &pOutputQueue->SampleList) - { - QueuedEvent *qev = LIST_ENTRY(cursor, QueuedEvent, entry); - if (qev->type == SAMPLE_PACKET) - ppSamples[nSamples++] = qev->pSample; - else - break; - list_remove(cursor); - HeapFree(GetProcessHeap(),0,qev); - } - - if (pOutputQueue->pInputPin->pin.peer && pOutputQueue->pInputPin->pMemInputPin) - { - IMemInputPin_AddRef(pOutputQueue->pInputPin->pMemInputPin); - LeaveCriticalSection(&pOutputQueue->csQueue); - IMemInputPin_ReceiveMultiple(pOutputQueue->pInputPin->pMemInputPin, ppSamples, nSamples, &nSamplesProcessed); - EnterCriticalSection(&pOutputQueue->csQueue); - IMemInputPin_Release(pOutputQueue->pInputPin->pMemInputPin); - } - for (i = 0; i < nSamples; i++) - IMediaSample_Release(ppSamples[i]); - HeapFree(GetProcessHeap(),0,ppSamples); - - /* Process Non-Samples */ - LIST_FOR_EACH_SAFE(cursor, cursor2, &pOutputQueue->SampleList) - { - QueuedEvent *qev = LIST_ENTRY(cursor, QueuedEvent, entry); - if (qev->type == EOS_PACKET) - { - IPin *peer; - if ((peer = pOutputQueue->pInputPin->pin.peer)) - IPin_EndOfStream(peer); - } - else if (qev->type == SAMPLE_PACKET) - break; - else - FIXME("Unhandled Event type %i\n",qev->type); - list_remove(cursor); - HeapFree(GetProcessHeap(),0,qev); - } - } - pOutputQueue->bSendAnyway = FALSE; - } - LeaveCriticalSection(&pOutputQueue->csQueue); - WaitForSingleObject(pOutputQueue->hProcessQueue, INFINITE); - } - while (!pOutputQueue->bTerminate); - return S_OK; -} -- 2.32.0

1 1

[PATCH v10 1/5] mshtml: Stringify attribute values in setAttribute using string hints in IE10+.
by Gabriel Ivăncescu Nov. 30, 2021

Nov. 30, 2021

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/dispex.c | 2 +- dlls/mshtml/htmlelem.c | 36 ++++++++++++++++++++++++++++++- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/documentmode.js | 1 - 4 files changed, 37 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 4605fda..9f56a56 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -1043,7 +1043,7 @@ static HRESULT get_builtin_id(DispatchEx *This, BSTR name, DWORD grfdex, DISPID return DISP_E_UNKNOWNNAME; } -static HRESULT change_type(VARIANT *dst, VARIANT *src, VARTYPE vt, IServiceProvider *caller) +HRESULT change_type(VARIANT *dst, VARIANT *src, VARTYPE vt, IServiceProvider *caller) { V_VT(dst) = VT_EMPTY; diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index d54f729..3f7c60b 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -6585,8 +6585,42 @@ static IHTMLEventObj *HTMLElement_set_current_event(DispatchEx *dispex, IHTMLEve return default_set_current_event(This->node.doc->window, event); } +static HRESULT IHTMLElement6_setAttribute_hook(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller) +{ + VARIANT args[2]; + HRESULT hres; + DISPPARAMS new_dp = { args, NULL, 2, 0 }; + + if(!(flags & DISPATCH_METHOD) || dp->cArgs < 2 || dp->cNamedArgs) + return S_FALSE; + + switch(V_VT(&dp->rgvarg[dp->cArgs - 2])) { + case VT_EMPTY: + case VT_BSTR: + case VT_NULL: + return S_FALSE; + default: + break; + } + + hres = change_type(&args[0], &dp->rgvarg[dp->cArgs - 2], VT_BSTR, caller); + if(FAILED(hres)) + return hres; + args[1] = dp->rgvarg[dp->cArgs - 1]; + + hres = IDispatchEx_InvokeEx(&dispex->IDispatchEx_iface, DISPID_IHTMLELEMENT6_IE9_SETATTRIBUTE, + lcid, flags, &new_dp, res, ei, caller); + VariantClear(&args[0]); + return hres; +} + void HTMLElement_init_dispex_info(dispex_data_t *info, compat_mode_t mode) { + static const dispex_hook_t elem6_ie10_hooks[] = { + {DISPID_IHTMLELEMENT6_IE9_SETATTRIBUTE, IHTMLElement6_setAttribute_hook}, + {DISPID_UNKNOWN} + }; static const dispex_hook_t elem2_ie11_hooks[] = { {DISPID_IHTMLELEMENT2_DOSCROLL, NULL}, {DISPID_IHTMLELEMENT2_READYSTATE, NULL}, @@ -6601,7 +6635,7 @@ void HTMLElement_init_dispex_info(dispex_data_t *info, compat_mode_t mode) dispex_info_add_interface(info, IElementSelector_tid, NULL); if(mode >= COMPAT_MODE_IE9) { - dispex_info_add_interface(info, IHTMLElement6_tid, NULL); + dispex_info_add_interface(info, IHTMLElement6_tid, mode >= COMPAT_MODE_IE10 ? elem6_ie10_hooks : NULL); dispex_info_add_interface(info, IElementTraversal_tid, NULL); } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 5cf53bb..6978ed7 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -384,6 +384,7 @@ extern void (__cdecl *note_cc_edge)(nsISupports*,const char*,nsCycleCollectionTr void init_dispatch(DispatchEx*,IUnknown*,dispex_static_data_t*,compat_mode_t) DECLSPEC_HIDDEN; void release_dispex(DispatchEx*) DECLSPEC_HIDDEN; BOOL dispex_query_interface(DispatchEx*,REFIID,void**) DECLSPEC_HIDDEN; +HRESULT change_type(VARIANT*,VARIANT*,VARTYPE,IServiceProvider*) DECLSPEC_HIDDEN; HRESULT dispex_get_dprop_ref(DispatchEx*,const WCHAR*,BOOL,VARIANT**) DECLSPEC_HIDDEN; HRESULT get_dispids(tid_t,DWORD*,DISPID**) DECLSPEC_HIDDEN; HRESULT remove_attribute(DispatchEx*,DISPID,VARIANT_BOOL*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 08fcde4..c2fd8bd 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -1136,7 +1136,6 @@ sync_test("elem_attr", function() { ok(r === (v < 8 ? arr : (v < 9 ? "arrval" : null)), "testattr with custom valueOf = " + r); elem.setAttribute("testattr", arr); r = elem.getAttribute("testattr"); - todo_wine_if(v >= 10). ok(r === (v < 8 ? arr : (v < 10 ? "arrval" : "42")), "testattr after setAttribute with custom valueOf = " + r); ok(elem.testattr === arr, "elem.testattr after setAttribute with custom valueOf = " + elem.testattr); r = elem.removeAttribute("testattr"); -- 2.31.1

3 11

[PATCH v2] ws2_32: hardcode optlen to 4 for setsockopt in the TCP_NODELAY case
by Bastien Orivel Nov. 29, 2021

Nov. 29, 2021

According to MSDN [1], `TCP_NODELAY` parameter should be of type `BOOL` which is 4 bytes. Due to a bug [2] in rustc passing a byte instead of an int, any program written in rust that tries to set that option on a socket will fail with a "Invalid parameter supplied" error. Turns out that setsockopt on linux does not want optlen to be less than 4 bytes [3]. Since any value seems to be working on windows (tried with 1, 4, 8, 42, 1337), I hardcoded the length to be 4 on the wine side. This will fix any rust program using the hyper library to do HTTP requests. [1]: https://docs.microsoft.com/en-us/windows/win32/winsock/ipproto-tcp-socket-o… [2]: https://github.com/rust-lang/rust/blob/44593aeb1387b1be355aeaf0040d5927bd80… [3]: https://github.com/torvalds/linux/blob/d58071a8a76d779eedab38033ae4c821c302… Signed-off-by: Bastien Orivel <eijebong(a)bananium.fr> --- dlls/ws2_32/socket.c | 3 ++- dlls/ws2_32/tests/sock.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 2db441bee3c..b74276b5239 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2868,7 +2868,8 @@ int WINAPI setsockopt( SOCKET s, int level, int optname, const char *optval, int switch(optname) { case TCP_NODELAY: - return server_setsockopt( s, IOCTL_AFD_WINE_SET_TCP_NODELAY, optval, optlen ); + INT nodelay = *optval; + return server_setsockopt( s, IOCTL_AFD_WINE_SET_TCP_NODELAY, (char*)&nodelay, sizeof(nodelay) ); default: FIXME("Unknown IPPROTO_TCP optname 0x%08x\n", optname); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 02713a7c625..87ced97c314 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1259,6 +1259,41 @@ static void test_set_getsockopt(void) ok(err == SOCKET_ERROR && WSAGetLastError() == WSAEFAULT, "got %d with %d (expected SOCKET_ERROR with WSAEFAULT)\n", err, WSAGetLastError()); + /* TCP_NODELAY: optlen doesn't matter on windows, it should work with any value */ + size = sizeof(value); + value = 1; + + err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, 1); + ok (!err, "setsockopt TCP_NODELAY failed with optlen == 1\n"); + err = getsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, &size); + ok(!err, "getsockopt TCP_NODELAY failed\n"); + ok(value == 1, "TCP_NODELAY should be 1\n"); + + err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, 4); + ok (!err, "setsockopt TCP_NODELAY failed with optlen == 4\n"); + err = getsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, &size); + ok(!err, "getsockopt TCP_NODELAY failed\n"); + ok(value == 1, "TCP_NODELAY should be 1\n"); + + err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, 42); + ok (!err, "setsockopt TCP_NODELAY failed with optlen == 42\n"); + err = getsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, &size); + ok(!err, "getsockopt TCP_NODELAY failed\n"); + ok(value == 1, "TCP_NODELAY should be 1\n"); + + err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, -1); + ok (!err, "setsockopt TCP_NODELAY failed with optlen == -1\n"); + err = getsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, &size); + ok(!err, "getsockopt TCP_NODELAY failed\n"); + ok(value == 1, "TCP_NODELAY should be 1\n"); + + value = 0x100; + err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, 4); + ok (!err, "setsockopt TCP_NODELAY failed with optlen == 4 and optvalue = 0x100\n"); + err = getsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, &size); + ok(!err, "getsockopt TCP_NODELAY failed\n"); + ok(!value, "TCP_NODELAY should be 0\n"); + /* Test for erroneously passing a value instead of a pointer as optval */ size = sizeof(char); err = setsockopt(s, SOL_SOCKET, SO_DONTROUTE, (char *)1, size); -- 2.34.0

2 1

[PATCH] ws2_32: hardcode optlen to 4 for setsockopt in the TCP_NODELAY case
by Bastien Orivel Nov. 29, 2021

Nov. 29, 2021

According to MSDN [1], `TCP_NODELAY` parameter should be of type `BOOL` which is 4 bytes. Due to a bug [2] in rustc passing a byte instead of an int, any program written in rust that tries to set that option on a socket will fail with a "Invalid parameter supplied" error. Turns out that setsockopt on linux does not want optlen to be less than 4 bytes [3]. Since any value seems to be working on windows (tried with 1, 4, 8, 42, 1337), I hardcoded the length to be 4 on the wine side. This will fix any rust program using the hyper library to do HTTP requests. [1]: https://docs.microsoft.com/en-us/windows/win32/winsock/ipproto-tcp-socket-o… [2]: https://github.com/rust-lang/rust/blob/44593aeb1387b1be355aeaf0040d5927bd80… [3]: https://github.com/torvalds/linux/blob/d58071a8a76d779eedab38033ae4c821c302… Signed-off-by: Bastien Orivel <eijebong(a)bananium.fr> --- dlls/ws2_32/socket.c | 2 +- dlls/ws2_32/tests/sock.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 2db441bee3c..1ea83844f36 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2868,7 +2868,7 @@ int WINAPI setsockopt( SOCKET s, int level, int optname, const char *optval, int switch(optname) { case TCP_NODELAY: - return server_setsockopt( s, IOCTL_AFD_WINE_SET_TCP_NODELAY, optval, optlen ); + return server_setsockopt( s, IOCTL_AFD_WINE_SET_TCP_NODELAY, optval, 4 ); default: FIXME("Unknown IPPROTO_TCP optname 0x%08x\n", optname); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 02713a7c625..6b2842383de 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1259,6 +1259,15 @@ static void test_set_getsockopt(void) ok(err == SOCKET_ERROR && WSAGetLastError() == WSAEFAULT, "got %d with %d (expected SOCKET_ERROR with WSAEFAULT)\n", err, WSAGetLastError()); + /* TCP_NODELAY: optlen doesn't matter on windows, it should work with any value */ + value = 1; + err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, 1); + ok (!err, "setsockopt TCP_NODELAY failed with optlen == 1\n"); + err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, 4); + ok (!err, "setsockopt TCP_NODELAY failed with optlen == 4\n"); + err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, 42); + ok (!err, "setsockopt TCP_NODELAY failed with optlen == 42\n"); + /* Test for erroneously passing a value instead of a pointer as optval */ size = sizeof(char); err = setsockopt(s, SOL_SOCKET, SO_DONTROUTE, (char *)1, size); -- 2.34.0

2 3

[PATCH 1/9] include: Add struct timespec.
by Zebediah Figura Nov. 29, 2021

Nov. 29, 2021

Windows does not use _TIMESPEC_DEFINED, but it also doesn't use other similar macros which we use (e.g. _CLOCK_T_DEFINED), and we will need it to bundle winpthreads. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- include/msvcrt/time.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/include/msvcrt/time.h b/include/msvcrt/time.h index c0db38ff7a3..eb282113c86 100644 --- a/include/msvcrt/time.h +++ b/include/msvcrt/time.h @@ -29,6 +29,17 @@ typedef __msvcrt_long clock_t; #define _CLOCK_T_DEFINED #endif +#ifndef _CRT_NO_TIME_T +#ifndef _TIMESPEC_DEFINED +#define _TIMESPEC_DEFINED +struct timespec +{ + time_t tv_sec; + __msvcrt_long tv_nsec; +}; +#endif +#endif + #ifndef CLOCKS_PER_SEC #define CLOCKS_PER_SEC 1000 #endif -- 2.34.0

5 16

[PATCH] quartz: Allow time format change while running
by Andrew Eikum Nov. 29, 2021

Nov. 29, 2021

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/quartz/filtergraph.c | 3 --- dlls/quartz/tests/filtergraph.c | 6 ++++++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 47b9da9510b..4351eaaffef 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -2213,9 +2213,6 @@ static HRESULT WINAPI MediaSeeking_SetTimeFormat(IMediaSeeking *iface, const GUI TRACE("(%p/%p)->(%s)\n", This, iface, debugstr_guid(pFormat)); - if (This->state != State_Stopped) - return VFW_E_WRONG_STATE; - if (!IsEqualGUID(&TIME_FORMAT_MEDIA_TIME, pFormat)) { FIXME("Unhandled time format %s\n", debugstr_guid(pFormat)); diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index fef7b972fac..a83bfde0806 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -4930,6 +4930,12 @@ static void test_graph_seeking(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ok(time == 6000 * 10000, "Got time %s.\n", wine_dbgstr_longlong(time)); + hr = IMediaSeeking_SetTimeFormat(seeking, &TIME_FORMAT_MEDIA_TIME); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaSeeking_SetTimeFormat(seeking, &TIME_FORMAT_NONE); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaControl_Stop(control); ok(hr == S_OK, "Got hr %#x.\n", hr); -- 2.34.0

3 3

[PATCH v9 1/5] jscript: Stringify attribute values in setAttribute using string hints in IE10+.
by Gabriel Ivăncescu Nov. 29, 2021

Nov. 29, 2021

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/dispex.c | 2 +- dlls/mshtml/htmlelem.c | 36 ++++++++++++++++++++++++++++++- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/documentmode.js | 1 - 4 files changed, 37 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 4605fda..9f56a56 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -1043,7 +1043,7 @@ static HRESULT get_builtin_id(DispatchEx *This, BSTR name, DWORD grfdex, DISPID return DISP_E_UNKNOWNNAME; } -static HRESULT change_type(VARIANT *dst, VARIANT *src, VARTYPE vt, IServiceProvider *caller) +HRESULT change_type(VARIANT *dst, VARIANT *src, VARTYPE vt, IServiceProvider *caller) { V_VT(dst) = VT_EMPTY; diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index d54f729..3f7c60b 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -6585,8 +6585,42 @@ static IHTMLEventObj *HTMLElement_set_current_event(DispatchEx *dispex, IHTMLEve return default_set_current_event(This->node.doc->window, event); } +static HRESULT IHTMLElement6_setAttribute_hook(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller) +{ + VARIANT args[2]; + HRESULT hres; + DISPPARAMS new_dp = { args, NULL, 2, 0 }; + + if(!(flags & DISPATCH_METHOD) || dp->cArgs < 2 || dp->cNamedArgs) + return S_FALSE; + + switch(V_VT(&dp->rgvarg[dp->cArgs - 2])) { + case VT_EMPTY: + case VT_BSTR: + case VT_NULL: + return S_FALSE; + default: + break; + } + + hres = change_type(&args[0], &dp->rgvarg[dp->cArgs - 2], VT_BSTR, caller); + if(FAILED(hres)) + return hres; + args[1] = dp->rgvarg[dp->cArgs - 1]; + + hres = IDispatchEx_InvokeEx(&dispex->IDispatchEx_iface, DISPID_IHTMLELEMENT6_IE9_SETATTRIBUTE, + lcid, flags, &new_dp, res, ei, caller); + VariantClear(&args[0]); + return hres; +} + void HTMLElement_init_dispex_info(dispex_data_t *info, compat_mode_t mode) { + static const dispex_hook_t elem6_ie10_hooks[] = { + {DISPID_IHTMLELEMENT6_IE9_SETATTRIBUTE, IHTMLElement6_setAttribute_hook}, + {DISPID_UNKNOWN} + }; static const dispex_hook_t elem2_ie11_hooks[] = { {DISPID_IHTMLELEMENT2_DOSCROLL, NULL}, {DISPID_IHTMLELEMENT2_READYSTATE, NULL}, @@ -6601,7 +6635,7 @@ void HTMLElement_init_dispex_info(dispex_data_t *info, compat_mode_t mode) dispex_info_add_interface(info, IElementSelector_tid, NULL); if(mode >= COMPAT_MODE_IE9) { - dispex_info_add_interface(info, IHTMLElement6_tid, NULL); + dispex_info_add_interface(info, IHTMLElement6_tid, mode >= COMPAT_MODE_IE10 ? elem6_ie10_hooks : NULL); dispex_info_add_interface(info, IElementTraversal_tid, NULL); } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 5cf53bb..6978ed7 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -384,6 +384,7 @@ extern void (__cdecl *note_cc_edge)(nsISupports*,const char*,nsCycleCollectionTr void init_dispatch(DispatchEx*,IUnknown*,dispex_static_data_t*,compat_mode_t) DECLSPEC_HIDDEN; void release_dispex(DispatchEx*) DECLSPEC_HIDDEN; BOOL dispex_query_interface(DispatchEx*,REFIID,void**) DECLSPEC_HIDDEN; +HRESULT change_type(VARIANT*,VARIANT*,VARTYPE,IServiceProvider*) DECLSPEC_HIDDEN; HRESULT dispex_get_dprop_ref(DispatchEx*,const WCHAR*,BOOL,VARIANT**) DECLSPEC_HIDDEN; HRESULT get_dispids(tid_t,DWORD*,DISPID**) DECLSPEC_HIDDEN; HRESULT remove_attribute(DispatchEx*,DISPID,VARIANT_BOOL*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 08fcde4..c2fd8bd 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -1136,7 +1136,6 @@ sync_test("elem_attr", function() { ok(r === (v < 8 ? arr : (v < 9 ? "arrval" : null)), "testattr with custom valueOf = " + r); elem.setAttribute("testattr", arr); r = elem.getAttribute("testattr"); - todo_wine_if(v >= 10). ok(r === (v < 8 ? arr : (v < 10 ? "arrval" : "42")), "testattr after setAttribute with custom valueOf = " + r); ok(elem.testattr === arr, "elem.testattr after setAttribute with custom valueOf = " + elem.testattr); r = elem.removeAttribute("testattr"); -- 2.31.1

2 10

[PATCH v2 1/2] gdiplus: Introduce dst palette parameter to convert_pixels().
by Bernhard Kölbl Nov. 29, 2021

Nov. 29, 2021

Make it possible to define a destination colour palette when using convert_pixels(), so converting a bitmap from a non indexed format to an indexed format does not produce an empty image. --- This happens if you e.g. clone an RGB bitmap area to indexed. Most times the cloned image is just a plain black or white image. v2: Use correct palette param in GdipBitmapUnlockBits. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- dlls/gdiplus/gdiplus_private.h | 4 ++-- dlls/gdiplus/graphics.c | 2 +- dlls/gdiplus/image.c | 22 ++++++++++++---------- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 22213e9f278..7ae8cc564c9 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -207,8 +207,8 @@ extern void convert_32bppARGB_to_32bppPARGB(UINT width, UINT height, BYTE *dst_bits, INT dst_stride, const BYTE *src_bits, INT src_stride) DECLSPEC_HIDDEN; extern GpStatus convert_pixels(INT width, INT height, - INT dst_stride, BYTE *dst_bits, PixelFormat dst_format, - INT src_stride, const BYTE *src_bits, PixelFormat src_format, ColorPalette *palette) DECLSPEC_HIDDEN; + INT dst_stride, BYTE *dst_bits, PixelFormat dst_format, ColorPalette *dst_palette, + INT src_stride, const BYTE *src_bits, PixelFormat src_format, ColorPalette *src_palette) DECLSPEC_HIDDEN; extern PixelFormat apply_image_attributes(const GpImageAttributes *attributes, LPBYTE data, UINT width, UINT height, INT stride, ColorAdjustType type, PixelFormat fmt) DECLSPEC_HIDDEN; diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 4a428c49869..65cdf96510d 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3350,7 +3350,7 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image dst_format = PixelFormat32bppRGB; convert_pixels(bitmap->width, bitmap->height, - bitmap->width*4, temp_bits, dst_format, + bitmap->width*4, temp_bits, dst_format, bitmap->image.palette, bitmap->stride, bitmap->bits, bitmap->format, bitmap->image.palette); } diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 862f7fea111..0abb6aef72f 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -590,9 +590,10 @@ GpStatus WINGDIPAPI GdipBitmapSetPixel(GpBitmap* bitmap, INT x, INT y, } GpStatus convert_pixels(INT width, INT height, - INT dst_stride, BYTE *dst_bits, PixelFormat dst_format, + INT dst_stride, BYTE *dst_bits, PixelFormat dst_format, + ColorPalette *dst_palette, INT src_stride, const BYTE *src_bits, PixelFormat src_format, - ColorPalette *palette) + ColorPalette *src_palette) { INT x, y; @@ -612,7 +613,7 @@ GpStatus convert_pixels(INT width, INT height, ARGB argb; \ BYTE *color = (BYTE *)&argb; \ getpixel_function(&index, src_bits+src_stride*y, x); \ - argb = (palette && index < palette->Count) ? palette->Entries[index] : 0; \ + argb = (src_palette && index < src_palette->Count) ? src_palette->Entries[index] : 0; \ setpixel_function(color[2], color[1], color[0], color[3], dst_bits+dst_stride*y, x); \ } \ return Ok; \ @@ -633,7 +634,7 @@ GpStatus convert_pixels(INT width, INT height, for (x=0; x<width; x++) { \ BYTE r, g, b, a; \ getpixel_function(&r, &g, &b, &a, src_bits+src_stride*y, x); \ - setpixel_function(r, g, b, a, dst_bits+dst_stride*y, x, palette); \ + setpixel_function(r, g, b, a, dst_bits+dst_stride*y, x, dst_palette); \ } \ return Ok; \ } while (0); @@ -1137,7 +1138,7 @@ GpStatus WINGDIPAPI GdipBitmapLockBits(GpBitmap* bitmap, GDIPCONST GpRect* rect, /* Make sure we can convert to the requested format. */ if (flags & ImageLockModeRead) { - stat = convert_pixels(0, 0, 0, NULL, format, 0, NULL, bitmap->format, NULL); + stat = convert_pixels(0, 0, 0, NULL, format, NULL, 0, NULL, bitmap->format, NULL); if (stat == NotImplemented) { FIXME("cannot read bitmap from %x to %x\n", bitmap->format, format); @@ -1150,7 +1151,7 @@ GpStatus WINGDIPAPI GdipBitmapLockBits(GpBitmap* bitmap, GDIPCONST GpRect* rect, * the original format. */ if (flags & ImageLockModeWrite) { - stat = convert_pixels(0, 0, 0, NULL, bitmap->format, 0, NULL, format, NULL); + stat = convert_pixels(0, 0, 0, NULL, bitmap->format, NULL, 0, NULL, format, NULL); if (stat == NotImplemented) { FIXME("cannot write bitmap from %x to %x\n", format, bitmap->format); @@ -1190,7 +1191,7 @@ GpStatus WINGDIPAPI GdipBitmapLockBits(GpBitmap* bitmap, GDIPCONST GpRect* rect, } stat = convert_pixels(act_rect.Width, act_rect.Height, - lockeddata->Stride, lockeddata->Scan0, format, + lockeddata->Stride, lockeddata->Scan0, format, bitmap->image.palette, bitmap->stride, bitmap->bits + bitmap->stride * act_rect.Y + PIXELFORMATBPP(bitmap->format) * act_rect.X / 8, bitmap->format, bitmap->image.palette); @@ -1267,10 +1268,11 @@ GpStatus WINGDIPAPI GdipBitmapUnlockBits(GpBitmap* bitmap, fixme = TRUE; } + /* FIXME: Pass src_palette generated from lockeddata->PixelFormat. */ stat = convert_pixels(lockeddata->Width, lockeddata->Height, bitmap->stride, bitmap->bits + bitmap->stride * bitmap->locky + PIXELFORMATBPP(bitmap->format) * bitmap->lockx / 8, - bitmap->format, + bitmap->format, bitmap->image.palette, lockeddata->Stride, lockeddata->Scan0, lockeddata->PixelFormat, NULL); if (stat != Ok) @@ -1314,7 +1316,7 @@ GpStatus WINGDIPAPI GdipCloneBitmapArea(REAL x, REAL y, REAL width, REAL height, if (stat == Ok) { stat = convert_pixels(area.Width, area.Height, (*dstBitmap)->stride, (*dstBitmap)->bits, (*dstBitmap)->format, - srcBitmap->stride, + (*dstBitmap)->image.palette, srcBitmap->stride, srcBitmap->bits + srcBitmap->stride * area.Y + PIXELFORMATBPP(srcBitmap->format) * area.X / 8, srcBitmap->format, srcBitmap->image.palette); @@ -1545,7 +1547,7 @@ GpStatus WINGDIPAPI GdipCreateHBITMAPFromBitmap(GpBitmap* bitmap, } stat = convert_pixels(width, height, -width*4, - bits + (width * 4 * (height - 1)), PixelFormat32bppPARGB, + bits + (width * 4 * (height - 1)), PixelFormat32bppPARGB, bitmap->image.palette, bitmap->stride, bitmap->bits, bitmap->format, bitmap->image.palette); if (stat != Ok) { -- 2.34.0

2 3

[PATCH vkd3d 1/4] vkd3d-shader/hlsl: Add support for sm4 instruction modifiers.
by Francisco Casas Nov. 29, 2021

Nov. 29, 2021

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- include/private/vkd3d_common.h | 24 +++++++++++++++ libs/vkd3d-shader/hlsl_sm4.c | 55 ++++++++++++++++++++++++++++++++++ 2 files changed, 79 insertions(+) diff --git a/include/private/vkd3d_common.h b/include/private/vkd3d_common.h index b7ce9ae4..2724a370 100644 --- a/include/private/vkd3d_common.h +++ b/include/private/vkd3d_common.h @@ -238,4 +238,28 @@ static inline void vkd3d_parse_version(const char *version, int *major, int *min HRESULT hresult_from_vkd3d_result(int vkd3d_result); + +/* Encode a signed integer using two's complement representation in the given number of bits. + * Assumes that the machine uses two's complement too. + * *out_overflow is set to 1 in case the signed integer is out of the range of representable values. + */ +static inline uint32_t encode_int(int32_t v, uint32_t n_bits, int *out_overflow) +{ + uint32_t mask, umask; + uint32_t enc = (uint32_t) v; + + *out_overflow = 0; + + if (n_bits < 32) + { + umask = (1 << (n_bits - 1)) - 1; + *out_overflow = (v >= 0)? !!(enc & ~umask) : !!(~enc & ~umask); + + mask = (1 << n_bits) - 1; + enc = enc & mask; + } + return enc; +} + + #endif /* __VKD3D_COMMON_H */ diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index c0c26f80..9c500f8e 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -727,6 +727,47 @@ static enum vkd3d_sm4_resource_type sm4_resource_dimension(const struct hlsl_typ } } +struct sm4_instruction_modifier +{ + enum vkd3d_sm4_instruction_modifier type; + + union + { + struct + { + int u,v,w; + } aoffimmi; + }; +}; + +static uint32_t sm4_encode_instruction_modifier(struct sm4_instruction_modifier imod) +{ + int overflow_u, overflow_v, overflow_w; + uint32_t word = 0; + + word |= VKD3D_SM4_MODIFIER_MASK & imod.type; + + switch (imod.type) + { + case VKD3D_SM4_MODIFIER_AOFFIMMI: + word |= encode_int(imod.aoffimmi.u, 4, &overflow_u) << VKD3D_SM4_AOFFIMMI_U_SHIFT; + word |= encode_int(imod.aoffimmi.v, 4, &overflow_v) << VKD3D_SM4_AOFFIMMI_V_SHIFT; + word |= encode_int(imod.aoffimmi.w, 4, &overflow_w) << VKD3D_SM4_AOFFIMMI_W_SHIFT; + if (overflow_u || overflow_v || overflow_w) + WARN("aoffimmi (%d,%d,%d) out of representable range -8 to 7.\n", + imod.aoffimmi.u, imod.aoffimmi.v, imod.aoffimmi.w); + break; + + default: + FIXME("Unhandled instruction modifier %#x.\n", imod.type); + return 0; + break; + } + + return word; +} + + struct sm4_register { enum vkd3d_sm4_register_type type; @@ -741,6 +782,9 @@ struct sm4_instruction { enum vkd3d_sm4_opcode opcode; + struct sm4_instruction_modifier modifiers[4]; + unsigned int modifier_count; + struct { struct sm4_register reg; @@ -901,6 +945,7 @@ static void write_sm4_instruction(struct vkd3d_bytecode_buffer *buffer, const st uint32_t token = instr->opcode; unsigned int size = 1, i, j; + size += instr->modifier_count; for (i = 0; i < instr->dst_count; ++i) size += sm4_register_order(&instr->dsts[i].reg); for (i = 0; i < instr->src_count; ++i) @@ -908,8 +953,18 @@ static void write_sm4_instruction(struct vkd3d_bytecode_buffer *buffer, const st size += instr->idx_count; token |= (size << VKD3D_SM4_INSTRUCTION_LENGTH_SHIFT); + + token |= ((0 < instr->modifier_count) << 31); + put_u32(buffer, token); + for (i = 0; i < instr->modifier_count; i++) + { + token = sm4_encode_instruction_modifier(instr->modifiers[i]); + token |= ((i + 1 < instr->modifier_count) << 31); + put_u32(buffer, token); + } + for (i = 0; i < instr->dst_count; ++i) { token = sm4_encode_register(&instr->dsts[i].reg); -- 2.25.1

3 3