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

[PATCH 4/4] uiautomationcore: Add UiaRaiseAutomationPropertyChangedEvent stub.
by Mohamad Al-Jaf 29 Nov '21

29 Nov '21

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> --- Note: I'm not sure how Alex Henrie managed to install it in Windows 10 mode because I get the error: "Failed to cache the downloaded installer. Error: 0x800b0109.". In any case, using the offline installer allows it to install in Windows 10 mode, but still requires the function UiaRaiseAutomationPropertyChangedEvent to run. Also, according to MSDN, the VARIANT parameter is not a pointer, but Wine 32-bit fails to compile if it's not set. Likewise, for the FIXME channel, if debugstr_variant is used, Wine 64-bit compiles but 32-bit fails to compile due to the same error: "undefined reference to `UiaRaiseAutomationPropertyChangedEvent(a)16' collect2: error: ld returned 1 exit status". I have no idea why this is happening. --- 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..f2d9d05a999 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 *oldValue, VARIANT *newValue) +{ + FIXME("(%p, %d, %p, %p): stub\n", provider, id, oldValue, newValue); + 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..a5ab714f718 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 ptr ptr) #@ stub UiaRaiseChangesEvent #@ stub UiaRaiseNotificationEvent @ stub UiaRaiseStructureChangedEvent diff --git a/include/uiautomationcoreapi.h b/include/uiautomationcoreapi.h index de486710158..21b6a355fac 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 *oldValue, VARIANT *newValue); void WINAPI UiaRegisterProviderCallback(UiaProviderCallback *pCallback); LRESULT WINAPI UiaReturnRawElementProvider(HWND hwnd, WPARAM wParam, LPARAM lParam, IRawElementProviderSimple *elprov); BOOL WINAPI UiaTextRangeRelease(HUIATEXTRANGE hobj); -- 2.34.1

2 1

[PATCH 3/4] api-ms-win-security-base-l1-2-0: Forward SetCachedSigningLevel to kernelbase.
by Mohamad Al-Jaf 29 Nov '21

29 Nov '21

Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- .../api-ms-win-security-base-l1-2-0.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/api-ms-win-security-base-l1-2-0/api-ms-win-security-base-l1-2-0.spec b/dlls/api-ms-win-security-base-l1-2-0/api-ms-win-security-base-l1-2-0.spec index fc9af375db6..771407fc203 100644 --- a/dlls/api-ms-win-security-base-l1-2-0/api-ms-win-security-base-l1-2-0.spec +++ b/dlls/api-ms-win-security-base-l1-2-0/api-ms-win-security-base-l1-2-0.spec @@ -87,7 +87,7 @@ @ stub QuerySecurityAccessMask @ stdcall RevertToSelf() advapi32.RevertToSelf @ stdcall SetAclInformation(ptr ptr long long) advapi32.SetAclInformation -@ stub SetCachedSigningLevel +@ stdcall SetCachedSigningLevel(ptr long long long) kernelbase.SetCachedSigningLevel @ stdcall SetFileSecurityW(wstr long ptr) advapi32.SetFileSecurityW @ stdcall SetKernelObjectSecurity(long long ptr) advapi32.SetKernelObjectSecurity @ stdcall SetPrivateObjectSecurity(long ptr ptr ptr long) advapi32.SetPrivateObjectSecurity -- 2.34.1

1 0

[PATCH 1/4] kernelbase: Add SetCachedSigningLevel stub.
by Mohamad Al-Jaf 29 Nov '21

29 Nov '21

