October 2018 - Wine-Commits

Mingcong Bai : po: Update Simplified Chinese translation.
by Alexandre Julliard Oct. 26, 2018

Oct. 26, 2018

Module: wine Branch: master Commit: 099aeb3a00abb432797ba4fcfee64096c04f8d9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=099aeb3a00abb432797ba4fc… Author: Mingcong Bai <jeffbai(a)aosc.xyz> Date: Fri Oct 26 10:20:20 2018 +0800 po: Update Simplified Chinese translation. Signed-off-by: Mingcong Bai <jeffbai(a)aosc.xyz> Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/zh_CN.po | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 2c29aea..3ab5d35 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -5,8 +5,8 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2018-08-30 00:16-0600\n" -"Last-Translator: Zixing Liu <liushuyu011(a)gmail.com>\n" +"PO-Revision-Date: 2018-10-25 11:43-0500\n" +"Last-Translator: Mingcong Bai <jeffbai(a)aosc.xyz>\n" "Language-Team: Chinese (PRC)\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" @@ -296,25 +296,23 @@ msgstr "正在取消..." #: browseui.rc:29 msgid "%1!u! %2 remaining" -msgstr "" +msgstr "剩余 %1!u! %2" #: browseui.rc:30 msgid "%1!u! %2 and %3!u! %4 remaining" -msgstr "" +msgstr "剩余 %1!u! %2 %3!u! %4" #: browseui.rc:31 -#, fuzzy -#| msgid "&Seconds" msgid "seconds" -msgstr "秒(&S)" +msgstr "秒" #: browseui.rc:32 msgid "minutes" -msgstr "" +msgstr "分" #: browseui.rc:33 msgid "hours" -msgstr "" +msgstr "时" #: comctl32.rc:68 winefile.rc:157 msgid "Properties for %s" @@ -10867,10 +10865,8 @@ msgid "Error: Invalid option '%c'.\n" msgstr "错误：无效的选项 '%c'。\n" #: hostname.rc:32 -#, fuzzy -#| msgid "Error: Could not find process \"%1\".\n" msgid "Error: Could not get hostname: %u.\n" -msgstr "错误：找不到进程 \"%1\"。\n" +msgstr "错误：无法获取主机名：%u。\n" #: hostname.rc:33 msgid ""

1 0

Nikolay Sivov : d2d1: Add ID2D1Factory2 stub.
by Alexandre Julliard Oct. 26, 2018

Oct. 26, 2018

Module: wine Branch: master Commit: 926d98ef857e35d315ed0d802a6e5eebf7556299 URL: https://source.winehq.org/git/wine.git/?a=commit;h=926d98ef857e35d315ed0d80… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 25 16:36:50 2018 +0300 d2d1: Add ID2D1Factory2 stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/d2d1_private.h | 2 +- dlls/d2d1/factory.c | 106 ++++++++++++++++++++++++++--------------------- dlls/uuid/d2d.c | 2 +- include/Makefile.in | 1 + include/d2d1_2.idl | 58 ++++++++++++++++++++++++++ 5 files changed, 119 insertions(+), 50 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=926d98ef857e35d315ed…

1 0

Daniel Lehman : kernelbase: Add WaitOnAddress functions.
by Alexandre Julliard Oct. 26, 2018

Oct. 26, 2018

Module: wine Branch: master Commit: 7c430f5b3cef93ac3ce85278ad9253afc81cfc40 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c430f5b3cef93ac3ce85278… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Thu Oct 25 23:50:15 2018 -0700 kernelbase: Add WaitOnAddress functions. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/kernelbase.spec | 6 +- dlls/kernelbase/main.c | 28 ++++++ dlls/kernelbase/tests/Makefile.in | 3 +- dlls/kernelbase/tests/sync.c | 187 ++++++++++++++++++++++++++++++++++++++ include/Makefile.in | 1 + include/synchapi.h | 34 +++++++ include/winbase.h | 1 + 7 files changed, 256 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7c430f5b3cef93ac3ce8…

1 0

Alexandre Julliard : kernel32: Add CreateProcessAsUserA/W.
by Alexandre Julliard Oct. 26, 2018

Oct. 26, 2018

Module: wine Branch: master Commit: 2769bb1e9bbc62998b31465604320d96d038cf58 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2769bb1e9bbc62998b314656… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 26 13:31:08 2018 +0200 kernel32: Add CreateProcessAsUserA/W. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/advapi32.spec | 4 +- dlls/advapi32/security.c | 91 ---------------------- .../api-ms-win-core-processthreads-l1-1-0.spec | 2 +- .../api-ms-win-core-processthreads-l1-1-1.spec | 2 +- .../api-ms-win-core-processthreads-l1-1-2.spec | 2 +- dlls/kernel32/kernel32.spec | 3 +- dlls/kernel32/process.c | 30 +++++++ dlls/kernelbase/kernelbase.spec | 4 +- 8 files changed, 39 insertions(+), 99 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2769bb1e9bbc62998b31…

1 0

Daniel Lehman : ntdll: Implement RtlWaitOnAddress functions.
by Alexandre Julliard Oct. 26, 2018

Oct. 26, 2018

