November 2021 - Wine-Devel - list.winehq.org

[PATCH 3/4] uxtheme: Protect CloseThemeData() from invalid input.

by Zhiyi Zhang

From: Dmitry Timoshkov <dmitry(a)baikal.ru> With test case by Michael Müller <michael(a)fds-team.de>. Some applications closes the same HTHEME more than once, causing use-after-free. HTHEME is a handle rather than a pointer. Some testing shows that it's a handle starting from 0x10000 or 0x20000. Each new handle increments from the first handle and closing handles decrements it. I prefer not to implement this handle to data map for now because it will likely hurt performance. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=29974 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/msstyles.c | 22 ++++++++++++++++++++++ dlls/uxtheme/msstyles.h | 1 + dlls/uxtheme/tests/system.c | 2 ++ 3 files changed, 25 insertions(+) diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c index c0f626d54aa..d834c9604b9 100644 --- a/dlls/uxtheme/msstyles.c +++ b/dlls/uxtheme/msstyles.c @@ -32,6 +32,7 @@ #include "msstyles.h" +#include "wine/exception.h" #include "wine/debug.h" #include "wine/heap.h" @@ -48,6 +49,8 @@ static HRESULT MSSTYLES_GetFont (LPCWSTR lpStringStart, LPCWSTR lpStringEnd, LPC #define MSSTYLES_VERSION 0x0003 +#define THEME_CLASS_SIGNATURE 0x12bc6d83 + static PTHEME_FILE tfActiveTheme; /***********************************************************************/ @@ -203,6 +206,7 @@ void MSSTYLES_CloseThemeFile(PTHEME_FILE tf) pcls->partstate = ps->next; heap_free(ps); } + pcls->signature = 0; heap_free(pcls); } } @@ -441,6 +445,7 @@ static PTHEME_CLASS MSSTYLES_AddClass(PTHEME_FILE tf, LPCWSTR pszAppName, LPCWST if(cur) return cur; cur = heap_alloc(sizeof(*cur)); + cur->signature = THEME_CLASS_SIGNATURE; cur->hTheme = tf->hTheme; lstrcpyW(cur->szAppName, pszAppName); lstrcpyW(cur->szClassName, pszClassName); @@ -1044,6 +1049,23 @@ PTHEME_CLASS MSSTYLES_OpenThemeClass(LPCWSTR pszAppName, LPCWSTR pszClassList, U */ HRESULT MSSTYLES_CloseThemeClass(PTHEME_CLASS tc) { + __TRY + { + if (tc->signature != THEME_CLASS_SIGNATURE) + tc = NULL; + } + __EXCEPT_PAGE_FAULT + { + tc = NULL; + } + __ENDTRY + + if (!tc) + { + WARN("Invalid theme class handle\n"); + return E_HANDLE; + } + MSSTYLES_CloseThemeFile (tc->tf); return S_OK; } diff --git a/dlls/uxtheme/msstyles.h b/dlls/uxtheme/msstyles.h index 12292cefae4..89937227ee2 100644 --- a/dlls/uxtheme/msstyles.h +++ b/dlls/uxtheme/msstyles.h @@ -49,6 +49,7 @@ typedef struct _THEME_PARTSTATE { struct _THEME_FILE; typedef struct _THEME_CLASS { + DWORD signature; HMODULE hTheme; struct _THEME_FILE* tf; WCHAR szAppName[MAX_THEME_APP_NAME]; diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 10857115061..ebf66f6b5af 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -768,6 +768,8 @@ static void test_CloseThemeData(void) ok( hRes == E_HANDLE, "Expected E_HANDLE, got 0x%08x\n", hRes); hRes = CloseThemeData(INVALID_HANDLE_VALUE); ok( hRes == E_HANDLE, "Expected E_HANDLE, got 0x%08x\n", hRes); + hRes = CloseThemeData((HTHEME)0xdeadbeef); + ok(hRes == E_HANDLE, "Expected E_HANDLE, got 0x%08x\n", hRes); } static void test_buffer_dc_props(HDC hdc, const RECT *rect) -- 2.32.0

Nov. 30, 2021

[PATCH 2/4] uxtheme: Call DefDlgProc() if drawing tab body in a dialog fails.

by Zhiyi Zhang

Some third party themes have tab body part defined but with its ImageSelectType set to IST_NONE. In this case, DrawThemeBackground() will fail to draw the background. Fix track bar black background in winecfg when using VLT theme. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/dialog.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/uxtheme/dialog.c b/dlls/uxtheme/dialog.c index a949bfc6579..d0055e013a0 100644 --- a/dlls/uxtheme/dialog.c +++ b/dlls/uxtheme/dialog.c @@ -38,8 +38,9 @@ LRESULT WINAPI UXTHEME_DefDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPa static const WCHAR themeClass[] = L"Window"; BOOL themingActive = IsThemeDialogTextureEnabled (hWnd); BOOL doTheming = themingActive && (theme != NULL); + HRESULT hr = E_FAIL; LRESULT result; - + switch (msg) { case WM_CREATE: @@ -78,13 +79,11 @@ LRESULT WINAPI UXTHEME_DefDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPa NULL); #endif return user_api.pDefDlgProc(hWnd, msg, wParam, lParam, unicode); - else - /* We might have gotten a TAB theme class, so check if we can - * draw as a tab page. */ - if (IsThemePartDefined (theme, TABP_BODY, 0)) - DrawThemeBackground (theme, (HDC)wParam, TABP_BODY, 0, &rc, - NULL); - else + /* We might have gotten a TAB theme class, so check if we can draw as a tab page */ + else if (IsThemePartDefined(theme, TABP_BODY, 0)) + hr = DrawThemeBackground(theme, (HDC)wParam, TABP_BODY, 0, &rc, NULL); + + if (FAILED(hr)) return user_api.pDefDlgProc(hWnd, msg, wParam, lParam, unicode); } return 1; -- 2.32.0

Nov. 30, 2021

[PATCH 1/4] uxtheme: Use StretchBlt() when resizing a source image for tiling.

by Zhiyi Zhang

For example, when a theme part has a source image with 0xff00ff as transparent pixels and the sizing margin is larger than the destination, the source image is first resized to fit the destination, during which, StretchBlt() should be used instead of TransparentBlt() because the image should not be blended with the temporary memory device context. Fix group box background may be drawn in black. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/draw.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index bf294ed3cc8..04ea1e79df9 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -779,8 +779,9 @@ static HRESULT UXTHEME_DrawImageBackground(HTHEME hTheme, HDC hdc, int iPartId, bmpSrcResized = CreateBitmap(srcSize.x, srcSize.y, 1, 32, NULL); SelectObject(hdcSrc, bmpSrcResized); + /* Use ALPHABLEND_NONE because the image is getting resized, rather than blended with the target */ UXTHEME_StretchBlt(hdcSrc, 0, 0, srcSize.x, srcSize.y, hdcOrigSrc, rcSrc.left, rcSrc.top, - rcSrc.right - rcSrc.left, rcSrc.bottom - rcSrc.top, transparent, transparentcolor); + rcSrc.right - rcSrc.left, rcSrc.bottom - rcSrc.top, ALPHABLEND_NONE, 0); rcSrc.left = 0; rcSrc.top = 0; -- 2.32.0

Nov. 30, 2021