Fix Microsoft Edge offline installer "ERROR:win_signcache.cc SetCachedSigningLevel method not supported" when running in Windows 10 mode. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/security.c | 9 +++++++++ include/winbase.h | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 55208889c35..f4669ac73c9 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1393,7 +1393,7 @@ @ stdcall SearchPathA(str str str long ptr ptr) @ stdcall SearchPathW(wstr wstr wstr long ptr ptr) @ stdcall SetAclInformation(ptr ptr long long) -# @ stub SetCachedSigningLevel +@ stdcall SetCachedSigningLevel(ptr long long long) @ stdcall SetCalendarInfoW(long long long wstr) # @ stub SetClientDynamicTimeZoneInformation # @ stub SetClientTimeZoneInformation diff --git a/dlls/kernelbase/security.c b/dlls/kernelbase/security.c index 472076cf7fe..3b662854b31 100644 --- a/dlls/kernelbase/security.c +++ b/dlls/kernelbase/security.c @@ -1547,3 +1547,12 @@ BOOL WINAPI SetAclInformation( PACL acl, LPVOID info, DWORD len, ACL_INFORMATION FIXME( "%p %p 0x%08x 0x%08x - stub\n", acl, info, len, class ); return TRUE; } + +/****************************************************************************** + * SetCachedSigningLevel (kernelbase.@) + */ +BOOL WINAPI SetCachedSigningLevel( PHANDLE source, ULONG count, ULONG flags, HANDLE file ) +{ + FIXME( "%p %u %u %p - stub\n", source, count, flags, file ); + return TRUE; +} \ No newline at end of file diff --git a/include/winbase.h b/include/winbase.h index 2928385bde6..8e8a185b4ff 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2611,6 +2611,7 @@ WINBASEAPI DWORD WINAPI SearchPathA(LPCSTR,LPCSTR,LPCSTR,DWORD,LPSTR,LPSTR WINBASEAPI DWORD WINAPI SearchPathW(LPCWSTR,LPCWSTR,LPCWSTR,DWORD,LPWSTR,LPWSTR*); #define SearchPath WINELIB_NAME_AW(SearchPath) WINADVAPI BOOL WINAPI SetAclInformation(PACL,LPVOID,DWORD,ACL_INFORMATION_CLASS); +WINBASEAPI BOOL WINAPI SetCachedSigningLevel(PHANDLE,ULONG,ULONG,HANDLE); WINBASEAPI BOOL WINAPI SetCommConfig(HANDLE,LPCOMMCONFIG,DWORD); WINBASEAPI BOOL WINAPI SetCommBreak(HANDLE); WINBASEAPI BOOL WINAPI SetCommMask(HANDLE,DWORD); -- 2.34.1

1 0

[PATCH] kernelbase: Fix infinite loop in Internal_EnumCalendarInfo.
by Jinoh Kang 28 Nov '21

28 Nov '21

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] make_specfiles: Merge -arch options if there are multiple exports with the same name.
by Piotr Caban 28 Nov '21

28 Nov '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- tools/make_specfiles | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-)

1 0

[PATCH v5 1/6] include: Move WIN32_MEMORY_RANGE_ENTRY from winnt.h to winbase.h.
by Jinoh Kang 28 Nov '21

28 Nov '21

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- include/winbase.h | 6 ++++++ include/winnt.h | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/winbase.h b/include/winbase.h index 2928385bde6..3f987c05fde 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1757,6 +1757,12 @@ typedef struct _WIN32_FIND_STREAM_DATA { WCHAR cStreamName[MAX_PATH + 36]; } WIN32_FIND_STREAM_DATA,*PWIN32_FIND_STREAM_DATA; +typedef struct _WIN32_MEMORY_RANGE_ENTRY +{ + PVOID VirtualAddress; + SIZE_T NumberOfBytes; +} WIN32_MEMORY_RANGE_ENTRY, *PWIN32_MEMORY_RANGE_ENTRY; + WINBASEAPI BOOL WINAPI ActivateActCtx(HANDLE,ULONG_PTR *); WINADVAPI BOOL WINAPI AddAccessAllowedAce(PACL,DWORD,DWORD,PSID); WINADVAPI BOOL WINAPI AddAccessAllowedAceEx(PACL,DWORD,DWORD,DWORD,PSID); diff --git a/include/winnt.h b/include/winnt.h index 2ab74ab123c..3e8a92fc063 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -776,12 +776,6 @@ typedef struct DECLSPEC_ALIGN(8) MEM_EXTENDED_PARAMETER { } DUMMYUNIONNAME; } MEM_EXTENDED_PARAMETER, *PMEM_EXTENDED_PARAMETER; -typedef struct _WIN32_MEMORY_RANGE_ENTRY -{ - PVOID VirtualAddress; - SIZE_T NumberOfBytes; -} WIN32_MEMORY_RANGE_ENTRY, *PWIN32_MEMORY_RANGE_ENTRY; - #define PAGE_NOACCESS 0x01 #define PAGE_READONLY 0x02 #define PAGE_READWRITE 0x04 -- 2.31.1

1 7