Module: wine Branch: master Commit: 25acfbb40b5316a8c87989d4e61ce9edef2a04aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=25acfbb40b5316a8c87989d4… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Thu Oct 25 23:50:14 2018 -0700 ntdll: Implement RtlWaitOnAddress functions. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 3 ++ dlls/ntdll/sync.c | 49 ++++++++++++++++++++++++++++++ dlls/ntdll/tests/om.c | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++ include/winternl.h | 3 ++ 4 files changed, 137 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 247f05f..818ae00 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -978,6 +978,9 @@ # @ stub RtlValidateUnicodeString @ stdcall RtlVerifyVersionInfo(ptr long int64) @ stdcall -arch=x86_64 RtlVirtualUnwind(long long long ptr ptr ptr ptr ptr) +@ stdcall RtlWaitOnAddress(ptr ptr long ptr) +@ stdcall RtlWakeAddressAll(ptr) +@ stdcall RtlWakeAddressSingle(ptr) @ stdcall RtlWakeAllConditionVariable(ptr) @ stdcall RtlWakeConditionVariable(ptr) @ stub RtlWalkFrameChain diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 4ae8e36..1bfaaab 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -61,6 +61,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(ntdll); HANDLE keyed_event = NULL; +static const LARGE_INTEGER zero_timeout; + static inline int interlocked_dec_if_nonzero( int *dest ) { int val, tmp; @@ -1955,3 +1957,50 @@ NTSTATUS WINAPI RtlSleepConditionVariableSRW( RTL_CONDITION_VARIABLE *variable, RtlAcquireSRWLockExclusive( lock ); return status; } + +/*********************************************************************** + * RtlWaitOnAddress (NTDLL.@) + */ +NTSTATUS WINAPI RtlWaitOnAddress( const void *addr, const void *cmp, SIZE_T size, + const LARGE_INTEGER *timeout ) +{ + switch (size) + { + case 1: + if (*(const UCHAR *)addr != *(const UCHAR *)cmp) + return STATUS_SUCCESS; + break; + case 2: + if (*(const USHORT *)addr != *(const USHORT *)cmp) + return STATUS_SUCCESS; + break; + case 4: + if (*(const ULONG *)addr != *(const ULONG *)cmp) + return STATUS_SUCCESS; + break; + case 8: + if (*(const ULONG64 *)addr != *(const ULONG64 *)cmp) + return STATUS_SUCCESS; + break; + default: + return STATUS_INVALID_PARAMETER; + } + + return NtWaitForKeyedEvent( keyed_event, addr, 0, timeout ); +} + +/*********************************************************************** + * RtlWakeAddressAll (NTDLL.@) + */ +void WINAPI RtlWakeAddressAll( const void *addr ) +{ + while (NtReleaseKeyedEvent( keyed_event, addr, 0, &zero_timeout ) == STATUS_SUCCESS) {} +} + +/*********************************************************************** + * RtlWakeAddressSingle (NTDLL.@) + */ +void WINAPI RtlWakeAddressSingle( const void *addr ) +{ + NtReleaseKeyedEvent( keyed_event, addr, 0, &zero_timeout ); +} diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 5240854..4d879b0 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -70,6 +70,10 @@ static NTSTATUS (WINAPI *pNtReleaseKeyedEvent)( HANDLE, const void *, BOOLEAN, c static NTSTATUS (WINAPI *pNtCreateIoCompletion)(PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES, ULONG); static NTSTATUS (WINAPI *pNtOpenIoCompletion)( PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES ); static NTSTATUS (WINAPI *pNtQueryInformationFile)(HANDLE, PIO_STATUS_BLOCK, void *, ULONG, FILE_INFORMATION_CLASS); +static NTSTATUS (WINAPI *pNtQuerySystemTime)( LARGE_INTEGER * ); +static NTSTATUS (WINAPI *pRtlWaitOnAddress)( const void *, const void *, SIZE_T, const LARGE_INTEGER * ); +static void (WINAPI *pRtlWakeAddressAll)( const void * ); +static void (WINAPI *pRtlWakeAddressSingle)( const void * ); #define KEYEDEVENT_WAIT 0x0001 #define KEYEDEVENT_WAKE 0x0002 @@ -2064,6 +2068,79 @@ static void test_mutant(void) NtClose( mutant ); } +static void test_wait_on_address(void) +{ + DWORD ticks; + SIZE_T size; + NTSTATUS status; + LARGE_INTEGER timeout; + LONG64 address, compare; + + if (!pRtlWaitOnAddress) + { + win_skip("RtlWaitOnAddress not supported, skipping test\n"); + return; + } + + if (0) /* crash on Windows */ + { + pRtlWaitOnAddress(&address, NULL, 8, NULL); + pRtlWaitOnAddress(NULL, &compare, 8, NULL); + pRtlWaitOnAddress(NULL, NULL, 8, NULL); + } + + /* don't crash */ + pRtlWakeAddressSingle(NULL); + pRtlWakeAddressAll(NULL); + + /* invalid values */ + address = 0; + compare = 0; + status = pRtlWaitOnAddress(&address, &compare, 5, NULL); + ok(status == STATUS_INVALID_PARAMETER, "got %x\n", status); + + /* values match */ + address = 0; + compare = 0; + pNtQuerySystemTime(&timeout); + timeout.QuadPart += 100*10000; + ticks = GetTickCount(); + status = pRtlWaitOnAddress(&address, &compare, 8, &timeout); + ticks = GetTickCount() - ticks; + ok(status == STATUS_TIMEOUT, "got 0x%08x\n", status); + ok(ticks >= 100 && ticks <= 1000, "got %u\n", ticks); + ok(address == 0, "got %s\n", wine_dbgstr_longlong(address)); + ok(compare == 0, "got %s\n", wine_dbgstr_longlong(compare)); + + /* different address size */ + for (size = 1; size <= 4; size <<= 1) + { + compare = ~0; + compare <<= size * 8; + + timeout.QuadPart = -100 * 10000; + ticks = GetTickCount(); + status = pRtlWaitOnAddress(&address, &compare, size, &timeout); + ticks = GetTickCount() - ticks; + ok(status == STATUS_TIMEOUT, "got 0x%08x\n", status); + ok(ticks >= 100 && ticks <= 1000, "got %u\n", ticks); + + status = pRtlWaitOnAddress(&address, &compare, size << 1, &timeout); + ok(!status, "got 0x%08x\n", status); + } + address = 0; + compare = 1; + status = pRtlWaitOnAddress(&address, &compare, 8, NULL); + ok(!status, "got 0x%08x\n", status); + + /* no waiters */ + address = 0; + pRtlWakeAddressSingle(&address); + ok(address == 0, "got %s\n", wine_dbgstr_longlong(address)); + pRtlWakeAddressAll(&address); + ok(address == 0, "got %s\n", wine_dbgstr_longlong(address)); +} + START_TEST(om) { HMODULE hntdll = GetModuleHandleA("ntdll.dll"); @@ -2117,6 +2194,10 @@ START_TEST(om) pNtCreateIoCompletion = (void *)GetProcAddress(hntdll, "NtCreateIoCompletion"); pNtOpenIoCompletion = (void *)GetProcAddress(hntdll, "NtOpenIoCompletion"); pNtQueryInformationFile = (void *)GetProcAddress(hntdll, "NtQueryInformationFile"); + pNtQuerySystemTime = (void *)GetProcAddress(hntdll, "NtQuerySystemTime"); + pRtlWaitOnAddress = (void *)GetProcAddress(hntdll, "RtlWaitOnAddress"); + pRtlWakeAddressAll = (void *)GetProcAddress(hntdll, "RtlWakeAddressAll"); + pRtlWakeAddressSingle = (void *)GetProcAddress(hntdll, "RtlWakeAddressSingle"); test_case_sensitive(); test_namespace_pipe(); @@ -2130,4 +2211,5 @@ START_TEST(om) test_mutant(); test_keyed_events(); test_null_device(); + test_wait_on_address(); } diff --git a/include/winternl.h b/include/winternl.h index 1cec3cf..9c88613 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2865,6 +2865,9 @@ NTSYSAPI BOOLEAN WINAPI RtlValidAcl(PACL); NTSYSAPI BOOLEAN WINAPI RtlValidSid(PSID); NTSYSAPI BOOLEAN WINAPI RtlValidateHeap(HANDLE,ULONG,LPCVOID); NTSYSAPI NTSTATUS WINAPI RtlVerifyVersionInfo(const RTL_OSVERSIONINFOEXW*,DWORD,DWORDLONG); +NTSYSAPI NTSTATUS WINAPI RtlWaitOnAddress(const void *,const void *,SIZE_T,const LARGE_INTEGER *); +NTSYSAPI void WINAPI RtlWakeAddressAll(const void *); +NTSYSAPI void WINAPI RtlWakeAddressSingle(const void *); NTSYSAPI void WINAPI RtlWakeAllConditionVariable(RTL_CONDITION_VARIABLE *); NTSYSAPI void WINAPI RtlWakeConditionVariable(RTL_CONDITION_VARIABLE *); NTSYSAPI NTSTATUS WINAPI RtlWalkHeap(HANDLE,PVOID);

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard Oct. 26, 2018