Re: [PATCH v11 10/10] jscript: Return the correct string for Object.toString(null) in ES5+ modes.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=102933 Your paranoid android. === w8adm (32 bit report) === mshtml: events.c:1089: Test failed: unexpected call img_onerror events: Timeout === w1064_tsign (32 bit report) === mshtml: htmldoc.c:2541: Test failed: unexpected call UpdateUI htmldoc.c:2853: Test failed: unexpected call Exec_UPDATECOMMANDS htmldoc.c:350: Test failed: expected Exec_SETTITLE htmldoc.c:2859: Test failed: unexpected call Exec_SETTITLE === w10pro64_ar (64 bit report) === mshtml: htmldoc.c:2541: Test failed: unexpected call UpdateUI htmldoc.c:2853: Test failed: unexpected call Exec_UPDATECOMMANDS

Nov. 30, 2021

Re: [PATCH v11 09/10] mshtml: Set the builtin prop to NULL even when removeAttribute returns false in IE8 mode.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=102932 Your paranoid android. === w8adm (32 bit report) === mshtml: events.c:1089: Test failed: unexpected call img_onerror events: Timeout === w8adm (32 bit report) === mshtml: htmldoc.c:3084: Test failed: Incorrect error code: -2146697211 htmldoc.c:3089: Test failed: Page address: L"http://test.winehq.org/tests/winehq_snapshot/" htmldoc.c:5861: Test failed: expected OnChanged_1012 htmldoc.c:5862: Test failed: expected Exec_HTTPEQUIV htmldoc.c:5864: Test failed: expected Exec_SETTITLE htmldoc.c:5905: Test failed: expected FireNavigateComplete2 === w10pro64_he (64 bit report) === mshtml: htmldoc.c:2541: Test failed: unexpected call UpdateUI htmldoc.c:2853: Test failed: unexpected call Exec_UPDATECOMMANDS === w10pro64_ja (64 bit report) === mshtml: htmldoc.c:2541: Test failed: unexpected call UpdateUI htmldoc.c:2853: Test failed: unexpected call Exec_UPDATECOMMANDS htmldoc.c:350: Test failed: expected Exec_SETTITLE htmldoc.c:2859: Test failed: unexpected call Exec_SETTITLE

Nov. 30, 2021

Re: [PATCH 4/4] uiautomationcore: Add UiaRaiseAutomationPropertyChangedEvent stub.

by Mohamad Al-Jaf

Thank you both for the feedback. And thank you Connor for the detailed explanation, you've been very helpful. :) On Mon, Nov 29, 2021 at 10:19 PM Connor McAdams <conmanx360(a)gmail.com> wrote: > The 'xxx' on that wiki page is referring to the function name and > argument types, not the names of the arguments: "naming all API > functions and types". > > Typically, we rename function arguments, getting rid of camelcase, i.e > 'oldValue' can become 'old' or 'old_value'. Usually you can tell by > looking at other function prototypes within the same header. > > PROPERTYIDs are int, as found in include/uiautomationclient.idl: > 'typedef int PROPERTYID;', so a signed integer in the FIXME is > probably correct. In the future, you can typically find a definition > by using grep in the source code, but that's beyond what I can explain > here :) > > On Mon, Nov 29, 2021 at 10:00 PM Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> > wrote: > > > > Hi Connor, > > > > Oh, I see. Setting the spec file parameter as int128 fixes the issue. > Thank you for that. > > > > I thought that Wine only accepted str, wstr, ptr, and long. I was > following this guide: > https://wiki.winehq.org/Developer_Hints#Implementing_new_API_calls > > > > Regarding the naming convention, I see that the Proton Experimental stub > uses the names old and new instead of oldValue and newValue. The Developer > Hints page in the Wine wiki says to use the same name as Windows, i.e. > 'xxx'. But I see a lot of functions in Wine use shortened variable names. > I'm not sure how to name the variables. Are oldValue and newValue > acceptable? > > > > Also, for the FIXME channel they specify the PROPERTYID as an unsigned > decimal integer. I originally specified it as a signed decimal integer. The > MSDN page makes no mention of whether it is signed or unsigned, how can I > find out which to use in the future? > > > > On Mon, Nov 29, 2021 at 8:45 PM Connor McAdams <conmanx360(a)gmail.com> > wrote: > >> > >> Yeah, the arguments are not pointers, they are VARIANTs passed by > >> value, not reference. See > >> > https://github.com/ValveSoftware/wine/commit/e8cc86b21a1904547df613d892c6a0… > >> for Proton Experimental's stub. > >> > >> They should be int128's, because that is the size of the VARIANT > structure. > >> > >> On Mon, Nov 29, 2021 at 8:06 PM Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> > wrote: > >> > > >> > Sorry, my mistake, forgot to reply-all. > >> > > >> > If the original code is used, the binary uiautomationcore.dll fails > to compile in the 32-bit build of Wine. The 64-bit build of Wine compiles > successfully. Here is the error log: > >> > > >> > > /usr/lib/gcc/i686-w64-mingw32/11.2.0/../../../../i686-w64-mingw32/bin/ld: > uiautomationcore.dll-61a5829a.spec.o:fake:(.edata+0x170): undefined > reference to `UiaRaiseAutomationPropertyChangedEvent(a)16' > >> > collect2: error: ld returned 1 exit status > >> > winegcc: /usr/bin/i686-w64-mingw32-gcc failed > >> > make[1]: *** [Makefile:215741: > dlls/uiautomationcore/uiautomationcore.dll] Error 2 > >> > > >> > I can submit the original code with the correct prototype but I can't > build the 32-bit version of Wine on my machine. Perhaps there's something > wrong with my machine? I don't know why the error is happening. > >> > > >> > Here is the line in the spec file of the original code: > >> > > >> > @ stdcall UiaRaiseAutomationPropertyChangedEvent(ptr long long long) > >> > > >> > On Mon, Nov 29, 2021 at 4:41 AM Nikolay Sivov <nsivov(a)codeweavers.com> > wrote: > >> >> > >> >> On 11/29/21 12:18 PM, Mohamad Al-Jaf wrote: > >> >> > >> >> Hi Nikolay, > >> >> > >> >> > >> >> Please reply-all next time to include the list. > >> >> > >> >> > >> >> I see, that would explain why it fails to compile in 32-bit Wine. > But how does it compile on the 64-bit version? It worked just fine and the > FIXME channel displayed the correct debugstr_variant output. > >> >> > >> >> This was the original code: > >> >> > >> >> HRESULT WINAPI > UiaRaiseAutomationPropertyChangedEvent(IRawElementProviderSimple *provider, > PROPERTYID id, VARIANT oldValue, VARIANT newValue) > >> >> { > >> >> FIXME("(%p, %d, %s, %s): stub\n", provider, id, > debugstr_variant(&oldValue), debugstr_variant(&newValue)); > >> >> return S_OK; > >> >> } > >> >> > >> >> HRESULT WINAPI > UiaRaiseAutomationPropertyChangedEvent(IRawElementProviderSimple *provider, > PROPERTYID id, VARIANT oldValue, VARIANT newValue); > >> >> > >> >> I'm not sure I understand how the prototype is wrong, can you please > explain it to me? > >> >> > >> >> > >> >> What doesn't compile? Prototype has to match the one used on > Windows, you can't change that for exported functions. > >> >> > >> >> > >> >> For stubs, I thought they were unimplemented functions that simply > returned either a boolean or a single value. So in this case, would it be > an implementation? I'm not sure what to put in the subject line. The > function above it, UiaRaiseAutomationEvent, also returns a value, the same > one. Sorry, I'm just trying to understand you and learn more. > >> >> > >> >> > >> >> Connor has been working on this lately, I'll leave it to him to > comment. > >> >> > >> >> > >> >> On Mon, Nov 29, 2021 at 3:09 AM Nikolay Sivov < > nsivov(a)codeweavers.com> wrote: > >> >>> > >> >>> > >> >>> > >> >>> On 11/29/21 10:35 AM, Mohamad Al-Jaf wrote: > >> >>> > > +/*********************************************************************** > >> >>> > + * UiaRaiseAutomationPropertyChangedEvent > (uiautomationcore.@) > >> >>> > + */ > >> >>> > +HRESULT WINAPI > UiaRaiseAutomationPropertyChangedEvent(IRawElementProviderSimple *provider, > PROPERTYID id, VARIANT *oldValue, VARIANT *newValue) > >> >>> > +{ > >> >>> > + FIXME("(%p, %d, %p, %p): stub\n", provider, id, oldValue, > newValue); > >> >>> > + return S_OK; > >> >>> > +} > >> >>> The prototype is wrong, and return value is not what stubs usually > have. > >> >>> > >> >> >