[PATCH v3 1/4] ntdll: Add tests for NtCompareObjects.
by Jinoh Kang 28 Nov '21

28 Nov '21

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- dlls/ntdll/tests/om.c | 56 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 250984ebdda..c32136763a1 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -71,6 +71,7 @@ static NTSTATUS (WINAPI *pNtOpenProcessToken)(HANDLE,DWORD,HANDLE*); static NTSTATUS (WINAPI *pNtOpenThreadToken)(HANDLE,DWORD,BOOLEAN,HANDLE*); static NTSTATUS (WINAPI *pNtDuplicateToken)(HANDLE,ACCESS_MASK,OBJECT_ATTRIBUTES*,SECURITY_IMPERSONATION_LEVEL,TOKEN_TYPE,HANDLE*); static NTSTATUS (WINAPI *pNtDuplicateObject)(HANDLE,HANDLE,HANDLE,HANDLE*,ACCESS_MASK,ULONG,ULONG); +static NTSTATUS (WINAPI *pNtCompareObjects)(HANDLE,HANDLE); #define KEYEDEVENT_WAIT 0x0001 #define KEYEDEVENT_WAKE 0x0002 @@ -2446,6 +2447,59 @@ static void test_globalroot(void) pNtClose(h); } +static void test_object_identity(void) +{ + NTSTATUS status; + HANDLE h1, h2; + + if (!pNtCompareObjects) + { + skip("NtCompareObjects is not available.\n"); + return; + } + + status = pNtCompareObjects( GetCurrentProcess(), GetCurrentProcess() ); + ok( status == STATUS_SUCCESS, "comparing GetCurrentProcess() to self failed with %08x\n", status ); + + status = pNtCompareObjects( GetCurrentThread(), GetCurrentThread() ); + ok( status == STATUS_SUCCESS, "comparing GetCurrentThread() to self failed with %08x\n", status ); + + status = pNtCompareObjects( GetCurrentProcess(), GetCurrentThread() ); + ok( status == STATUS_NOT_SAME_OBJECT, "comparing GetCurrentProcess() to GetCurrentThread() returned %08x\n", status ); + + h1 = NULL; + status = pNtDuplicateObject( GetCurrentProcess(), GetCurrentProcess(), GetCurrentProcess(), + &h1, 0, 0, DUPLICATE_SAME_ACCESS ); + ok( status == STATUS_SUCCESS, "failed to duplicate current process handle: %08x\n", status); + + status = pNtCompareObjects( GetCurrentProcess(), h1 ); + ok( status == STATUS_SUCCESS, "comparing GetCurrentProcess() with %p failed with %08x\n", h1, status ); + + pNtClose( h1 ); + + h1 = CreateFileA( "\\\\.\\NUL", GENERIC_ALL, 0, NULL, OPEN_EXISTING, 0, 0 ); + ok( h1 != INVALID_HANDLE_VALUE, "CreateFile failed (%d)\n", GetLastError() ); + + h2 = NULL; + status = pNtDuplicateObject( GetCurrentProcess(), h1, GetCurrentProcess(), + &h2, 0, 0, DUPLICATE_SAME_ACCESS ); + ok( status == STATUS_SUCCESS, "failed to duplicate handle %p: %08x\n", h1, status); + + status = pNtCompareObjects( h1, h2 ); + ok( status == STATUS_SUCCESS, "comparing %p with %p failed with %08x\n", h1, h2, status ); + + pNtClose( h2 ); + + h2 = CreateFileA( "\\\\.\\NUL", GENERIC_ALL, 0, NULL, OPEN_EXISTING, 0, 0 ); + ok( h2 != INVALID_HANDLE_VALUE, "CreateFile failed (%d)\n", GetLastError() ); + + status = pNtCompareObjects( h1, h2 ); + ok( status == STATUS_NOT_SAME_OBJECT, "comparing %p with %p returned %08x\n", h1, h2, status ); + + pNtClose( h2 ); + pNtClose( h1 ); +} + START_TEST(om) { HMODULE hntdll = GetModuleHandleA("ntdll.dll"); @@ -2489,6 +2543,7 @@ START_TEST(om) pNtOpenThreadToken = (void *)GetProcAddress(hntdll, "NtOpenThreadToken"); pNtDuplicateToken = (void *)GetProcAddress(hntdll, "NtDuplicateToken"); pNtDuplicateObject = (void *)GetProcAddress(hntdll, "NtDuplicateObject"); + pNtCompareObjects = (void *)GetProcAddress(hntdll, "NtCompareObjects"); test_case_sensitive(); test_namespace_pipe(); @@ -2505,4 +2560,5 @@ START_TEST(om) test_object_types(); test_get_next_thread(); test_globalroot(); + test_object_identity(); } -- 2.31.1