Oct. 26, 2018

Module: wine Branch: master Commit: 3a25235db82601ee5086d936625753ab532b73e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a25235db82601ee5086d936… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Fri Oct 26 09:07:59 2018 +0300 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/po/fi.po b/po/fi.po index db5ed00..0dbeb08 100644 --- a/po/fi.po +++ b/po/fi.po @@ -304,25 +304,23 @@ msgstr "Perutaan..." #: browseui.rc:29 msgid "%1!u! %2 remaining" -msgstr "" +msgstr "%1!u! %2 jäljellä" #: browseui.rc:30 msgid "%1!u! %2 and %3!u! %4 remaining" -msgstr "" +msgstr "%1!u! %2 ja %3!u! %4 jäljellä" #: browseui.rc:31 -#, fuzzy -#| msgid "&Seconds" msgid "seconds" -msgstr "&Sekunnit" +msgstr "sekuntia" #: browseui.rc:32 msgid "minutes" -msgstr "" +msgstr "minuuttia" #: browseui.rc:33 msgid "hours" -msgstr "" +msgstr "tuntia" #: comctl32.rc:68 winefile.rc:157 msgid "Properties for %s" @@ -4586,7 +4584,7 @@ msgstr "Ei voida suorittaa koko ruudulla.\n" #: winerror.mc:1058 msgid "Nonexistent token.\n" -msgstr "Lipuketta ei ole.\n" +msgstr "Tunnusta ei ole.\n" #: winerror.mc:1063 msgid "Registry corrupt.\n" @@ -5298,7 +5296,7 @@ msgstr "Virheellinen ensisijainen ryhmä.\n" #: winerror.mc:1953 msgid "No impersonation token.\n" -msgstr "Ei tekeytymislipuketta.\n" +msgstr "Ei tekeytymistunnusta.\n" #: winerror.mc:1958 msgid "Can't disable mandatory group.\n" @@ -5446,7 +5444,7 @@ msgstr "Tekeytymistaso ei kelpaa.\n" #: winerror.mc:2138 msgid "Can't open anonymous security token.\n" -msgstr "Nimetöntä suojauslipuketta ei voida avata.\n" +msgstr "Ei voida avata nimetöntä suojaustunnusta.\n" #: winerror.mc:2143 msgid "Bad validation class.\n" @@ -5454,7 +5452,7 @@ msgstr "Vahvistusluokka ei kelpaa.\n" #: winerror.mc:2148 msgid "Bad token type.\n" -msgstr "Väärä avaintyyppi.\n" +msgstr "Väärä tunnuksen tyyppi.\n" #: winerror.mc:2153 msgid "No security on object.\n" @@ -11054,10 +11052,8 @@ msgid "Error: Invalid option '%c'.\n" msgstr "Virhe: Virheellinen valinta '%c'.\n" #: hostname.rc:32 -#, fuzzy -#| msgid "Error: Could not find process \"%1\".\n" msgid "Error: Could not get hostname: %u.\n" -msgstr "Virhe: Prosessia \"%1\" ei löytynyt.\n" +msgstr "Virhe: Ei saatu haettua isäntänimeä: %u.\n" #: hostname.rc:33 msgid ""

1 0

Alexandre Julliard : ntdll: Use the default keyed event when the handle is null.
by Alexandre Julliard Oct. 26, 2018

Oct. 26, 2018