Nov. 30, 2021

[PATCH v2] uiautomationcore: Add UiaRaiseAutomationPropertyChangedEvent stub.

by Mohamad Al-Jaf

Enable Microsoft Edge to run in Windows 10 mode. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51437 Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- v2: Fix incorrect spec file parameter. (Thanks Connor McAdams and Nikolay Sivov) --- dlls/uiautomationcore/uia_main.c | 9 +++++++++ dlls/uiautomationcore/uiautomationcore.spec | 2 +- include/uiautomationcoreapi.h | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/uiautomationcore/uia_main.c b/dlls/uiautomationcore/uia_main.c index 44fd42742d9..f1cf06ed4f5 100644 --- a/dlls/uiautomationcore/uia_main.c +++ b/dlls/uiautomationcore/uia_main.c @@ -324,6 +324,15 @@ HRESULT WINAPI UiaRaiseAutomationEvent(IRawElementProviderSimple *provider, EVEN return S_OK; } +/*********************************************************************** + * UiaRaiseAutomationPropertyChangedEvent (uiautomationcore.@) + */ +HRESULT WINAPI UiaRaiseAutomationPropertyChangedEvent(IRawElementProviderSimple *provider, PROPERTYID id, VARIANT old, VARIANT new) +{ + FIXME("(%p, %d, %s, %s): stub\n", provider, id, debugstr_variant(&old), debugstr_variant(&new)); + return S_OK; +} + void WINAPI UiaRegisterProviderCallback(UiaProviderCallback *callback) { FIXME("(%p): stub\n", callback); diff --git a/dlls/uiautomationcore/uiautomationcore.spec b/dlls/uiautomationcore/uiautomationcore.spec index 656641c4bad..82071bd2317 100644 --- a/dlls/uiautomationcore/uiautomationcore.spec +++ b/dlls/uiautomationcore/uiautomationcore.spec @@ -86,7 +86,7 @@ #@ stub UiaProviderFromIAccessible @ stub UiaRaiseAsyncContentLoadedEvent @ stdcall UiaRaiseAutomationEvent(ptr long) -@ stub UiaRaiseAutomationPropertyChangedEvent +@ stdcall UiaRaiseAutomationPropertyChangedEvent(ptr long int128 int128) #@ stub UiaRaiseChangesEvent #@ stub UiaRaiseNotificationEvent @ stub UiaRaiseStructureChangedEvent diff --git a/include/uiautomationcoreapi.h b/include/uiautomationcoreapi.h index de486710158..563d5c602bd 100644 --- a/include/uiautomationcoreapi.h +++ b/include/uiautomationcoreapi.h @@ -66,6 +66,7 @@ HRESULT WINAPI UiaGetReservedNotSupportedValue(IUnknown **value); int WINAPI UiaLookupId(enum AutomationIdentifierType type, const GUID *guid); BOOL WINAPI UiaPatternRelease(HUIAPATTERNOBJECT hobj); HRESULT WINAPI UiaRaiseAutomationEvent(IRawElementProviderSimple *provider, EVENTID id); +HRESULT WINAPI UiaRaiseAutomationPropertyChangedEvent(IRawElementProviderSimple *provider, PROPERTYID id, VARIANT old, VARIANT new); void WINAPI UiaRegisterProviderCallback(UiaProviderCallback *pCallback); LRESULT WINAPI UiaReturnRawElementProvider(HWND hwnd, WPARAM wParam, LPARAM lParam, IRawElementProviderSimple *elprov); BOOL WINAPI UiaTextRangeRelease(HUIATEXTRANGE hobj); -- 2.34.1

Nov. 30, 2021

Re: [PATCH 2/4] kernel32: Forward SetCachedSigningLevel to kernelbase.

by Mohamad Al-Jaf

Hi Chip, Thanks for the detailed explanation, I think I understand the difference between the two now. But how do you determine if a function should be forwarded or imported? Is there a way to find out for certain? So for SetCachedSigningLevel, how can I know if it's better to forward it or import it? On Mon, Nov 29, 2021 at 9:57 PM Chip Davis <cdavis(a)codeweavers.com> wrote: > Normally, a forwarded function gets a special export entry which records > the name of the DLL that has the real implementation and the name or > ordinal of the target function. That way, when the loader resolves imports, > it can resolve them directly to the real implementation instead of to a > thunk in the imported DLL, like you'd have otherwise. But on Windows, a > number of functions that would otherwise be forwarded to kernelbase from > kernel32 instead use these thunks that call the target in > kernelbase--presumably because existing programs abuse hotpatching to hook > functions that were in kernel32. For these cases, winebuild supports a > special option on a forwarded export which causes it to generate this thunk. > > November 29, 2021 7:08 PM, "Mohamad Al-Jaf" <mohamadaljaf(a)gmail.com > <mohamadaljaf(a)gmail.com?to=%22Mohamad%20Al-Jaf%22%20%3Cmohamadaljaf(a)gmail.com%3E>> > wrote: > > E-mail resend: Forgot to reply-all. > Interesting, why do you think this? How does one know how to find out if > forwarding or importing is more appropriate? Also, what exactly is the > difference between the two? > On Mon, Nov 29, 2021 at 3:11 AM Nikolay Sivov <nsivov(a)codeweavers.com> > wrote: > > It's possible it should be using -import for this function. > > > > Chip >

Nov. 30, 2021

Re: [PATCH v11 08/10] mshtml: Set dispatch values to "[object]" for builtin attributes in IE8 and IE9 modes.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=102931 Your paranoid android. === w8adm (32 bit report) === mshtml: events.c:1089: Test failed: unexpected call img_onerror events: Timeout === w10pro64 (32 bit report) === mshtml: htmldoc.c:2541: Test failed: unexpected call UpdateUI htmldoc.c:2853: Test failed: unexpected call Exec_UPDATECOMMANDS htmldoc.c:350: Test failed: expected Exec_SETTITLE htmldoc.c:2859: Test failed: unexpected call Exec_SETTITLE

Nov. 30, 2021

Re: [PATCH 4/4] uiautomationcore: Add UiaRaiseAutomationPropertyChangedEvent stub.

by Connor McAdams

The 'xxx' on that wiki page is referring to the function name and argument types, not the names of the arguments: "naming all API functions and types". Typically, we rename function arguments, getting rid of camelcase, i.e 'oldValue' can become 'old' or 'old_value'. Usually you can tell by looking at other function prototypes within the same header. PROPERTYIDs are int, as found in include/uiautomationclient.idl: 'typedef int PROPERTYID;', so a signed integer in the FIXME is probably correct. In the future, you can typically find a definition by using grep in the source code, but that's beyond what I can explain here :) On Mon, Nov 29, 2021 at 10:00 PM Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> wrote: > > Hi Connor, > > Oh, I see. Setting the spec file parameter as int128 fixes the issue. Thank you for that. > > I thought that Wine only accepted str, wstr, ptr, and long. I was following this guide: https://wiki.winehq.org/Developer_Hints#Implementing_new_API_calls > > Regarding the naming convention, I see that the Proton Experimental stub uses the names old and new instead of oldValue and newValue. The Developer Hints page in the Wine wiki says to use the same name as Windows, i.e. 'xxx'. But I see a lot of functions in Wine use shortened variable names. I'm not sure how to name the variables. Are oldValue and newValue acceptable? > > Also, for the FIXME channel they specify the PROPERTYID as an unsigned decimal integer. I originally specified it as a signed decimal integer. The MSDN page makes no mention of whether it is signed or unsigned, how can I find out which to use in the future? > > On Mon, Nov 29, 2021 at 8:45 PM Connor McAdams <conmanx360(a)gmail.com> wrote: >> >> Yeah, the arguments are not pointers, they are VARIANTs passed by >> value, not reference. See >> https://github.com/ValveSoftware/wine/commit/e8cc86b21a1904547df613d892c6a0… >> for Proton Experimental's stub. >> >> They should be int128's, because that is the size of the VARIANT structure. >> >> On Mon, Nov 29, 2021 at 8:06 PM Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> wrote: >> > >> > Sorry, my mistake, forgot to reply-all. >> > >> > If the original code is used, the binary uiautomationcore.dll fails to compile in the 32-bit build of Wine. The 64-bit build of Wine compiles successfully. Here is the error log: >> > >> > /usr/lib/gcc/i686-w64-mingw32/11.2.0/../../../../i686-w64-mingw32/bin/ld: uiautomationcore.dll-61a5829a.spec.o:fake:(.edata+0x170): undefined reference to `UiaRaiseAutomationPropertyChangedEvent(a)16' >> > collect2: error: ld returned 1 exit status >> > winegcc: /usr/bin/i686-w64-mingw32-gcc failed >> > make[1]: *** [Makefile:215741: dlls/uiautomationcore/uiautomationcore.dll] Error 2 >> > >> > I can submit the original code with the correct prototype but I can't build the 32-bit version of Wine on my machine. Perhaps there's something wrong with my machine? I don't know why the error is happening. >> > >> > Here is the line in the spec file of the original code: >> > >> > @ stdcall UiaRaiseAutomationPropertyChangedEvent(ptr long long long) >> > >> > On Mon, Nov 29, 2021 at 4:41 AM Nikolay Sivov <nsivov(a)codeweavers.com> wrote: >> >> >> >> On 11/29/21 12:18 PM, Mohamad Al-Jaf wrote: >> >> >> >> Hi Nikolay, >> >> >> >> >> >> Please reply-all next time to include the list. >> >> >> >> >> >> I see, that would explain why it fails to compile in 32-bit Wine. But how does it compile on the 64-bit version? It worked just fine and the FIXME channel displayed the correct debugstr_variant output. >> >> >> >> This was the original code: >> >> >> >> HRESULT WINAPI UiaRaiseAutomationPropertyChangedEvent(IRawElementProviderSimple *provider, PROPERTYID id, VARIANT oldValue, VARIANT newValue) >> >> { >> >> FIXME("(%p, %d, %s, %s): stub\n", provider, id, debugstr_variant(&oldValue), debugstr_variant(&newValue)); >> >> return S_OK; >> >> } >> >> >> >> HRESULT WINAPI UiaRaiseAutomationPropertyChangedEvent(IRawElementProviderSimple *provider, PROPERTYID id, VARIANT oldValue, VARIANT newValue); >> >> >> >> I'm not sure I understand how the prototype is wrong, can you please explain it to me? >> >> >> >> >> >> What doesn't compile? Prototype has to match the one used on Windows, you can't change that for exported functions. >> >> >> >> >> >> For stubs, I thought they were unimplemented functions that simply returned either a boolean or a single value. So in this case, would it be an implementation? I'm not sure what to put in the subject line. The function above it, UiaRaiseAutomationEvent, also returns a value, the same one. Sorry, I'm just trying to understand you and learn more. >> >> >> >> >> >> Connor has been working on this lately, I'll leave it to him to comment. >> >> >> >> >> >> On Mon, Nov 29, 2021 at 3:09 AM Nikolay Sivov <nsivov(a)codeweavers.com> wrote: >> >>> >> >>> >> >>> >> >>> On 11/29/21 10:35 AM, Mohamad Al-Jaf wrote: >> >>> > +/*********************************************************************** >> >>> > + * UiaRaiseAutomationPropertyChangedEvent (uiautomationcore.@) >> >>> > + */ >> >>> > +HRESULT WINAPI UiaRaiseAutomationPropertyChangedEvent(IRawElementProviderSimple *provider, PROPERTYID id, VARIANT *oldValue, VARIANT *newValue) >> >>> > +{ >> >>> > + FIXME("(%p, %d, %p, %p): stub\n", provider, id, oldValue, newValue); >> >>> > + return S_OK; >> >>> > +} >> >>> The prototype is wrong, and return value is not what stubs usually have. >> >>> >> >>

Nov. 30, 2021

Re: [PATCH v11 07/10] mshtml: Fix style attribute removal in IE8 mode.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=102930 Your paranoid android. === w8adm (32 bit report) === mshtml: events.c:1089: Test failed: unexpected call img_onerror events: Timeout === w10pro64_he (64 bit report) === mshtml: htmldoc.c:2541: Test failed: unexpected call UpdateUI htmldoc.c:2853: Test failed: unexpected call Exec_UPDATECOMMANDS htmldoc.c:350: Test failed: expected Exec_SETTITLE htmldoc.c:2859: Test failed: unexpected call Exec_SETTITLE

Nov. 30, 2021

Re: [PATCH 4/4] uiautomationcore: Add UiaRaiseAutomationPropertyChangedEvent stub.

by Mohamad Al-Jaf

Hi Connor, Oh, I see. Setting the spec file parameter as int128 fixes the issue. Thank you for that. I thought that Wine only accepted str, wstr, ptr, and long. I was following this guide: https://wiki.winehq.org/Developer_Hints#Implementing_new_API_calls Regarding the naming convention, I see that the Proton Experimental stub uses the names old and new instead of oldValue and newValue. The Developer Hints page in the Wine wiki says to use the same name as Windows, i.e. 'xxx'. But I see a lot of functions in Wine use shortened variable names. I'm not sure how to name the variables. Are oldValue and newValue acceptable? Also, for the FIXME channel they specify the PROPERTYID as an unsigned decimal integer. I originally specified it as a signed decimal integer. The MSDN page makes no mention of whether it is signed or unsigned, how can I find out which to use in the future? On Mon, Nov 29, 2021 at 8:45 PM Connor McAdams <conmanx360(a)gmail.com> wrote: > Yeah, the arguments are not pointers, they are VARIANTs passed by > value, not reference. See > > https://github.com/ValveSoftware/wine/commit/e8cc86b21a1904547df613d892c6a0… > for Proton Experimental's stub. > > They should be int128's, because that is the size of the VARIANT structure. > > On Mon, Nov 29, 2021 at 8:06 PM Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> > wrote: > > > > Sorry, my mistake, forgot to reply-all. > > > > If the original code is used, the binary uiautomationcore.dll fails to > compile in the 32-bit build of Wine. The 64-bit build of Wine compiles > successfully. Here is the error log: > > > > > /usr/lib/gcc/i686-w64-mingw32/11.2.0/../../../../i686-w64-mingw32/bin/ld: > uiautomationcore.dll-61a5829a.spec.o:fake:(.edata+0x170): undefined > reference to `UiaRaiseAutomationPropertyChangedEvent(a)16' > > collect2: error: ld returned 1 exit status > > winegcc: /usr/bin/i686-w64-mingw32-gcc failed > > make[1]: *** [Makefile:215741: > dlls/uiautomationcore/uiautomationcore.dll] Error 2 > > > > I can submit the original code with the correct prototype but I can't > build the 32-bit version of Wine on my machine. Perhaps there's something > wrong with my machine? I don't know why the error is happening. > > > > Here is the line in the spec file of the original code: > > > > @ stdcall UiaRaiseAutomationPropertyChangedEvent(ptr long long long) > > > > On Mon, Nov 29, 2021 at 4:41 AM Nikolay Sivov <nsivov(a)codeweavers.com> > wrote: > >> > >> On 11/29/21 12:18 PM, Mohamad Al-Jaf wrote: > >> > >> Hi Nikolay, > >> > >> > >> Please reply-all next time to include the list. > >> > >> > >> I see, that would explain why it fails to compile in 32-bit Wine. But > how does it compile on the 64-bit version? It worked just fine and the > FIXME channel displayed the correct debugstr_variant output. > >> > >> This was the original code: > >> > >> HRESULT WINAPI > UiaRaiseAutomationPropertyChangedEvent(IRawElementProviderSimple *provider, > PROPERTYID id, VARIANT oldValue, VARIANT newValue) > >> { > >> FIXME("(%p, %d, %s, %s): stub\n", provider, id, > debugstr_variant(&oldValue), debugstr_variant(&newValue)); > >> return S_OK; > >> } > >> > >> HRESULT WINAPI > UiaRaiseAutomationPropertyChangedEvent(IRawElementProviderSimple *provider, > PROPERTYID id, VARIANT oldValue, VARIANT newValue); > >> > >> I'm not sure I understand how the prototype is wrong, can you please > explain it to me? > >> > >> > >> What doesn't compile? Prototype has to match the one used on Windows, > you can't change that for exported functions. > >> > >> > >> For stubs, I thought they were unimplemented functions that simply > returned either a boolean or a single value. So in this case, would it be > an implementation? I'm not sure what to put in the subject line. The > function above it, UiaRaiseAutomationEvent, also returns a value, the same > one. Sorry, I'm just trying to understand you and learn more. > >> > >> > >> Connor has been working on this lately, I'll leave it to him to comment. > >> > >> > >> On Mon, Nov 29, 2021 at 3:09 AM Nikolay Sivov <nsivov(a)codeweavers.com> > wrote: > >>> > >>> > >>> > >>> On 11/29/21 10:35 AM, Mohamad Al-Jaf wrote: > >>> > > +/*********************************************************************** > >>> > + * UiaRaiseAutomationPropertyChangedEvent > (uiautomationcore.@) > >>> > + */ > >>> > +HRESULT WINAPI > UiaRaiseAutomationPropertyChangedEvent(IRawElementProviderSimple *provider, > PROPERTYID id, VARIANT *oldValue, VARIANT *newValue) > >>> > +{ > >>> > + FIXME("(%p, %d, %p, %p): stub\n", provider, id, oldValue, > newValue); > >>> > + return S_OK; > >>> > +} > >>> The prototype is wrong, and return value is not what stubs usually > have. > >>> > >> >

Nov. 30, 2021

Re: [PATCH 2/4] kernel32: Forward SetCachedSigningLevel to kernelbase.

by Chip Davis

Normally, a forwarded function gets a special export entry which records the name of the DLL that has the real implementation and the name or ordinal of the target function. That way, when the loader resolves imports, it can resolve them directly to the real implementation instead of to a thunk in the imported DLL, like you'd have otherwise. But on Windows, a number of functions that would otherwise be forwarded to kernelbase from kernel32 instead use these thunks that call the target in kernelbase--presumably because existing programs abuse hotpatching to hook functions that were in kernel32. For these cases, winebuild supports a special option on a forwarded export which causes it to generate this thunk. November 29, 2021 7:08 PM, "Mohamad Al-Jaf" <mohamadaljaf(a)gmail.com (mailto:mohamadaljaf(a)gmail.com?to=%22Mohamad%20Al-Jaf%22%20<mohamadaljaf(a)gmail.com>)> wrote: E-mail resend: Forgot to reply-all. Interesting, why do you think this? How does one know how to find out if forwarding or importing is more appropriate? Also, what exactly is the difference between the two? On Mon, Nov 29, 2021 at 3:11 AM Nikolay Sivov <nsivov(a)codeweavers.com (mailto:nsivov(a)codeweavers.com)> wrote:It's possible it should be using -import for this function. Chip

Nov. 30, 2021

[PATCH v2 2/2] kernelbase: Fix infinite loop in Internal_EnumCalendarInfo.

by Jinoh Kang

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52129 Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- dlls/kernel32/tests/locale.c | 24 ------------------------ dlls/kernelbase/locale.c | 24 +++++++++++++++--------- 2 files changed, 15 insertions(+), 33 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index a5c2ad1068d..94c9ce3ad1b 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -7045,12 +7045,6 @@ static void test_EnumCalendarInfoA(void) { INT i; - if (!strcmp(winetest_platform, "wine")) - { - skip("EnumCalendarInfo broken on Wine (test would hang with an infinite loop)\n"); - return; - } - ok( EnumCalendarInfoA( calinfo_procA, LOCALE_USER_DEFAULT, ENUM_ALL_CALENDARS, @@ -7079,12 +7073,6 @@ static void test_EnumCalendarInfoW(void) { INT i; - if (!strcmp(winetest_platform, "wine")) - { - skip("EnumCalendarInfo broken on Wine (test would hang with an infinite loop)\n"); - return; - } - ok( EnumCalendarInfoW( calinfo_procW, LOCALE_USER_DEFAULT, ENUM_ALL_CALENDARS, @@ -7114,12 +7102,6 @@ static void test_EnumCalendarInfoExA(void) { INT i; - if (!strcmp(winetest_platform, "wine")) - { - skip("EnumCalendarInfo broken on Wine (test would hang with an infinite loop)\n"); - return; - } - ok( EnumCalendarInfoExA( calinfoex_procA, LOCALE_USER_DEFAULT, ENUM_ALL_CALENDARS, @@ -7149,12 +7131,6 @@ static void test_EnumCalendarInfoExW(void) { INT i; - if (!strcmp(winetest_platform, "wine")) - { - skip("EnumCalendarInfo broken on Wine (test would hang with an infinite loop)\n"); - return; - } - ok( EnumCalendarInfoExW( calinfoex_procW, LOCALE_USER_DEFAULT, ENUM_ALL_CALENDARS, 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

Nov. 30, 2021

[PATCH v2 1/2] kernel32/tests: add tests for EnumCalendarInfo(Ex).

by Jinoh Kang

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- dlls/kernel32/tests/locale.c | 169 +++++++++++++++++++++++++++++++++++ 1 file changed, 169 insertions(+) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index cad2577379b..a5c2ad1068d 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -7008,6 +7008,171 @@ static void test_geo_name(void) RegCloseKey(key); } +static const LCID locales_with_optional_calendars[] = { + MAKELCID(MAKELANGID(LANG_ARABIC, SUBLANG_ARABIC_SAUDI_ARABIA), SORT_DEFAULT), + MAKELCID(MAKELANGID(LANG_ARABIC, SUBLANG_ARABIC_LEBANON), SORT_DEFAULT), + MAKELCID(MAKELANGID(LANG_ARABIC, SUBLANG_ARABIC_EGYPT), SORT_DEFAULT), + MAKELCID(MAKELANGID(LANG_ARABIC, SUBLANG_ARABIC_ALGERIA), SORT_DEFAULT), + MAKELCID(MAKELANGID(LANG_ARABIC, SUBLANG_ARABIC_BAHRAIN), SORT_DEFAULT), + MAKELCID(MAKELANGID(LANG_ARABIC, SUBLANG_ARABIC_IRAQ), SORT_DEFAULT), + MAKELCID(MAKELANGID(LANG_ARABIC, SUBLANG_ARABIC_JORDAN), SORT_DEFAULT), + MAKELCID(MAKELANGID(LANG_ARABIC, SUBLANG_ARABIC_KUWAIT), SORT_DEFAULT), + MAKELCID(MAKELANGID(LANG_ARABIC, SUBLANG_ARABIC_LIBYA), SORT_DEFAULT), + MAKELCID(MAKELANGID(LANG_ARABIC, SUBLANG_ARABIC_MOROCCO), SORT_DEFAULT), + MAKELCID(MAKELANGID(LANG_ARABIC, SUBLANG_ARABIC_OMAN), SORT_DEFAULT), + MAKELCID(MAKELANGID(LANG_ARABIC, SUBLANG_ARABIC_QATAR), SORT_DEFAULT), + MAKELCID(MAKELANGID(LANG_ARABIC, SUBLANG_ARABIC_SYRIA), SORT_DEFAULT), + MAKELCID(MAKELANGID(LANG_ARABIC, SUBLANG_ARABIC_TUNISIA), SORT_DEFAULT), + MAKELCID(MAKELANGID(LANG_ARABIC, SUBLANG_ARABIC_UAE), SORT_DEFAULT), + MAKELCID(MAKELANGID(LANG_ARABIC, SUBLANG_ARABIC_YEMEN), SORT_DEFAULT), + MAKELCID(MAKELANGID(LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL), SORT_DEFAULT), + MAKELCID(MAKELANGID(LANG_DIVEHI, SUBLANG_DEFAULT), SORT_DEFAULT), + MAKELCID(MAKELANGID(LANG_PERSIAN, SUBLANG_DEFAULT), SORT_DEFAULT), + MAKELCID(MAKELANGID(LANG_HEBREW, SUBLANG_DEFAULT), SORT_DEFAULT), + MAKELCID(MAKELANGID(LANG_JAPANESE, SUBLANG_DEFAULT), SORT_DEFAULT), + MAKELCID(MAKELANGID(LANG_KOREAN, SUBLANG_KOREAN), SORT_DEFAULT), + MAKELCID(MAKELANGID(LANG_THAI, SUBLANG_DEFAULT), SORT_DEFAULT), + MAKELCID(MAKELANGID(LANG_URDU, SUBLANG_URDU_PAKISTAN), SORT_DEFAULT) +}; + +static BOOL CALLBACK calinfo_procA(LPSTR calinfo) +{ + (void)calinfo; + return TRUE; +} + +static void test_EnumCalendarInfoA(void) +{ + INT i; + + if (!strcmp(winetest_platform, "wine")) + { + skip("EnumCalendarInfo broken on Wine (test would hang with an infinite loop)\n"); + return; + } + + ok( EnumCalendarInfoA( calinfo_procA, + LOCALE_USER_DEFAULT, + ENUM_ALL_CALENDARS, + CAL_RETURN_NUMBER | CAL_ICALINTVALUE ), + "EnumCalendarInfoA for user default locale failed: %u\n", GetLastError() ); + + for (i = 0; i < ARRAY_SIZE( locales_with_optional_calendars ); i++) + { + LCID lcid = locales_with_optional_calendars[i]; + ok( EnumCalendarInfoA( calinfo_procA, + lcid, + ENUM_ALL_CALENDARS, + CAL_RETURN_NUMBER | CAL_ICALINTVALUE ) || + broken( GetLastError() == ERROR_INVALID_FLAGS ) /* no locale */, + "EnumCalendarInfoA for LCID %#06x failed: %u\n", lcid, GetLastError() ); + } +} + +static BOOL CALLBACK calinfo_procW(LPWSTR calinfo) +{ + (void)calinfo; + return TRUE; +} + +static void test_EnumCalendarInfoW(void) +{ + INT i; + + if (!strcmp(winetest_platform, "wine")) + { + skip("EnumCalendarInfo broken on Wine (test would hang with an infinite loop)\n"); + return; + } + + ok( EnumCalendarInfoW( calinfo_procW, + LOCALE_USER_DEFAULT, + ENUM_ALL_CALENDARS, + CAL_RETURN_NUMBER | CAL_ICALINTVALUE ), + "EnumCalendarInfoW for user default locale failed: %u\n", GetLastError() ); + + for (i = 0; i < ARRAY_SIZE( locales_with_optional_calendars ); i++) + { + LCID lcid = locales_with_optional_calendars[i]; + ok( EnumCalendarInfoW( calinfo_procW, + lcid, + ENUM_ALL_CALENDARS, + CAL_RETURN_NUMBER | CAL_ICALINTVALUE ) || + broken( GetLastError() == ERROR_INVALID_FLAGS ) /* no locale */, + "EnumCalendarInfoW for LCID %#06x failed: %u\n", lcid, GetLastError() ); + } +} + +static BOOL CALLBACK calinfoex_procA(LPSTR calinfo, LCID calid) +{ + (void)calinfo; + (void)calid; + return TRUE; +} + +static void test_EnumCalendarInfoExA(void) +{ + INT i; + + if (!strcmp(winetest_platform, "wine")) + { + skip("EnumCalendarInfo broken on Wine (test would hang with an infinite loop)\n"); + return; + } + + ok( EnumCalendarInfoExA( calinfoex_procA, + LOCALE_USER_DEFAULT, + ENUM_ALL_CALENDARS, + CAL_RETURN_NUMBER | CAL_ICALINTVALUE ), + "EnumCalendarInfoExA for user default locale failed: %u\n", GetLastError() ); + + for (i = 0; i < ARRAY_SIZE( locales_with_optional_calendars ); i++) + { + LCID lcid = locales_with_optional_calendars[i]; + ok( EnumCalendarInfoExA( calinfoex_procA, + lcid, + ENUM_ALL_CALENDARS, + CAL_RETURN_NUMBER | CAL_ICALINTVALUE ) || + broken( GetLastError() == ERROR_INVALID_FLAGS ) /* no locale */, + "EnumCalendarInfoExA for LCID %#06x failed: %u\n", lcid, GetLastError() ); + } +} + +static BOOL CALLBACK calinfoex_procW(LPWSTR calinfo, LCID calid) +{ + (void)calinfo; + (void)calid; + return TRUE; +} + +static void test_EnumCalendarInfoExW(void) +{ + INT i; + + if (!strcmp(winetest_platform, "wine")) + { + skip("EnumCalendarInfo broken on Wine (test would hang with an infinite loop)\n"); + return; + } + + ok( EnumCalendarInfoExW( calinfoex_procW, + LOCALE_USER_DEFAULT, + ENUM_ALL_CALENDARS, + CAL_RETURN_NUMBER | CAL_ICALINTVALUE ), + "EnumCalendarInfoExW for user default locale failed: %u\n", GetLastError() ); + + for (i = 0; i < ARRAY_SIZE( locales_with_optional_calendars ); i++) + { + LCID lcid = locales_with_optional_calendars[i]; + ok( EnumCalendarInfoExW( calinfoex_procW, + lcid, + ENUM_ALL_CALENDARS, + CAL_RETURN_NUMBER | CAL_ICALINTVALUE ) || + broken( GetLastError() == ERROR_INVALID_FLAGS ) /* no locale */, + "EnumCalendarInfoExW for LCID %#06x failed: %u\n", lcid, GetLastError() ); + } +} + START_TEST(locale) { InitFunctionPointers(); @@ -7060,4 +7225,8 @@ START_TEST(locale) test_NLSVersion(); test_geo_name(); test_sorting(); + test_EnumCalendarInfoA(); + test_EnumCalendarInfoW(); + test_EnumCalendarInfoExA(); + test_EnumCalendarInfoExW(); } -- 2.31.1

Nov. 30, 2021

[PATCH] kernelbase: Fix infinite loop in Internal_EnumCalendarInfo.

by Jinoh Kang

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

Nov. 30, 2021

Re: [PATCH v11 06/10] mshtml: Associate props with attributes for IE8 mode, but keep them stringified.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=102929 Your paranoid android. === w8adm (32 bit report) === mshtml: htmldoc.c:3084: Test failed: Incorrect error code: -2146697211 htmldoc.c:3089: Test failed: Page address: L"http://test.winehq.org/tests/winehq_snapshot/" htmldoc.c:5861: Test failed: expected OnChanged_1012 htmldoc.c:5862: Test failed: expected Exec_HTTPEQUIV htmldoc.c:5864: Test failed: expected Exec_SETTITLE htmldoc.c:5905: Test failed: expected FireNavigateComplete2 === w1064_tsign (64 bit report) === mshtml: htmldoc.c:2541: Test failed: unexpected call UpdateUI htmldoc.c:2853: Test failed: unexpected call Exec_UPDATECOMMANDS htmldoc.c:2541: Test failed: unexpected call UpdateUI htmldoc.c:2853: Test failed: unexpected call Exec_UPDATECOMMANDS htmldoc.c:350: Test failed: expected Exec_SETTITLE htmldoc.c:2859: Test failed: unexpected call Exec_SETTITLE === w10pro64_he (64 bit report) === mshtml: htmldoc.c:2541: Test failed: unexpected call UpdateUI htmldoc.c:2853: Test failed: unexpected call Exec_UPDATECOMMANDS

Nov. 30, 2021

Re: [PATCH 4/4] uiautomationcore: Add UiaRaiseAutomationPropertyChangedEvent stub.

by Connor McAdams

Yeah, the arguments are not pointers, they are VARIANTs passed by value, not reference. See https://github.com/ValveSoftware/wine/commit/e8cc86b21a1904547df613d892c6a0… for Proton Experimental's stub. They should be int128's, because that is the size of the VARIANT structure. On Mon, Nov 29, 2021 at 8:06 PM Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> wrote: > > Sorry, my mistake, forgot to reply-all. > > If the original code is used, the binary uiautomationcore.dll fails to compile in the 32-bit build of Wine. The 64-bit build of Wine compiles successfully. Here is the error log: > > /usr/lib/gcc/i686-w64-mingw32/11.2.0/../../../../i686-w64-mingw32/bin/ld: uiautomationcore.dll-61a5829a.spec.o:fake:(.edata+0x170): undefined reference to `UiaRaiseAutomationPropertyChangedEvent(a)16' > collect2: error: ld returned 1 exit status > winegcc: /usr/bin/i686-w64-mingw32-gcc failed > make[1]: *** [Makefile:215741: dlls/uiautomationcore/uiautomationcore.dll] Error 2 > > I can submit the original code with the correct prototype but I can't build the 32-bit version of Wine on my machine. Perhaps there's something wrong with my machine? I don't know why the error is happening. > > Here is the line in the spec file of the original code: > > @ stdcall UiaRaiseAutomationPropertyChangedEvent(ptr long long long) > > On Mon, Nov 29, 2021 at 4:41 AM Nikolay Sivov <nsivov(a)codeweavers.com> wrote: >> >> On 11/29/21 12:18 PM, Mohamad Al-Jaf wrote: >> >> Hi Nikolay, >> >> >> Please reply-all next time to include the list. >> >> >> I see, that would explain why it fails to compile in 32-bit Wine. But how does it compile on the 64-bit version? It worked just fine and the FIXME channel displayed the correct debugstr_variant output. >> >> This was the original code: >> >> HRESULT WINAPI UiaRaiseAutomationPropertyChangedEvent(IRawElementProviderSimple *provider, PROPERTYID id, VARIANT oldValue, VARIANT newValue) >> { >> FIXME("(%p, %d, %s, %s): stub\n", provider, id, debugstr_variant(&oldValue), debugstr_variant(&newValue)); >> return S_OK; >> } >> >> HRESULT WINAPI UiaRaiseAutomationPropertyChangedEvent(IRawElementProviderSimple *provider, PROPERTYID id, VARIANT oldValue, VARIANT newValue); >> >> I'm not sure I understand how the prototype is wrong, can you please explain it to me? >> >> >> What doesn't compile? Prototype has to match the one used on Windows, you can't change that for exported functions. >> >> >> For stubs, I thought they were unimplemented functions that simply returned either a boolean or a single value. So in this case, would it be an implementation? I'm not sure what to put in the subject line. The function above it, UiaRaiseAutomationEvent, also returns a value, the same one. Sorry, I'm just trying to understand you and learn more. >> >> >> Connor has been working on this lately, I'll leave it to him to comment. >> >> >> On Mon, Nov 29, 2021 at 3:09 AM Nikolay Sivov <nsivov(a)codeweavers.com> wrote: >>> >>> >>> >>> On 11/29/21 10:35 AM, Mohamad Al-Jaf wrote: >>> > +/*********************************************************************** >>> > + * UiaRaiseAutomationPropertyChangedEvent (uiautomationcore.@) >>> > + */ >>> > +HRESULT WINAPI UiaRaiseAutomationPropertyChangedEvent(IRawElementProviderSimple *provider, PROPERTYID id, VARIANT *oldValue, VARIANT *newValue) >>> > +{ >>> > + FIXME("(%p, %d, %p, %p): stub\n", provider, id, oldValue, newValue); >>> > + return S_OK; >>> > +} >>> The prototype is wrong, and return value is not what stubs usually have. >>> >>

Nov. 30, 2021

Re: [PATCH 2/4] kernel32: Forward SetCachedSigningLevel to kernelbase.

by Mohamad Al-Jaf

E-mail resend: Forgot to reply-all. Interesting, why do you think this? How does one know how to find out if forwarding or importing is more appropriate? Also, what exactly is the difference between the two? On Mon, Nov 29, 2021 at 3:11 AM Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > It's possible it should be using -import for this function. > >

Nov. 30, 2021

Re: [PATCH 4/4] uiautomationcore: Add UiaRaiseAutomationPropertyChangedEvent stub.

by Mohamad Al-Jaf

Sorry, my mistake, forgot to reply-all. If the original code is used, the binary uiautomationcore.dll fails to compile in the 32-bit build of Wine. The 64-bit build of Wine compiles successfully. Here is the error log: /usr/lib/gcc/i686-w64-mingw32/11.2.0/../../../../i686-w64-mingw32/bin/ld: uiautomationcore.dll-61a5829a.spec.o:fake:(.edata+0x170): undefined reference to `UiaRaiseAutomationPropertyChangedEvent(a)16' collect2: error: ld returned 1 exit status winegcc: /usr/bin/i686-w64-mingw32-gcc failed make[1]: *** [Makefile:215741: dlls/uiautomationcore/uiautomationcore.dll] Error 2 I can submit the original code with the correct prototype but I can't build the 32-bit version of Wine on my machine. Perhaps there's something wrong with my machine? I don't know why the error is happening. Here is the line in the spec file of the original code: @ stdcall UiaRaiseAutomationPropertyChangedEvent(ptr long long long) On Mon, Nov 29, 2021 at 4:41 AM Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > On 11/29/21 12:18 PM, Mohamad Al-Jaf wrote: > > Hi Nikolay, > > > Please reply-all next time to include the list. > > > I see, that would explain why it fails to compile in 32-bit Wine. But how > does it compile on the 64-bit version? It worked just fine and the FIXME > channel displayed the correct debugstr_variant output. > > This was the original code: > > HRESULT WINAPI > UiaRaiseAutomationPropertyChangedEvent(IRawElementProviderSimple *provider, > PROPERTYID id, VARIANT oldValue, VARIANT newValue) > { > FIXME("(%p, %d, %s, %s): stub\n", provider, id, > debugstr_variant(&oldValue), debugstr_variant(&newValue)); > return S_OK; > } > > HRESULT WINAPI > UiaRaiseAutomationPropertyChangedEvent(IRawElementProviderSimple *provider, > PROPERTYID id, VARIANT oldValue, VARIANT newValue); > > I'm not sure I understand how the prototype is wrong, can you please > explain it to me? > > > What doesn't compile? Prototype has to match the one used on Windows, you > can't change that for exported functions. > > > For stubs, I thought they were unimplemented functions that simply > returned either a boolean or a single value. So in this case, would it be > an implementation? I'm not sure what to put in the subject line. The > function above it, UiaRaiseAutomationEvent, also returns a value, the same > one. Sorry, I'm just trying to understand you and learn more. > > > Connor has been working on this lately, I'll leave it to him to comment. > > > On Mon, Nov 29, 2021 at 3:09 AM Nikolay Sivov <nsivov(a)codeweavers.com> > wrote: > >> >> >> On 11/29/21 10:35 AM, Mohamad Al-Jaf wrote: >> > >> +/*********************************************************************** >> > + * UiaRaiseAutomationPropertyChangedEvent (uiautomationcore.@ >> ) >> > + */ >> > +HRESULT WINAPI >> UiaRaiseAutomationPropertyChangedEvent(IRawElementProviderSimple *provider, >> PROPERTYID id, VARIANT *oldValue, VARIANT *newValue) >> > +{ >> > + FIXME("(%p, %d, %p, %p): stub\n", provider, id, oldValue, >> newValue); >> > + return S_OK; >> > +} >> The prototype is wrong, and return value is not what stubs usually have. >> >> >

Nov. 30, 2021

Re: [PATCH v11 01/10] mshtml: Stringify attribute values in setAttribute using string hints in IE10+.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=102924 Your paranoid android. === w8adm (32 bit report) === mshtml: events.c:1089: Test failed: unexpected call img_onerror events: Timeout === w8adm (32 bit report) === mshtml: htmldoc.c:3084: Test failed: Incorrect error code: -2146697211 htmldoc.c:3089: Test failed: Page address: L"http://test.winehq.org/tests/winehq_snapshot/" htmldoc.c:5861: Test failed: expected OnChanged_1012 htmldoc.c:5862: Test failed: expected Exec_HTTPEQUIV htmldoc.c:5864: Test failed: expected Exec_SETTITLE htmldoc.c:5905: Test failed: expected FireNavigateComplete2 === w10pro64_ar (64 bit report) === mshtml: htmldoc.c:2541: Test failed: unexpected call UpdateUI htmldoc.c:2853: Test failed: unexpected call Exec_UPDATECOMMANDS === w10pro64_he (64 bit report) === mshtml: htmldoc.c:2541: Test failed: unexpected call UpdateUI htmldoc.c:2853: Test failed: unexpected call Exec_UPDATECOMMANDS htmldoc.c:350: Test failed: expected Exec_SETTITLE htmldoc.c:2859: Test failed: unexpected call Exec_SETTITLE === w10pro64_ja (64 bit report) === mshtml: htmldoc.c:2541: Test failed: unexpected call UpdateUI htmldoc.c:2853: Test failed: unexpected call Exec_UPDATECOMMANDS

Nov. 30, 2021

[PATCH 2/2] include: Do not include wine/list.h in wine/strmbase.h.

by Zebediah Figura

Nothing in strmbase.h uses list.h anymore. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/amstream/audiostream.c | 1 + dlls/amstream/ddrawstream.c | 1 + include/wine/strmbase.h | 1 - 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/amstream/audiostream.c b/dlls/amstream/audiostream.c index 91ca0630199..bb86cfdaf69 100644 --- a/dlls/amstream/audiostream.c +++ b/dlls/amstream/audiostream.c @@ -21,6 +21,7 @@ #define COBJMACROS #include "amstream_private.h" #include "wine/debug.h" +#include "wine/list.h" #include "wine/strmbase.h" WINE_DEFAULT_DEBUG_CHANNEL(quartz); diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index 5e88e096991..b1b79756ff9 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -22,6 +22,7 @@ #define COBJMACROS #include "amstream_private.h" #include "wine/debug.h" +#include "wine/list.h" #include "wine/strmbase.h" WINE_DEFAULT_DEBUG_CHANNEL(quartz); diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 72aa49847c4..ada017b91a6 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -20,7 +20,6 @@ */ #include "dshow.h" -#include "wine/list.h" HRESULT WINAPI CopyMediaType(AM_MEDIA_TYPE * pDest, const AM_MEDIA_TYPE *pSrc); void WINAPI FreeMediaType(AM_MEDIA_TYPE * pMediaType); -- 2.32.0

Nov. 30, 2021

[PATCH 1/2] strmbase: Remove the no longer used output queue helper.

by Zebediah Figura

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

Nov. 30, 2021

[PATCH 4/4] wined3d: Always set GL_PIXEL_UNPACK_BINDING in glsl_blitter_upload_palette().

by Zebediah Figura

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 4e51402f1cf..327e73796c8 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -12956,6 +12956,9 @@ static void glsl_blitter_upload_palette(struct wined3d_glsl_blitter *blitter, gl_info->gl_ops.gl.p_glTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); gl_info->gl_ops.gl.p_glTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); + GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0)); + checkGLcall("glBindBuffer"); + if (palette) { gl_info->gl_ops.gl.p_glTexImage1D(GL_TEXTURE_1D, 0, GL_RGB, 256, 0, GL_BGRA, -- 2.32.0

Nov. 30, 2021

[PATCH 3/4] wined3d: Always set GL_PIXEL_UNPACK_BINDING in wined3d_texture_gl_allocate_mutable_storage().

by Zebediah Figura

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/texture.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index d4c7082912b..26c35fd84dc 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -947,6 +947,9 @@ static void wined3d_texture_gl_allocate_mutable_storage(struct wined3d_texture_g TRACE("texture_gl %p, layer %u, level %u, target %#x, width %u, height %u.\n", texture_gl, layer, level, target, width, height); + GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0)); + checkGLcall("glBindBuffer"); + if (target == GL_TEXTURE_3D || target == GL_TEXTURE_2D_ARRAY) { depth = wined3d_texture_get_level_depth(&texture_gl->t, level); -- 2.32.0

Nov. 30, 2021