1 3

[PATCH resend] user16: Fix truncation for 16-bit handles.
by Oleh Nykyforchyn 28 Nov '21

28 Nov '21

When background is erased in a 16 bit app, a handle to DC is passed through USER16 functions, namely CallWindowProc16 (USER.122) and DefDriverProc16 (USER.255), whose respective parameters are of type WPARAM16, hence the upper part of the handle is truncated. Later the returned handle is rejected by get_dc_attr() in GDI32 because its type is 0, although such handles are accepted by handle_entry(). This results in black and not cleared background. If handles are restored with HDC_32(), they pass get_dc_attr() successfully. Based on a patch by Nikolay Sivov. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51899 Signed-off-by: Oleh Nykyforchyn <oleh.nyk(a)gmail.com> --- dlls/user.exe16/message.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/user.exe16/message.c b/dlls/user.exe16/message.c index 93e2cc018bf..eb1d957847a 100644 --- a/dlls/user.exe16/message.c +++ b/dlls/user.exe16/message.c @@ -899,6 +899,9 @@ LRESULT WINPROC_CallProc16To32A( winproc_callback_t callback, HWND16 hwnd, UINT1 case WM_SIZECLIPBOARD: FIXME_(msg)( "message %04x needs translation\n", msg ); break; + case WM_ERASEBKGND: + ret = callback( hwnd32, msg, (WPARAM)HDC_32(wParam), lParam, result, arg ); + break; default: ret = callback( hwnd32, msg, wParam, lParam, result, arg ); break; @@ -1670,6 +1673,14 @@ LRESULT WINAPI DefWindowProc16( HWND16 hwnd16, UINT16 msg, WPARAM16 wParam, LPAR case WM_GETTEXT: case WM_SETTEXT: return DefWindowProcA( hwnd, msg, wParam, (LPARAM)MapSL(lParam) ); + case WM_CTLCOLOR: + if (HIWORD(lParam) <= CTLCOLOR_STATIC) + return DefWindowProcA( hwnd, WM_CTLCOLORMSGBOX + HIWORD(lParam), + (WPARAM)HDC_32(wParam), (LPARAM)WIN_Handle32( LOWORD(lParam) ) ); + else + return 0; + case WM_ERASEBKGND: + return DefWindowProcA( hwnd, msg, (WPARAM)HDC_32(wParam), lParam ); default: return DefWindowProcA( hwnd, msg, wParam, lParam ); } -- 2.33.0

2 5

[PATCH] cmd: Do not set errorlevel when successfully changing a variable.
by Jinoh Kang 28 Nov '21

28 Nov '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52107 Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- programs/cmd/builtins.c | 11 +++-------- programs/cmd/tests/test_builtins.cmd | 3 +++ programs/cmd/tests/test_builtins.cmd.exp | 6 +++--- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index d0a954d90fa..8f4b9ca1498 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -4104,7 +4104,6 @@ void WCMD_setshow_env (WCHAR *s) { LPVOID env; WCHAR *p; - BOOL status; WCHAR string[MAXSTRING]; if (param1[0] == 0x00 && quals[0] == 0x00) { @@ -4189,8 +4188,6 @@ void WCMD_setshow_env (WCHAR *s) { } } else { - DWORD gle; - /* set "var=value"jim ignores anything after the last quote */ if (*s=='\"') { WCHAR *lastquote; @@ -4213,12 +4210,10 @@ void WCMD_setshow_env (WCHAR *s) { if (!*p) p = NULL; WINE_TRACE("set: Setting var '%s' to '%s'\n", wine_dbgstr_w(s), wine_dbgstr_w(p)); - status = SetEnvironmentVariableW(s, p); - gle = GetLastError(); - if ((!status) & (gle == ERROR_ENVVAR_NOT_FOUND)) { + if (!SetEnvironmentVariableW(s, p)) { + WCMD_print_error(); errorlevel = 1; - } else if (!status) WCMD_print_error(); - else if (!interactive) errorlevel = 0; + } } } diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 47b028207ac..2cc96d32ded 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -448,14 +448,17 @@ for /f "delims==" %%i in ('set WINE_ba') do set %%i= for /f "delims==" %%i in ('set WINE_foo') do set %%i= set WINE_FOOBAR 2> nul > nul echo %ErrorLevel% +call :setError 1234567890 set WINE_FOOBAR = baz echo %ErrorLevel% echo %WINE_FOOBAR%WINE_FOOBAR not defined echo %WINE_FOOBAR % set WINE_FOOBAR 2> nul +call :setError 1234567890 set WINE_FOOBAR = baz2 echo %ErrorLevel% echo %WINE_fOObAr % +call :setError 1234567890 set WINE_FOOBAR= bar echo %ErrorLevel% echo %WINE_FOOBAR% diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 4c7bc3e0c02..d32571e5afb 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -445,13 +445,13 @@ q2 q3 ------------ Testing 'set' ------------ 1 -0 +1234567890 WINE_FOOBAR not defined baz WINE_FOOBAR = baz -0 +1234567890 baz2 -0 +1234567890 bar WINE_FOOBAR= bar WINE_FOOBAR = baz2 -- 2.31.1

2 1

[PATCH 1/2] msi/tests: Add test for MsiViewFetch rollover behaviour.
by Jinoh Kang 28 Nov '21

28 Nov '21

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- dlls/msi/tests/db.c | 83 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) Rationale: apparantly some crappy Wix installers iterate over a MSI view *twice*, without calling MsiViewExecute before each iteration. diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index b42cc90a955..7999531b03e 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -9293,6 +9293,88 @@ static void test_view_get_error(void) DeleteFileA(msifile); } +static void test_viewfetch_rollover(void) +{ + MSIHANDLE db = 0, view = 0, rec = 0; + UINT r, i, idset, tries; + const char *query; + + DeleteFileA(msifile); + + /* just MsiOpenDatabase should not create a file */ + r = MsiOpenDatabaseW( msifileW, MSIDBOPEN_CREATE, &db ); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); + + query = "CREATE TABLE `phone` ( " + "`id` INT, `name` CHAR(32), `number` CHAR(32) " + "PRIMARY KEY `id`)"; + r = run_query( db, 0, query ); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); + + query = "INSERT INTO `phone` ( `id`, `name`, `number` )" + "VALUES('1', 'Alan', '5030581')"; + r = run_query( db, 0, query ); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); + + query = "INSERT INTO `phone` ( `id`, `name`, `number` )" + "VALUES('2', 'Barry', '928440')"; + r = run_query( db, 0, query ); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); + + query = "INSERT INTO `phone` ( `id`, `name`, `number` )" + "VALUES('3', 'Cindy', '2937550')"; + r = run_query( db, 0, query ); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); + + query = "SELECT * FROM `phone`"; + r = MsiDatabaseOpenViewA( db, query, &view ); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); + + r = MsiViewExecute( view, 0 ); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); + + for (tries = 0; tries < 3; tries++) + { + winetest_push_context( "Rollover attempt #%d", tries ); + idset = 0; + + for (i = 0; i < 3; i++) + { + winetest_push_context( "Record #%d", i ); + + r = MsiViewFetch( view, &rec ); + todo_wine_if(tries > 0) ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); + if (r != ERROR_SUCCESS) + { + winetest_pop_context(); + break; + } + + r = MsiRecordGetInteger(rec, 1); + ok(r >= 1 && r <= 3, "Expected 1 <= id <= 3, got %d\n", r); + if (r < sizeof(idset) * 8) + { + ok(!(idset & (1 << r)), "Duplicate id %d\n", r); + idset |= 1 << r; + } + + MsiCloseHandle(rec); + + winetest_pop_context(); + } + + r = MsiViewFetch(view, &rec); + ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); + + winetest_pop_context(); + } + + MsiViewClose(view); + MsiCloseHandle(view); + MsiCloseHandle(db); + DeleteFileA(msifile); +} + START_TEST(db) { test_msidatabase(); @@ -9352,4 +9434,5 @@ START_TEST(db) test_viewmodify_merge(); test_viewmodify_insert(); test_view_get_error(); + test_viewfetch_rollover(); } -- 2.31.1

1 2