Module: wine Branch: master Commit: a0050be13f77d364609306efb815ff8502e332ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0050be13f77d364609306ef… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 26 11:27:11 2018 +0200 ntdll: Use the default keyed event when the handle is null. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/sync.c | 36 +++++++++++++++++++----------------- dlls/ntdll/tests/om.c | 4 ++-- 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 1bfaaab..a00a159 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -1189,6 +1189,7 @@ NTSTATUS WINAPI NtWaitForKeyedEvent( HANDLE handle, const void *key, select_op_t select_op; UINT flags = SELECT_INTERRUPTIBLE; + if (!handle) handle = keyed_event; if ((ULONG_PTR)key & 1) return STATUS_INVALID_PARAMETER_1; if (alertable) flags |= SELECT_ALERTABLE; select_op.keyed_event.op = SELECT_KEYED_EVENT_WAIT; @@ -1206,6 +1207,7 @@ NTSTATUS WINAPI NtReleaseKeyedEvent( HANDLE handle, const void *key, select_op_t select_op; UINT flags = SELECT_INTERRUPTIBLE; + if (!handle) handle = keyed_event; if ((ULONG_PTR)key & 1) return STATUS_INVALID_PARAMETER_1; if (alertable) flags |= SELECT_ALERTABLE; select_op.keyed_event.op = SELECT_KEYED_EVENT_RELEASE; @@ -1524,7 +1526,7 @@ DWORD WINAPI RtlRunOnceBeginInitialize( RTL_RUN_ONCE *once, ULONG flags, void ** next = val & ~3; if (interlocked_cmpxchg_ptr( &once->Ptr, (void *)((ULONG_PTR)&next | 1), (void *)val ) == (void *)val) - NtWaitForKeyedEvent( keyed_event, &next, FALSE, NULL ); + NtWaitForKeyedEvent( 0, &next, FALSE, NULL ); break; case 2: /* done */ @@ -1564,7 +1566,7 @@ DWORD WINAPI RtlRunOnceComplete( RTL_RUN_ONCE *once, ULONG flags, void *context while (val) { ULONG_PTR next = *(ULONG_PTR *)val; - NtReleaseKeyedEvent( keyed_event, (void *)val, FALSE, NULL ); + NtReleaseKeyedEvent( 0, (void *)val, FALSE, NULL ); val = next; } return STATUS_SUCCESS; @@ -1704,12 +1706,12 @@ static inline void srwlock_leave_exclusive( RTL_SRWLOCK *lock, unsigned int val * exclusive access threads they are processed first, followed by * the shared waiters. */ if (val & SRWLOCK_MASK_EXCLUSIVE_QUEUE) - NtReleaseKeyedEvent( keyed_event, srwlock_key_exclusive(lock), FALSE, NULL ); + NtReleaseKeyedEvent( 0, srwlock_key_exclusive(lock), FALSE, NULL ); else { val &= SRWLOCK_MASK_SHARED_QUEUE; /* remove SRWLOCK_MASK_IN_EXCLUSIVE */ while (val--) - NtReleaseKeyedEvent( keyed_event, srwlock_key_shared(lock), FALSE, NULL ); + NtReleaseKeyedEvent( 0, srwlock_key_shared(lock), FALSE, NULL ); } } @@ -1718,7 +1720,7 @@ static inline void srwlock_leave_shared( RTL_SRWLOCK *lock, unsigned int val ) /* Wake up one exclusive thread as soon as the last shared access thread * has left. */ if ((val & SRWLOCK_MASK_EXCLUSIVE_QUEUE) && !(val & SRWLOCK_MASK_SHARED_QUEUE)) - NtReleaseKeyedEvent( keyed_event, srwlock_key_exclusive(lock), FALSE, NULL ); + NtReleaseKeyedEvent( 0, srwlock_key_exclusive(lock), FALSE, NULL ); } /*********************************************************************** @@ -1747,7 +1749,7 @@ void WINAPI RtlInitializeSRWLock( RTL_SRWLOCK *lock ) void WINAPI RtlAcquireSRWLockExclusive( RTL_SRWLOCK *lock ) { if (srwlock_lock_exclusive( (unsigned int *)&lock->Ptr, SRWLOCK_RES_EXCLUSIVE )) - NtWaitForKeyedEvent( keyed_event, srwlock_key_exclusive(lock), FALSE, NULL ); + NtWaitForKeyedEvent( 0, srwlock_key_exclusive(lock), FALSE, NULL ); } /*********************************************************************** @@ -1775,14 +1777,14 @@ void WINAPI RtlAcquireSRWLockShared( RTL_SRWLOCK *lock ) /* Drop exclusive access again and instead requeue for shared access. */ if ((val & SRWLOCK_MASK_EXCLUSIVE_QUEUE) && !(val & SRWLOCK_MASK_IN_EXCLUSIVE)) { - NtWaitForKeyedEvent( keyed_event, srwlock_key_exclusive(lock), FALSE, NULL ); + NtWaitForKeyedEvent( 0, srwlock_key_exclusive(lock), FALSE, NULL ); val = srwlock_unlock_exclusive( (unsigned int *)&lock->Ptr, (SRWLOCK_RES_SHARED - SRWLOCK_RES_EXCLUSIVE) ) - SRWLOCK_RES_EXCLUSIVE; srwlock_leave_exclusive( lock, val ); } if (val & SRWLOCK_MASK_EXCLUSIVE_QUEUE) - NtWaitForKeyedEvent( keyed_event, srwlock_key_shared(lock), FALSE, NULL ); + NtWaitForKeyedEvent( 0, srwlock_key_shared(lock), FALSE, NULL ); } /*********************************************************************** @@ -1866,7 +1868,7 @@ void WINAPI RtlInitializeConditionVariable( RTL_CONDITION_VARIABLE *variable ) void WINAPI RtlWakeConditionVariable( RTL_CONDITION_VARIABLE *variable ) { if (interlocked_dec_if_nonzero( (int *)&variable->Ptr )) - NtReleaseKeyedEvent( keyed_event, &variable->Ptr, FALSE, NULL ); + NtReleaseKeyedEvent( 0, &variable->Ptr, FALSE, NULL ); } /*********************************************************************** @@ -1878,7 +1880,7 @@ void WINAPI RtlWakeAllConditionVariable( RTL_CONDITION_VARIABLE *variable ) { int val = interlocked_xchg( (int *)&variable->Ptr, 0 ); while (val-- > 0) - NtReleaseKeyedEvent( keyed_event, &variable->Ptr, FALSE, NULL ); + NtReleaseKeyedEvent( 0, &variable->Ptr, FALSE, NULL ); } /*********************************************************************** @@ -1903,11 +1905,11 @@ NTSTATUS WINAPI RtlSleepConditionVariableCS( RTL_CONDITION_VARIABLE *variable, R interlocked_xchg_add( (int *)&variable->Ptr, 1 ); RtlLeaveCriticalSection( crit ); - status = NtWaitForKeyedEvent( keyed_event, &variable->Ptr, FALSE, timeout ); + status = NtWaitForKeyedEvent( 0, &variable->Ptr, FALSE, timeout ); if (status != STATUS_SUCCESS) { if (!interlocked_dec_if_nonzero( (int *)&variable->Ptr )) - status = NtWaitForKeyedEvent( keyed_event, &variable->Ptr, FALSE, NULL ); + status = NtWaitForKeyedEvent( 0, &variable->Ptr, FALSE, NULL ); } RtlEnterCriticalSection( crit ); @@ -1944,11 +1946,11 @@ NTSTATUS WINAPI RtlSleepConditionVariableSRW( RTL_CONDITION_VARIABLE *variable, else RtlReleaseSRWLockExclusive( lock ); - status = NtWaitForKeyedEvent( keyed_event, &variable->Ptr, FALSE, timeout ); + status = NtWaitForKeyedEvent( 0, &variable->Ptr, FALSE, timeout ); if (status != STATUS_SUCCESS) { if (!interlocked_dec_if_nonzero( (int *)&variable->Ptr )) - status = NtWaitForKeyedEvent( keyed_event, &variable->Ptr, FALSE, NULL ); + status = NtWaitForKeyedEvent( 0, &variable->Ptr, FALSE, NULL ); } if (flags & RTL_CONDITION_VARIABLE_LOCKMODE_SHARED) @@ -1986,7 +1988,7 @@ NTSTATUS WINAPI RtlWaitOnAddress( const void *addr, const void *cmp, SIZE_T size return STATUS_INVALID_PARAMETER; } - return NtWaitForKeyedEvent( keyed_event, addr, 0, timeout ); + return NtWaitForKeyedEvent( 0, addr, 0, timeout ); } /*********************************************************************** @@ -1994,7 +1996,7 @@ NTSTATUS WINAPI RtlWaitOnAddress( const void *addr, const void *cmp, SIZE_T size */ void WINAPI RtlWakeAddressAll( const void *addr ) { - while (NtReleaseKeyedEvent( keyed_event, addr, 0, &zero_timeout ) == STATUS_SUCCESS) {} + while (NtReleaseKeyedEvent( 0, addr, 0, &zero_timeout ) == STATUS_SUCCESS) {} } /*********************************************************************** @@ -2002,5 +2004,5 @@ void WINAPI RtlWakeAddressAll( const void *addr ) */ void WINAPI RtlWakeAddressSingle( const void *addr ) { - NtReleaseKeyedEvent( keyed_event, addr, 0, &zero_timeout ); + NtReleaseKeyedEvent( 0, addr, 0, &zero_timeout ); } diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 4d879b0..7c61f39 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -1760,10 +1760,10 @@ static void test_keyed_events(void) ok( status == STATUS_TIMEOUT, "NtReleaseKeyedEvent %x\n", status ); status = pNtWaitForKeyedEvent( NULL, (void *)8, 0, &timeout ); - todo_wine ok( status == STATUS_TIMEOUT || broken(status == STATUS_INVALID_HANDLE), /* XP/2003 */ + ok( status == STATUS_TIMEOUT || broken(status == STATUS_INVALID_HANDLE), /* XP/2003 */ "NtWaitForKeyedEvent %x\n", status ); status = pNtReleaseKeyedEvent( NULL, (void *)8, 0, &timeout ); - todo_wine ok( status == STATUS_TIMEOUT || broken(status == STATUS_INVALID_HANDLE), /* XP/2003 */ + ok( status == STATUS_TIMEOUT || broken(status == STATUS_INVALID_HANDLE), /* XP/2003 */ "NtReleaseKeyedEvent %x\n", status ); status = pNtWaitForKeyedEvent( (HANDLE)0xdeadbeef, (void *)9, 0, &timeout );

1 0

Alexandre Julliard : kernel32: Implement CreateProcessInternalA/W.
by Alexandre Julliard Oct. 26, 2018

Oct. 26, 2018

Module: wine Branch: master Commit: cdddf02d0cc180ba5eacee7b1f5774bdebfae02b URL: https://source.winehq.org/git/wine.git/?a=commit;h=cdddf02d0cc180ba5eacee7b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 26 13:24:41 2018 +0200 kernel32: Implement CreateProcessInternalA/W. Based on a patch by Michael Müller. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 4 ++-- dlls/kernel32/process.c | 49 ++++++++++++++++++++++++++++------------- dlls/kernelbase/kernelbase.spec | 4 ++-- include/winbase.h | 3 +++ 4 files changed, 41 insertions(+), 19 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index afd44df..80da9c8 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -314,8 +314,8 @@ # @ stub CreatePrivateNamespaceW @ stdcall CreateProcessA(str str ptr ptr long long ptr str ptr ptr) # @ stub CreateProcessAsUserW -# @ stub CreateProcessInternalA -# @ stub CreateProcessInternalW +@ stdcall CreateProcessInternalA(long str str ptr ptr long long ptr str ptr ptr ptr) +@ stdcall CreateProcessInternalW(long wstr wstr ptr ptr long long ptr wstr ptr ptr ptr) # @ stub CreateProcessInternalWSecure @ stdcall CreateProcessW(wstr wstr ptr ptr long long ptr wstr ptr ptr) @ stdcall CreateRemoteThread(long ptr long ptr long long ptr) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 1490f6d..4d30f3a 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -2660,12 +2660,14 @@ static LPWSTR get_file_name( LPCWSTR appname, LPWSTR cmdline, LPWSTR buffer, return ret; } - -/* Steam hotpatches CreateProcessA and W, so to prevent it from crashing use an internal function */ -static BOOL create_process_impl( LPCWSTR app_name, LPWSTR cmd_line, LPSECURITY_ATTRIBUTES process_attr, - LPSECURITY_ATTRIBUTES thread_attr, BOOL inherit, DWORD flags, - LPVOID env, LPCWSTR cur_dir, LPSTARTUPINFOW startup_info, - LPPROCESS_INFORMATION info ) +/********************************************************************** + * CreateProcessInternalW (KERNEL32.@) + */ +BOOL WINAPI CreateProcessInternalW( HANDLE token, LPCWSTR app_name, LPWSTR cmd_line, + LPSECURITY_ATTRIBUTES process_attr, LPSECURITY_ATTRIBUTES thread_attr, + BOOL inherit, DWORD flags, LPVOID env, LPCWSTR cur_dir, + LPSTARTUPINFOW startup_info, LPPROCESS_INFORMATION info, + HANDLE *new_token ) { BOOL retv = FALSE; HANDLE hFile = 0; @@ -2681,6 +2683,9 @@ static BOOL create_process_impl( LPCWSTR app_name, LPWSTR cmd_line, LPSECURITY_A TRACE("app %s cmdline %s\n", debugstr_w(app_name), debugstr_w(cmd_line) ); + if (token) FIXME("Creating a process with a token is not yet implemented\n"); + if (new_token) FIXME("No support for returning created process token\n"); + if (!(tidy_cmdline = get_file_name( app_name, cmd_line, name, ARRAY_SIZE( name ), &hFile, &is_64bit ))) return FALSE; if (hFile == INVALID_HANDLE_VALUE) goto done; @@ -2798,12 +2803,13 @@ static BOOL create_process_impl( LPCWSTR app_name, LPWSTR cmd_line, LPSECURITY_A /********************************************************************** - * CreateProcessA (KERNEL32.@) + * CreateProcessInternalA (KERNEL32.@) */ -BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessA( LPCSTR app_name, LPSTR cmd_line, LPSECURITY_ATTRIBUTES process_attr, - LPSECURITY_ATTRIBUTES thread_attr, BOOL inherit, - DWORD flags, LPVOID env, LPCSTR cur_dir, - LPSTARTUPINFOA startup_info, LPPROCESS_INFORMATION info ) +BOOL WINAPI CreateProcessInternalA( HANDLE token, LPCSTR app_name, LPSTR cmd_line, + LPSECURITY_ATTRIBUTES process_attr, LPSECURITY_ATTRIBUTES thread_attr, + BOOL inherit, DWORD flags, LPVOID env, LPCSTR cur_dir, + LPSTARTUPINFOA startup_info, LPPROCESS_INFORMATION info, + HANDLE *new_token ) { BOOL ret = FALSE; WCHAR *app_nameW = NULL, *cmd_lineW = NULL, *cur_dirW = NULL; @@ -2827,8 +2833,8 @@ BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessA( LPCSTR app_name, LPSTR cmd_line, L FIXME("StartupInfo.lpReserved is used, please report (%s)\n", debugstr_a(startup_info->lpReserved)); - ret = create_process_impl( app_nameW, cmd_lineW, process_attr, thread_attr, - inherit, flags, env, cur_dirW, &infoW, info ); + ret = CreateProcessInternalW( token, app_nameW, cmd_lineW, process_attr, thread_attr, + inherit, flags, env, cur_dirW, &infoW, info, new_token ); done: HeapFree( GetProcessHeap(), 0, app_nameW ); HeapFree( GetProcessHeap(), 0, cmd_lineW ); @@ -2840,6 +2846,19 @@ done: /********************************************************************** + * CreateProcessA (KERNEL32.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessA( LPCSTR app_name, LPSTR cmd_line, LPSECURITY_ATTRIBUTES process_attr, + LPSECURITY_ATTRIBUTES thread_attr, BOOL inherit, + DWORD flags, LPVOID env, LPCSTR cur_dir, + LPSTARTUPINFOA startup_info, LPPROCESS_INFORMATION info ) +{ + return CreateProcessInternalA( NULL, app_name, cmd_line, process_attr, thread_attr, + inherit, flags, env, cur_dir, startup_info, info, NULL ); +} + + +/********************************************************************** * CreateProcessW (KERNEL32.@) */ BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessW( LPCWSTR app_name, LPWSTR cmd_line, LPSECURITY_ATTRIBUTES process_attr, @@ -2847,8 +2866,8 @@ BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessW( LPCWSTR app_name, LPWSTR cmd_line, LPVOID env, LPCWSTR cur_dir, LPSTARTUPINFOW startup_info, LPPROCESS_INFORMATION info ) { - return create_process_impl( app_name, cmd_line, process_attr, thread_attr, - inherit, flags, env, cur_dir, startup_info, info); + return CreateProcessInternalW( NULL, app_name, cmd_line, process_attr, thread_attr, + inherit, flags, env, cur_dir, startup_info, info, NULL ); } diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index e01f109..d799571 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -208,8 +208,8 @@ @ stdcall CreateProcessA(str str ptr ptr long long ptr str ptr ptr) kernel32.CreateProcessA @ stdcall CreateProcessAsUserA(long str str ptr ptr long long ptr str ptr ptr) advapi32.CreateProcessAsUserA @ stdcall CreateProcessAsUserW(long wstr wstr ptr ptr long long ptr wstr ptr ptr) advapi32.CreateProcessAsUserW -# @ stub CreateProcessInternalA -# @ stub CreateProcessInternalW +@ stdcall CreateProcessInternalA(long str str ptr ptr long long ptr str ptr ptr ptr) kernel32.CreateProcessInternalA +@ stdcall CreateProcessInternalW(long wstr wstr ptr ptr long long ptr wstr ptr ptr ptr) kernel32.CreateProcessInternalW @ stdcall CreateProcessW(wstr wstr ptr ptr long long ptr wstr ptr ptr) kernel32.CreateProcessW @ stdcall CreateRemoteThread(long ptr long ptr long long ptr) kernel32.CreateRemoteThread @ stdcall CreateRemoteThreadEx(long ptr long ptr ptr long ptr ptr) kernel32.CreateRemoteThreadEx diff --git a/include/winbase.h b/include/winbase.h index d4fc108..20c73af 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1865,6 +1865,9 @@ WINBASEAPI BOOL WINAPI CreateProcessW(LPCWSTR,LPWSTR,LPSECURITY_ATTRIBUTE WINADVAPI BOOL WINAPI CreateProcessAsUserA(HANDLE,LPCSTR,LPSTR,LPSECURITY_ATTRIBUTES,LPSECURITY_ATTRIBUTES,BOOL,DWORD,LPVOID,LPCSTR,LPSTARTUPINFOA,LPPROCESS_INFORMATION); WINADVAPI BOOL WINAPI CreateProcessAsUserW(HANDLE,LPCWSTR,LPWSTR,LPSECURITY_ATTRIBUTES,LPSECURITY_ATTRIBUTES,BOOL,DWORD,LPVOID,LPCWSTR,LPSTARTUPINFOW,LPPROCESS_INFORMATION); #define CreateProcessAsUser WINELIB_NAME_AW(CreateProcessAsUser) +WINBASEAPI BOOL WINAPI CreateProcessInternalA(HANDLE,LPCSTR,LPSTR,LPSECURITY_ATTRIBUTES,LPSECURITY_ATTRIBUTES,BOOL,DWORD,LPVOID,LPCSTR,LPSTARTUPINFOA,LPPROCESS_INFORMATION,HANDLE*); +WINBASEAPI BOOL WINAPI CreateProcessInternalW(HANDLE,LPCWSTR,LPWSTR,LPSECURITY_ATTRIBUTES,LPSECURITY_ATTRIBUTES,BOOL,DWORD,LPVOID,LPCWSTR,LPSTARTUPINFOW,LPPROCESS_INFORMATION,HANDLE*); +#define CreateProcessInternal WINELIB_NAME_AW(CreateProcessInternal) WINADVAPI BOOL WINAPI CreateProcessWithLogonW(LPCWSTR,LPCWSTR,LPCWSTR,DWORD,LPCWSTR,LPWSTR,DWORD,LPVOID,LPCWSTR,LPSTARTUPINFOW,LPPROCESS_INFORMATION); WINBASEAPI HANDLE WINAPI CreateRemoteThread(HANDLE,LPSECURITY_ATTRIBUTES,SIZE_T,LPTHREAD_START_ROUTINE,LPVOID,DWORD,LPDWORD); WINBASEAPI HANDLE WINAPI CreateRemoteThreadEx(HANDLE,LPSECURITY_ATTRIBUTES,SIZE_T,LPTHREAD_START_ROUTINE,LPVOID,DWORD,LPPROC_THREAD_ATTRIBUTE_LIST,LPDWORD);

1 0

Henri Verbeet : wined3d: Introduce a separate structure for OpenGL device information.
by Alexandre Julliard Oct. 26, 2018

Oct. 26, 2018

Module: wine Branch: master Commit: 09c4e23ed558599b25d1d599d4360d2c878f809a URL: https://source.winehq.org/git/wine.git/?a=commit;h=09c4e23ed558599b25d1d599… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 26 17:01:06 2018 +0330 wined3d: Introduce a separate structure for OpenGL device information. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 6 +++--- dlls/wined3d/device.c | 6 +++--- dlls/wined3d/directx.c | 12 ++++++------ dlls/wined3d/wined3d_private.h | 16 +++++++++++++--- 4 files changed, 25 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 3d1a483..800634e 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1745,7 +1745,7 @@ static int context_choose_pixel_format(const struct wined3d_device *device, HDC /* Context activation is done by the caller. */ void context_bind_dummy_textures(const struct wined3d_context *context) { - const struct wined3d_dummy_textures *textures = &context->device->dummy_textures; + const struct wined3d_dummy_textures *textures = &wined3d_device_gl(context->device)->dummy_textures; const struct wined3d_gl_info *gl_info = context->gl_info; unsigned int i; @@ -2286,7 +2286,7 @@ BOOL wined3d_adapter_gl_create_context(struct wined3d_context *context, /* If this happens to be the first context for the device, dummy textures * are not created yet. In that case, they will be created (and bound) by * create_dummy_textures right after this context is initialized. */ - if (device->dummy_textures.tex_2d) + if (wined3d_device_gl(device)->dummy_textures.tex_2d) context_bind_dummy_textures(context); /* Initialise all rectangles to avoid resetting unused ones later. */ @@ -2520,7 +2520,7 @@ void context_bind_bo(struct wined3d_context *context, GLenum binding, GLuint nam void context_bind_texture(struct wined3d_context *context, GLenum target, GLuint name) { - const struct wined3d_dummy_textures *textures = &context->device->dummy_textures; + const struct wined3d_dummy_textures *textures = &wined3d_device_gl(context->device)->dummy_textures; const struct wined3d_gl_info *gl_info = context->gl_info; DWORD unit = context->active_texture; DWORD old_texture_type = context->texture_type[unit]; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 17ef5d9..8b202fc 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -523,7 +523,7 @@ ULONG CDECL wined3d_device_decref(struct wined3d_device *device) wined3d_decref(device->wined3d); device->wined3d = NULL; - heap_free(device); + heap_free(wined3d_device_gl(device)); TRACE("Freed device %p.\n", device); } @@ -610,7 +610,7 @@ out: /* Context activation is done by the caller. */ static void create_dummy_textures(struct wined3d_device *device, struct wined3d_context *context) { - struct wined3d_dummy_textures *textures = &device->dummy_textures; + struct wined3d_dummy_textures *textures = &wined3d_device_gl(device)->dummy_textures; const struct wined3d_d3d_info *d3d_info = context->d3d_info; const struct wined3d_gl_info *gl_info = context->gl_info; unsigned int i; @@ -744,7 +744,7 @@ static void create_dummy_textures(struct wined3d_device *device, struct wined3d_ /* Context activation is done by the caller. */ static void destroy_dummy_textures(struct wined3d_device *device, struct wined3d_context *context) { - struct wined3d_dummy_textures *dummy_textures = &device->dummy_textures; + struct wined3d_dummy_textures *dummy_textures = &wined3d_device_gl(device)->dummy_textures; const struct wined3d_gl_info *gl_info = context->gl_info; if (gl_info->supported[ARB_TEXTURE_MULTISAMPLE]) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f4aabb5..e65db79 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2419,7 +2419,7 @@ HRESULT CDECL wined3d_device_create(struct wined3d *wined3d, unsigned int adapte const enum wined3d_feature_level *feature_levels, unsigned int feature_level_count, struct wined3d_device_parent *device_parent, struct wined3d_device **device) { - struct wined3d_device *object; + struct wined3d_device_gl *device_gl; HRESULT hr; TRACE("wined3d %p, adapter_idx %u, device_type %#x, focus_window %p, flags %#x, " @@ -2430,20 +2430,20 @@ HRESULT CDECL wined3d_device_create(struct wined3d *wined3d, unsigned int adapte if (adapter_idx >= wined3d->adapter_count) return WINED3DERR_INVALIDCALL; - if (!(object = heap_alloc_zero(sizeof(*object)))) + if (!(device_gl = heap_alloc_zero(sizeof(*device_gl)))) return E_OUTOFMEMORY; - if (FAILED(hr = device_init(object, wined3d, adapter_idx, + if (FAILED(hr = device_init(&device_gl->d, wined3d, adapter_idx, device_type, focus_window, flags, surface_alignment, feature_levels, feature_level_count, device_parent))) { WARN("Failed to initialize device, hr %#x.\n", hr); - heap_free(object); + heap_free(device_gl); return hr; } - TRACE("Created device %p.\n", object); - *device = object; + TRACE("Created device %p.\n", device_gl); + *device = &device_gl->d; device_parent->ops->wined3d_device_created(device_parent, *device); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 88dce65..3abe5e6 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3029,9 +3029,6 @@ struct wined3d_device /* The Wine logo texture */ struct wined3d_texture *logo_texture; - /* Textures for when no other textures are mapped */ - struct wined3d_dummy_textures dummy_textures; - /* Default sampler used to emulate the direct resource access without using wined3d_sampler */ struct wined3d_sampler *default_sampler; struct wined3d_sampler *null_sampler; @@ -3059,6 +3056,19 @@ void device_resource_add(struct wined3d_device *device, struct wined3d_resource void device_resource_released(struct wined3d_device *device, struct wined3d_resource *resource) DECLSPEC_HIDDEN; void device_invalidate_state(const struct wined3d_device *device, DWORD state) DECLSPEC_HIDDEN; +struct wined3d_device_gl +{ + struct wined3d_device d; + + /* Textures for when no other textures are bound. */ + struct wined3d_dummy_textures dummy_textures; +}; + +static inline struct wined3d_device_gl *wined3d_device_gl(struct wined3d_device *device) +{ + return CONTAINING_RECORD(device, struct wined3d_device_gl, d); +} + static inline BOOL isStateDirty(const struct wined3d_context *context, DWORD state) { DWORD idx = state / (sizeof(*context->isStateDirty) * CHAR_BIT);

1 0

Dmitry Timoshkov : crypt32/tests: Add more tests for CertComparePublicKeyInfo.
by Alexandre Julliard Oct. 26, 2018

Oct. 26, 2018

Module: wine Branch: master Commit: d34dc5fa3ca50a217e196015e996e493dce4ad81 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d34dc5fa3ca50a217e196015… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Oct 26 13:17:21 2018 +0300 crypt32/tests: Add more tests for CertComparePublicKeyInfo. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/tests/cert.c | 63 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 60 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index d6c249c..cc7bd4c 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -3196,9 +3196,12 @@ static void testComparePublicKeyInfo(void) static BYTE bits1[] = { 1, 0 }; static BYTE bits2[] = { 0 }; static BYTE bits3[] = { 1 }; - static BYTE bits4[] = { 0x30,8, 2,1,0x81, 2,3,1,0,1 }; - static BYTE bits5[] = { 0x30,9, 2,2,0,0x81, 2,3,1,0,1 }; - static BYTE bits6[] = { 0x30,9, 2,2,0,0x82, 2,3,1,0,1 }; + static BYTE bits4[] = { 0x30,8, 2,1,0x81, 2,3,1,0,1 }; /* ASN_SEQUENCE */ + static BYTE bits5[] = { 0x30,9, 2,2,0,0x81, 2,3,1,0,1 }; /* ASN_SEQUENCE */ + static BYTE bits6[] = { 0x30,9, 2,2,0,0x82, 2,3,1,0,1 }; /* ASN_SEQUENCE */ + static BYTE bits7[] = { 0x04,8, 2,1,0x81, 2,3,1,0,1 }; /* ASN_OCTETSTRING */ + static BYTE bits8[] = { 0x04,9, 2,2,0,0x81, 2,3,1,0,1 }; /* ASN_OCTETSTRING */ + static BYTE bits9[] = { 0x04,9, 2,2,0,0x82, 2,3,1,0,1 }; /* ASN_OCTETSTRING */ /* crashes ret = CertComparePublicKeyInfo(0, NULL, NULL); @@ -3206,14 +3209,26 @@ static void testComparePublicKeyInfo(void) /* Empty public keys compare */ ret = CertComparePublicKeyInfo(0, &info1, &info2); ok(ret, "CertComparePublicKeyInfo failed: %08x\n", GetLastError()); + ret = CertComparePublicKeyInfo(X509_ASN_ENCODING, &info1, &info2); +todo_wine + ok(ret, "CertComparePublicKeyInfo failed: %08x\n", GetLastError()); + /* Different OIDs appear to compare */ info1.Algorithm.pszObjId = oid_rsa_rsa; info2.Algorithm.pszObjId = oid_rsa_sha1rsa; ret = CertComparePublicKeyInfo(0, &info1, &info2); ok(ret, "CertComparePublicKeyInfo failed: %08x\n", GetLastError()); + ret = CertComparePublicKeyInfo(X509_ASN_ENCODING, &info1, &info2); +todo_wine + ok(ret, "CertComparePublicKeyInfo failed: %08x\n", GetLastError()); + info2.Algorithm.pszObjId = oid_x957_dsa; ret = CertComparePublicKeyInfo(0, &info1, &info2); ok(ret, "CertComparePublicKeyInfo failed: %08x\n", GetLastError()); + ret = CertComparePublicKeyInfo(X509_ASN_ENCODING, &info1, &info2); +todo_wine + ok(ret, "CertComparePublicKeyInfo failed: %08x\n", GetLastError()); + info1.PublicKey.cbData = sizeof(bits1); info1.PublicKey.pbData = bits1; info1.PublicKey.cUnusedBits = 0; @@ -3222,6 +3237,10 @@ static void testComparePublicKeyInfo(void) info2.PublicKey.cUnusedBits = 0; ret = CertComparePublicKeyInfo(0, &info1, &info2); ok(ret, "CertComparePublicKeyInfo failed: %08x\n", GetLastError()); + ret = CertComparePublicKeyInfo(X509_ASN_ENCODING, &info1, &info2); +todo_wine + ok(ret, "CertComparePublicKeyInfo failed: %08x\n", GetLastError()); + info2.Algorithm.pszObjId = oid_rsa_rsa; info1.PublicKey.cbData = sizeof(bits4); info1.PublicKey.pbData = bits4; @@ -3233,6 +3252,7 @@ static void testComparePublicKeyInfo(void) ok(!ret, "CertComparePublicKeyInfo: as raw binary: keys should be unequal\n"); ret = CertComparePublicKeyInfo(X509_ASN_ENCODING, &info1, &info2); ok(ret, "CertComparePublicKeyInfo: as ASN.1 encoded: keys should be equal\n"); + info1.PublicKey.cUnusedBits = 1; info2.PublicKey.cUnusedBits = 5; ret = CertComparePublicKeyInfo(X509_ASN_ENCODING, &info1, &info2); @@ -3252,11 +3272,38 @@ static void testComparePublicKeyInfo(void) ret = CertComparePublicKeyInfo(0, &info1, &info2); /* Simple (non-comparing) case */ ok(!ret, "Expected keys not to compare\n"); + ret = CertComparePublicKeyInfo(X509_ASN_ENCODING, &info1, &info2); + ok(!ret, "Expected keys not to compare\n"); + info2.PublicKey.cbData = sizeof(bits1); info2.PublicKey.pbData = bits1; info2.PublicKey.cUnusedBits = 0; ret = CertComparePublicKeyInfo(0, &info1, &info2); ok(!ret, "Expected keys not to compare\n"); + ret = CertComparePublicKeyInfo(X509_ASN_ENCODING, &info1, &info2); + ok(!ret, "Expected keys not to compare\n"); + + info1.PublicKey.cbData = sizeof(bits7); + info1.PublicKey.pbData = bits7; + info1.PublicKey.cUnusedBits = 0; + info2.PublicKey.cbData = sizeof(bits8); + info2.PublicKey.pbData = bits8; + info2.PublicKey.cUnusedBits = 0; + ret = CertComparePublicKeyInfo(0, &info1, &info2); + ok(!ret, "CertComparePublicKeyInfo: as raw binary: keys should be unequal\n"); + ret = CertComparePublicKeyInfo(X509_ASN_ENCODING, &info1, &info2); + ok(!ret, "CertComparePublicKeyInfo: as ASN.1 encoded: keys should be unequal\n"); + + ret = CertComparePublicKeyInfo(0, &info1, &info1); + ok(ret, "CertComparePublicKeyInfo: as raw binary: keys should be equal\n"); + ret = CertComparePublicKeyInfo(X509_ASN_ENCODING, &info1, &info1); +todo_wine + ok(ret, "CertComparePublicKeyInfo: as ASN.1 encoded: keys should be equal\n"); + info1.PublicKey.cbData--; /* kill one byte, make ASN.1 encoded data invalid */ + ret = CertComparePublicKeyInfo(X509_ASN_ENCODING, &info1, &info1); +todo_wine + ok(ret, "CertComparePublicKeyInfo: as ASN.1 encoded: keys should be equal\n"); + /* ASN.1 encoded non-comparing case */ info1.PublicKey.cbData = sizeof(bits5); info1.PublicKey.pbData = bits5; @@ -3266,6 +3313,16 @@ static void testComparePublicKeyInfo(void) info2.PublicKey.cUnusedBits = 0; ret = CertComparePublicKeyInfo(X509_ASN_ENCODING, &info1, &info2); ok(!ret, "CertComparePublicKeyInfo: different keys should be unequal\n"); + + /* ASN.1 encoded non-comparing case */ + info1.PublicKey.cbData = sizeof(bits8); + info1.PublicKey.pbData = bits8; + info1.PublicKey.cUnusedBits = 0; + info2.PublicKey.cbData = sizeof(bits9); + info2.PublicKey.pbData = bits9; + info2.PublicKey.cUnusedBits = 0; + ret = CertComparePublicKeyInfo(X509_ASN_ENCODING, &info1, &info2); + ok(!ret, "CertComparePublicKeyInfo: different keys should be unequal\n"); } static void testHashPublicKeyInfo(void)

1 0