March 2019 - Wine-Commits - list.winehq.org

Alistair Leslie-Hughes : include: Add more types to ntifs.h.
by Alexandre Julliard March 3, 2019

March 3, 2019

Module: wine Branch: oldstable Commit: 7ca874ad6268c4b2f90b87824d9570a9d22ddf2a URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ca874ad6268c4b2f90b8782… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Mar 21 05:40:17 2018 +0000 include: Add more types to ntifs.h. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 210bb7ddb4e0888a43e66d41b18cba2165fcc3aa) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- include/ddk/ntifs.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/include/ddk/ntifs.h b/include/ddk/ntifs.h index 32c9e30..8c63d0b 100644 --- a/include/ddk/ntifs.h +++ b/include/ddk/ntifs.h @@ -19,8 +19,24 @@ #ifndef __NTIFS_H__ #define __NTIFS_H__ +#include "ntddk.h" + typedef struct _EX_PUSH_LOCK EX_PUSH_LOCK, *PEX_PUSH_LOCK; +typedef enum _FS_FILTER_SECTION_SYNC_TYPE +{ + SyncTypeOther = 0, + SyncTypeCreateSection +} FS_FILTER_SECTION_SYNC_TYPE, *PFS_FILTER_SECTION_SYNC_TYPE; + +typedef struct _FS_FILTER_SECTION_SYNC_OUTPUT +{ + ULONG StructureSize; + ULONG SizeReturned; + ULONG Flags; + ULONG DesiredReadAlignment; +} FS_FILTER_SECTION_SYNC_OUTPUT, *PFS_FILTER_SECTION_SYNC_OUTPUT; + typedef struct _KQUEUE { DISPATCHER_HEADER Header; @@ -30,6 +46,7 @@ typedef struct _KQUEUE LIST_ENTRY ThreadListHead; } KQUEUE, *PKQUEUE, *RESTRICTED_POINTER PRKQUEUE; + NTSTATUS WINAPI ObQueryNameString(PVOID,POBJECT_NAME_INFORMATION,ULONG,PULONG); #endif

1 0

Jactry Zeng : ntoskrnl: Add FsRtlIsNameInExpression stub.
by Alexandre Julliard March 3, 2019

March 3, 2019

Module: wine Branch: oldstable Commit: 63d716ce191824da1b5dc4822b7041eb2b23a31c URL: https://source.winehq.org/git/wine.git/?a=commit;h=63d716ce191824da1b5dc482… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Fri Sep 14 16:59:47 2018 +0800 ntoskrnl: Add FsRtlIsNameInExpression stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=41039 Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c43030b664da2345b4763ea3feb664ac722e1148) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 10 ++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/ntifs.h | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 521350b..5085f27 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1818,6 +1818,16 @@ NTSTATUS WINAPI ExInitializeZone(PZONE_HEADER Zone, } /*********************************************************************** +* FsRtlIsNameInExpression (NTOSKRNL.EXE.@) +*/ +BOOLEAN WINAPI FsRtlIsNameInExpression(PUNICODE_STRING expression, PUNICODE_STRING name, + BOOLEAN ignore, PWCH upcase) +{ + FIXME("stub: %p %p %d %p\n", expression, name, ignore, upcase); + return FALSE; +} + +/*********************************************************************** * FsRtlRegisterUncProvider (NTOSKRNL.EXE.@) */ NTSTATUS WINAPI FsRtlRegisterUncProvider(PHANDLE MupHandle, PUNICODE_STRING RedirDevName, diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 46a1dee..bdf2a9f 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -233,7 +233,7 @@ @ stub FsRtlIsDbcsInExpression @ stub FsRtlIsFatDbcsLegal @ stub FsRtlIsHpfsDbcsLegal -@ stub FsRtlIsNameInExpression +@ stdcall FsRtlIsNameInExpression(ptr ptr long ptr) @ stub FsRtlIsNtstatusExpected @ stub FsRtlIsPagingFile @ stub FsRtlIsTotalDeviceFailure diff --git a/include/ddk/ntifs.h b/include/ddk/ntifs.h index 8c63d0b..8295b4e 100644 --- a/include/ddk/ntifs.h +++ b/include/ddk/ntifs.h @@ -47,6 +47,7 @@ typedef struct _KQUEUE } KQUEUE, *PKQUEUE, *RESTRICTED_POINTER PRKQUEUE; +BOOLEAN WINAPI FsRtlIsNameInExpression(PUNICODE_STRING, PUNICODE_STRING, BOOLEAN, PWCH); NTSTATUS WINAPI ObQueryNameString(PVOID,POBJECT_NAME_INFORMATION,ULONG,PULONG); #endif

1 0

André Hentschel : kernel32: Add stub for SetProcessWorkingSetSizeEx.
by Alexandre Julliard March 3, 2019

March 3, 2019

Module: wine Branch: oldstable Commit: 5f36e93ffd5d2ebd92d19c41992cb56e460fe60d URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f36e93ffd5d2ebd92d19c41… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Sep 16 16:59:21 2018 +0200 kernel32: Add stub for SetProcessWorkingSetSizeEx. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45523 Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7e39544bfa6cf3e68a8567c202624f7f2d3fc7c8) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- .../api-ms-win-core-memory-l1-1-1.spec | 2 +- .../api-ms-win-core-memory-l1-1-2.spec | 2 +- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/process.c | 28 ++++++++++++++++++---- dlls/kernelbase/kernelbase.spec | 2 +- include/winbase.h | 1 + 6 files changed, 28 insertions(+), 9 deletions(-) diff --git a/dlls/api-ms-win-core-memory-l1-1-1/api-ms-win-core-memory-l1-1-1.spec b/dlls/api-ms-win-core-memory-l1-1-1/api-ms-win-core-memory-l1-1-1.spec index 42630c1..3200be9 100644 --- a/dlls/api-ms-win-core-memory-l1-1-1/api-ms-win-core-memory-l1-1-1.spec +++ b/dlls/api-ms-win-core-memory-l1-1-1/api-ms-win-core-memory-l1-1-1.spec @@ -15,7 +15,7 @@ @ stdcall QueryMemoryResourceNotification(ptr ptr) kernel32.QueryMemoryResourceNotification @ stdcall ReadProcessMemory(long ptr ptr long ptr) kernel32.ReadProcessMemory @ stdcall ResetWriteWatch(ptr long) kernel32.ResetWriteWatch -@ stub SetProcessWorkingSetSizeEx +@ stdcall SetProcessWorkingSetSizeEx(long long long long) kernel32.SetProcessWorkingSetSizeEx @ stdcall SetSystemFileCacheSize(long long long) kernel32.SetSystemFileCacheSize @ stdcall UnmapViewOfFile(ptr) kernel32.UnmapViewOfFile @ stub UnmapViewOfFileEx diff --git a/dlls/api-ms-win-core-memory-l1-1-2/api-ms-win-core-memory-l1-1-2.spec b/dlls/api-ms-win-core-memory-l1-1-2/api-ms-win-core-memory-l1-1-2.spec index 6100213..57a5b10 100644 --- a/dlls/api-ms-win-core-memory-l1-1-2/api-ms-win-core-memory-l1-1-2.spec +++ b/dlls/api-ms-win-core-memory-l1-1-2/api-ms-win-core-memory-l1-1-2.spec @@ -21,7 +21,7 @@ @ stdcall ReadProcessMemory(long ptr ptr long ptr) kernel32.ReadProcessMemory @ stub RegisterBadMemoryNotification @ stdcall ResetWriteWatch(ptr long) kernel32.ResetWriteWatch -@ stub SetProcessWorkingSetSizeEx +@ stdcall SetProcessWorkingSetSizeEx(long long long long) kernel32.SetProcessWorkingSetSizeEx @ stdcall SetSystemFileCacheSize(long long long) kernel32.SetSystemFileCacheSize @ stdcall UnmapViewOfFile(ptr) kernel32.UnmapViewOfFile @ stub UnmapViewOfFileEx diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index ada2355..724c9ef 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1432,7 +1432,7 @@ @ stdcall SetProcessShutdownParameters(long long) # @ stub SetProcessUserModeExceptionPolicy @ stdcall SetProcessWorkingSetSize(long long long) -# @ stub SetProcessWorkingSetSizeEx +@ stdcall SetProcessWorkingSetSizeEx(long long long long) @ stdcall SetSearchPathMode(long) @ stdcall SetStdHandle(long long) # @ stub SetStdHandleEx diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index a0817e0..7fdbcfc 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -3419,22 +3419,22 @@ err: /*********************************************************************** - * SetProcessWorkingSetSize [KERNEL32.@] + * SetProcessWorkingSetSizeEx [KERNEL32.@] * Sets the min/max working set sizes for a specified process. * * PARAMS - * hProcess [I] Handle to the process of interest + * process [I] Handle to the process of interest * minset [I] Specifies minimum working set size * maxset [I] Specifies maximum working set size + * flags [I] Flags to enforce working set sizes * * RETURNS * Success: TRUE * Failure: FALSE */ -BOOL WINAPI SetProcessWorkingSetSize(HANDLE hProcess, SIZE_T minset, - SIZE_T maxset) +BOOL WINAPI SetProcessWorkingSetSizeEx(HANDLE process, SIZE_T minset, SIZE_T maxset, DWORD flags) { - WARN("(%p,%ld,%ld): stub - harmless\n",hProcess,minset,maxset); + WARN("(%p,%ld,%ld,%x): stub - harmless\n", process, minset, maxset, flags); if(( minset == (SIZE_T)-1) && (maxset == (SIZE_T)-1)) { /* Trim the working set to zero */ /* Swap the process out of physical RAM */ @@ -3443,6 +3443,24 @@ BOOL WINAPI SetProcessWorkingSetSize(HANDLE hProcess, SIZE_T minset, } /*********************************************************************** + * SetProcessWorkingSetSize [KERNEL32.@] + * Sets the min/max working set sizes for a specified process. + * + * PARAMS + * process [I] Handle to the process of interest + * minset [I] Specifies minimum working set size + * maxset [I] Specifies maximum working set size + * + * RETURNS + * Success: TRUE + * Failure: FALSE + */ +BOOL WINAPI SetProcessWorkingSetSize(HANDLE process, SIZE_T minset, SIZE_T maxset) +{ + return SetProcessWorkingSetSizeEx(process, minset, maxset, 0); +} + +/*********************************************************************** * K32EmptyWorkingSet (KERNEL32.@) */ BOOL WINAPI K32EmptyWorkingSet(HANDLE hProcess) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 3c31d03..cf1f7eb 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1461,7 +1461,7 @@ @ stdcall SetProcessPriorityBoost(long long) kernel32.SetProcessPriorityBoost @ stdcall SetProcessShutdownParameters(long long) kernel32.SetProcessShutdownParameters # @ stub SetProcessValidCallTargets -# @ stub SetProcessWorkingSetSizeEx +@ stdcall SetProcessWorkingSetSizeEx(long long long long) kernel32.SetProcessWorkingSetSizeEx # @ stub SetProtectedPolicy # @ stub SetRoamingLastObservedChangeTime @ stub SetSecurityAccessMask diff --git a/include/winbase.h b/include/winbase.h index e06be3c..b248228 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2560,6 +2560,7 @@ WINBASEAPI BOOL WINAPI SetProcessAffinityMask(HANDLE,DWORD_PTR); WINBASEAPI BOOL WINAPI SetProcessPriorityBoost(HANDLE,BOOL); WINBASEAPI BOOL WINAPI SetProcessShutdownParameters(DWORD,DWORD); WINBASEAPI BOOL WINAPI SetProcessWorkingSetSize(HANDLE,SIZE_T,SIZE_T); +WINBASEAPI BOOL WINAPI SetProcessWorkingSetSizeEx(HANDLE,SIZE_T,SIZE_T,DWORD); WINBASEAPI BOOL WINAPI SetSearchPathMode(DWORD); WINADVAPI BOOL WINAPI SetSecurityDescriptorControl(PSECURITY_DESCRIPTOR,SECURITY_DESCRIPTOR_CONTROL,SECURITY_DESCRIPTOR_CONTROL); WINADVAPI BOOL WINAPI SetSecurityDescriptorDacl(PSECURITY_DESCRIPTOR,BOOL,PACL,BOOL);

1 0

Gijs Vermeulen : msvcr100: Add Concurrency::wait stub.
by Alexandre Julliard March 3, 2019

March 3, 2019

Module: wine Branch: oldstable Commit: c027a45787453954ccc1c11b68cc97cf31efabca URL: https://source.winehq.org/git/wine.git/?a=commit;h=c027a45787453954ccc1c11b… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Thu Sep 6 22:13:04 2018 +0200 msvcr100: Add Concurrency::wait stub. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 58e3ac93ac21c652fe1651c6e1594c0b87672b23) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/concrt140/concrt140.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcrt/lock.c | 10 ++++++++++ 6 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/concrt140/concrt140.spec b/dlls/concrt140/concrt140.spec index 45da73a..c36a3d6 100644 --- a/dlls/concrt140/concrt140.spec +++ b/dlls/concrt140/concrt140.spec @@ -516,7 +516,7 @@ @ cdecl -arch=win64 ?unlock(a)critical_section@Concurrency@@QEAAXXZ(ptr) msvcr120.?unlock(a)critical_section@Concurrency@@QEAAXXZ @ thiscall -arch=win32 ?unlock(a)reader_writer_lock@Concurrency@@QAEXXZ(ptr) msvcr120.?unlock(a)reader_writer_lock@Concurrency@@QAEXXZ @ cdecl -arch=win64 ?unlock(a)reader_writer_lock@Concurrency@@QEAAXXZ(ptr) msvcr120.?unlock(a)reader_writer_lock@Concurrency@@QEAAXXZ -@ stub ?wait(a)Concurrency@@YAXI(a)Z +@ cdecl ?wait(a)Concurrency@@YAXI(a)Z(long) msvcr120.?wait(a)Concurrency@@YAXI(a)Z @ thiscall -arch=i386 ?wait(a)_Condition_variable@details(a)Concurrency@@QAEXAAVcritical_section(a)3@@Z(ptr ptr) msvcr120.?wait(a)_Condition_variable@details(a)Concurrency@@QAEXAAVcritical_section(a)3@@Z @ cdecl -arch=win64 ?wait(a)_Condition_variable@details(a)Concurrency@@QEAAXAEAVcritical_section(a)3@@Z(ptr ptr) msvcr120.?wait(a)_Condition_variable@details(a)Concurrency@@QEAAXAEAVcritical_section(a)3@@Z @ stub -arch=win32 ?wait(a)agent@Concurrency@@SA?AW4agent_status(a)2@PAV12(a)I@Z diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index e707fb7..fc895c2 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -496,7 +496,7 @@ @ thiscall -arch=win32 ?unlock(a)reader_writer_lock@Concurrency@@QAEXXZ(ptr) reader_writer_lock_unlock @ cdecl -arch=win64 ?unlock(a)reader_writer_lock@Concurrency@@QEAAXXZ(ptr) reader_writer_lock_unlock @ cdecl ?vswprintf@@YAHPA_WIPB_WPAD(a)Z(ptr long wstr ptr) MSVCRT_vsnwprintf -@ stub ?wait(a)Concurrency@@YAXI(a)Z +@ cdecl ?wait(a)Concurrency@@YAXI(a)Z(long) Concurrency_wait @ thiscall -arch=win32 ?wait(a)event@Concurrency@@QAEII(a)Z(ptr) event_wait @ cdecl -arch=win64 ?wait(a)event@Concurrency@@QEAA_KI(a)Z(ptr) event_wait @ cdecl -arch=win32 ?wait_for_multiple(a)event@Concurrency@@SAIPAPAV12(a)I_NI@Z(ptr long long long) event_wait_for_multiple diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index fca3683..dee7f05 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -808,7 +808,7 @@ @ thiscall -arch=win32 ?unlock(a)reader_writer_lock@Concurrency@@QAEXXZ(ptr) reader_writer_lock_unlock @ cdecl -arch=win64 ?unlock(a)reader_writer_lock@Concurrency@@QEAAXXZ(ptr) reader_writer_lock_unlock @ cdecl ?vswprintf@@YAHPA_WIPB_WPAD(a)Z(ptr long wstr ptr) MSVCRT_vsnwprintf -@ stub ?wait(a)Concurrency@@YAXI(a)Z +@ cdecl ?wait(a)Concurrency@@YAXI(a)Z(long) Concurrency_wait @ cdecl -arch=arm ?wait(a)_Condition_variable@details(a)Concurrency@@QAAXAAVcritical_section(a)3@@Z(ptr ptr) _Condition_variable_wait @ thiscall -arch=i386 ?wait(a)_Condition_variable@details(a)Concurrency@@QAEXAAVcritical_section(a)3@@Z(ptr ptr) _Condition_variable_wait @ cdecl -arch=win64 ?wait(a)_Condition_variable@details(a)Concurrency@@QEAAXAEAVcritical_section(a)3@@Z(ptr ptr) _Condition_variable_wait diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 109666e..53a99f3 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -790,7 +790,7 @@ @ thiscall -arch=win32 ?unlock(a)reader_writer_lock@Concurrency@@QAEXXZ(ptr) reader_writer_lock_unlock @ cdecl -arch=win64 ?unlock(a)reader_writer_lock@Concurrency@@QEAAXXZ(ptr) reader_writer_lock_unlock @ cdecl ?vswprintf@@YAHPA_WIPB_WPAD(a)Z(ptr long wstr ptr) MSVCRT_vsnwprintf -@ stub ?wait(a)Concurrency@@YAXI(a)Z +@ cdecl ?wait(a)Concurrency@@YAXI(a)Z(long) Concurrency_wait @ cdecl -arch=arm ?wait(a)_Condition_variable@details(a)Concurrency@@QAAXAAVcritical_section(a)3@@Z(ptr ptr) _Condition_variable_wait @ thiscall -arch=i386 ?wait(a)_Condition_variable@details(a)Concurrency@@QAEXAAVcritical_section(a)3@@Z(ptr ptr) _Condition_variable_wait @ cdecl -arch=win64 ?wait(a)_Condition_variable@details(a)Concurrency@@QEAAXAEAVcritical_section(a)3@@Z(ptr ptr) _Condition_variable_wait diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 064aa77..fa5711f 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -786,7 +786,7 @@ @ thiscall -arch=win32 ?unlock(a)reader_writer_lock@Concurrency@@QAEXXZ(ptr) msvcr120.?unlock(a)reader_writer_lock@Concurrency@@QAEXXZ @ cdecl -arch=win64 ?unlock(a)reader_writer_lock@Concurrency@@QEAAXXZ(ptr) msvcr120.?unlock(a)reader_writer_lock@Concurrency@@QEAAXXZ @ cdecl ?vswprintf@@YAHPA_WIPB_WPAD(a)Z(ptr long wstr ptr) msvcr120.?vswprintf@@YAHPA_WIPB_WPAD(a)Z -@ stub ?wait(a)Concurrency@@YAXI(a)Z +@ cdecl ?wait(a)Concurrency@@YAXI(a)Z(long) msvcr120.?wait(a)Concurrency@@YAXI(a)Z @ cdecl -arch=arm ?wait(a)_Condition_variable@details(a)Concurrency@@QAAXAAVcritical_section(a)3@@Z(ptr ptr) msvcr120.?wait(a)_Condition_variable@details(a)Concurrency@@QAAXAAVcritical_section(a)3@@Z @ thiscall -arch=i386 ?wait(a)_Condition_variable@details(a)Concurrency@@QAEXAAVcritical_section(a)3@@Z(ptr ptr) msvcr120.?wait(a)_Condition_variable@details(a)Concurrency@@QAEXAAVcritical_section(a)3@@Z @ cdecl -arch=win64 ?wait(a)_Condition_variable@details(a)Concurrency@@QEAAXAEAVcritical_section(a)3@@Z(ptr ptr) msvcr120.?wait(a)_Condition_variable@details(a)Concurrency@@QEAAXAEAVcritical_section(a)3@@Z diff --git a/dlls/msvcrt/lock.c b/dlls/msvcrt/lock.c index cd094e7..2e0865d 100644 --- a/dlls/msvcrt/lock.c +++ b/dlls/msvcrt/lock.c @@ -1301,6 +1301,16 @@ MSVCRT_bool __thiscall _ReentrantBlockingLock__TryAcquire(_ReentrantBlockingLock TRACE("(%p)\n", this); return TryEnterCriticalSection(&this->cs); } + +/* ?wait(a)Concurrency@@YAXI(a)Z */ +void __cdecl Concurrency_wait(unsigned int time) +{ + static int once; + + if (!once++) FIXME("(%d) stub!\n", time); + + Sleep(time); +} #endif #if _MSVCR_VER == 110

1 0

Louis Lenders : dwmapi: Return S_OK in DwmExtendFrameIntoClientArea.
by Alexandre Julliard March 3, 2019

March 3, 2019

Module: wine Branch: oldstable Commit: d4c170cf54bffb69a86fda58a23bc464fdebefd3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4c170cf54bffb69a86fda58… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Fri Sep 21 18:58:24 2018 +0200 dwmapi: Return S_OK in DwmExtendFrameIntoClientArea. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a1f5a7699e7138a76cb9dc50e3cda1c8c5ffae57) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dwmapi/dwmapi_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index 7ac0b2b..27f4f4f 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -82,7 +82,7 @@ HRESULT WINAPI DwmExtendFrameIntoClientArea(HWND hwnd, const MARGINS* margins) { FIXME("(%p, %p) stub\n", hwnd, margins); - return E_NOTIMPL; + return S_OK; } /**********************************************************************

1 0

Nikolay Sivov : propsys: Add InitPropVariantFromCLSID().
by Alexandre Julliard March 3, 2019

March 3, 2019

Module: wine Branch: oldstable Commit: 7e46c78259c9425ba6b4ae43673f7fcfafca8564 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e46c78259c9425ba6b4ae43… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Sep 16 16:48:41 2018 +0300 propsys: Add InitPropVariantFromCLSID(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45347 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 6fbf6c330b3a9eb038cc380fd1c54199b7ce2e47) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/propsys/propsys.spec | 2 +- dlls/propsys/propvar.c | 13 +++++++++++++ dlls/propsys/tests/propsys.c | 19 +++++++++++++++++++ include/propvarutil.h | 1 + 4 files changed, 34 insertions(+), 1 deletion(-) diff --git a/dlls/propsys/propsys.spec b/dlls/propsys/propsys.spec index db20fd3..bbc7165 100644 --- a/dlls/propsys/propsys.spec +++ b/dlls/propsys/propsys.spec @@ -29,7 +29,7 @@ @ stdcall -private DllUnregisterServer() @ stub InitPropVariantFromBooleanVector @ stdcall InitPropVariantFromBuffer(ptr long ptr) -@ stub InitPropVariantFromCLSID +@ stdcall InitPropVariantFromCLSID(ptr ptr) @ stub InitPropVariantFromDoubleVector @ stub InitPropVariantFromFileTime @ stub InitPropVariantFromFileTimeVector diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index e6d4eba..ae96e4e 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -570,6 +570,19 @@ HRESULT WINAPI InitPropVariantFromBuffer(const VOID *pv, UINT cb, PROPVARIANT *p return S_OK; } +HRESULT WINAPI InitPropVariantFromCLSID(REFCLSID clsid, PROPVARIANT *ppropvar) +{ + TRACE("(%s %p)\n", debugstr_guid(clsid), ppropvar); + + ppropvar->u.puuid = CoTaskMemAlloc(sizeof(*ppropvar->u.puuid)); + if(!ppropvar->u.puuid) + return E_OUTOFMEMORY; + + ppropvar->vt = VT_CLSID; + memcpy(ppropvar->u.puuid, clsid, sizeof(*ppropvar->u.puuid)); + return S_OK; +} + HRESULT WINAPI InitVariantFromBuffer(const VOID *pv, UINT cb, VARIANT *pvar) { SAFEARRAY *arr; diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index a6c7023..3868e67 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -1230,6 +1230,24 @@ static void test_PropVariantChangeType_LPWSTR(void) PropVariantClear(&src); } +static void test_InitPropVariantFromCLSID(void) +{ + PROPVARIANT propvar; + GUID clsid; + HRESULT hr; + + memset(&propvar, 0, sizeof(propvar)); + propvar.vt = VT_I4; + propvar.u.lVal = 15; + + memset(&clsid, 0xcc, sizeof(clsid)); + hr = InitPropVariantFromCLSID(&clsid, &propvar); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(propvar.vt == VT_CLSID, "Unexpected type %d.\n", propvar.vt); + ok(IsEqualGUID(propvar.u.puuid, &clsid), "Unexpected puuid value.\n"); + PropVariantClear(&propvar); +} + START_TEST(propsys) { test_PSStringFromPropertyKey(); @@ -1244,4 +1262,5 @@ START_TEST(propsys) test_PropVariantChangeType_LPWSTR(); test_PropVariantToBoolean(); test_PropVariantToStringWithDefault(); + test_InitPropVariantFromCLSID(); } diff --git a/include/propvarutil.h b/include/propvarutil.h index ced51ec..0285caf 100644 --- a/include/propvarutil.h +++ b/include/propvarutil.h @@ -64,6 +64,7 @@ HRESULT WINAPI PropVariantChangeType(PROPVARIANT *ppropvarDest, REFPROPVARIANT p HRESULT WINAPI InitPropVariantFromGUIDAsString(REFGUID guid, PROPVARIANT *ppropvar); HRESULT WINAPI InitVariantFromGUIDAsString(REFGUID guid, VARIANT *pvar); HRESULT WINAPI InitPropVariantFromBuffer(const VOID *pv, UINT cb, PROPVARIANT *ppropvar); +HRESULT WINAPI InitPropVariantFromCLSID(REFCLSID clsid, PROPVARIANT *ppropvar); HRESULT WINAPI InitVariantFromBuffer(const VOID *pv, UINT cb, VARIANT *pvar); HRESULT WINAPI PropVariantToGUID(const PROPVARIANT *ppropvar, GUID *guid); HRESULT WINAPI VariantToGUID(const VARIANT *pvar, GUID *guid);

1 0

Fabian Maurer : propsys: Add PropVariantToStringWithDefault and tests.
by Alexandre Julliard March 3, 2019

March 3, 2019

Module: wine Branch: oldstable Commit: 8d1218f37a973f0d60c6f904a027283fe4d1ac23 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d1218f37a973f0d60c6f904… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Feb 17 23:33:54 2018 +0100 propsys: Add PropVariantToStringWithDefault and tests. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 8f1e4097bb62f53dc395718b27eef5f86a4fd8a4) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/propsys/propsys.spec | 2 +- dlls/propsys/propvar.c | 18 ++++++++ dlls/propsys/tests/propsys.c | 101 +++++++++++++++++++++++++++++++++++++++++++ include/propvarutil.h | 1 + 4 files changed, 121 insertions(+), 1 deletion(-) diff --git a/dlls/propsys/propsys.spec b/dlls/propsys/propsys.spec index 70f1dcc..db20fd3 100644 --- a/dlls/propsys/propsys.spec +++ b/dlls/propsys/propsys.spec @@ -137,7 +137,7 @@ @ stdcall PropVariantToStringAlloc(ptr ptr) @ stub PropVariantToStringVector @ stub PropVariantToStringVectorAlloc -@ stub PropVariantToStringWithDefault +@ stdcall PropVariantToStringWithDefault(ptr wstr) @ stdcall PropVariantToUInt16(ptr ptr) @ stub PropVariantToUInt16Vector @ stub PropVariantToUInt16VectorAlloc diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index 3e3b502..e6d4eba 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -337,6 +337,24 @@ HRESULT WINAPI PropVariantToStringAlloc(REFPROPVARIANT propvarIn, WCHAR **ret) return hr; } +PCWSTR WINAPI PropVariantToStringWithDefault(REFPROPVARIANT propvarIn, LPCWSTR pszDefault) +{ + static const WCHAR str_empty[] = {0}; + if (propvarIn->vt == VT_BSTR) + { + if (propvarIn->u.bstrVal == NULL) + return str_empty; + + return propvarIn->u.bstrVal; + } + + if (propvarIn->vt == VT_LPWSTR && propvarIn->u.pwszVal != NULL) + return propvarIn->u.pwszVal; + + return pszDefault; +} + + /****************************************************************** * PropVariantChangeType (PROPSYS.@) */ diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index 327c606..a6c7023 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -1094,6 +1094,106 @@ static void test_PropVariantToBoolean(void) ok(val == TRUE, "Unexpected value %d\n", val); } +static void test_PropVariantToStringWithDefault(void) +{ + PROPVARIANT propvar; + static WCHAR default_value[] = {'t', 'e', 's', 't', 0}; + static WCHAR wstr_test2[] = {'t', 'e', 's', 't', '2', 0}; + static WCHAR wstr_empty[] = {0}; + static WCHAR wstr_space[] = {' ', 0}; + static CHAR str_test2[] = "test2"; + static CHAR str_empty[] = ""; + static CHAR str_space[] = " "; + LPCWSTR result; + + propvar.vt = VT_EMPTY; + result = PropVariantToStringWithDefault(&propvar, default_value); + ok(result == default_value, "Unexpected value %s\n", wine_dbgstr_w(result)); + + propvar.vt = VT_NULL; + result = PropVariantToStringWithDefault(&propvar, default_value); + ok(result == default_value, "Unexpected value %s\n", wine_dbgstr_w(result)); + + propvar.vt = VT_BOOL; + propvar.u.boolVal = VARIANT_TRUE; + result = PropVariantToStringWithDefault(&propvar, default_value); + ok(result == default_value, "Unexpected value %s\n", wine_dbgstr_w(result)); + + propvar.vt = VT_I4; + propvar.u.lVal = 15; + result = PropVariantToStringWithDefault(&propvar, default_value); + ok(result == default_value, "Unexpected value %s\n", wine_dbgstr_w(result)); + + /* VT_LPWSTR */ + + propvar.vt = VT_LPWSTR; + propvar.u.pwszVal = NULL; + result = PropVariantToStringWithDefault(&propvar, default_value); + ok(result == default_value, "Unexpected value %s\n", wine_dbgstr_w(result)); + + propvar.vt = VT_LPWSTR; + propvar.u.pwszVal = wstr_empty; + result = PropVariantToStringWithDefault(&propvar, default_value); + ok(result == wstr_empty, "Unexpected value %s\n", wine_dbgstr_w(result)); + + propvar.vt = VT_LPWSTR; + propvar.u.pwszVal = wstr_space; + result = PropVariantToStringWithDefault(&propvar, default_value); + ok(result == wstr_space, "Unexpected value %s\n", wine_dbgstr_w(result)); + + propvar.vt = VT_LPWSTR; + propvar.u.pwszVal = wstr_test2; + result = PropVariantToStringWithDefault(&propvar, default_value); + ok(result == wstr_test2, "Unexpected value %s\n", wine_dbgstr_w(result)); + + /* VT_LPSTR */ + + propvar.vt = VT_LPSTR; + propvar.u.pszVal = NULL; + result = PropVariantToStringWithDefault(&propvar, default_value); + ok(result == default_value, "Unexpected value %s\n", wine_dbgstr_w(result)); + + propvar.vt = VT_LPSTR; + propvar.u.pszVal = str_empty; + result = PropVariantToStringWithDefault(&propvar, default_value); + ok(result == default_value, "Unexpected value %s\n", wine_dbgstr_w(result)); + + propvar.vt = VT_LPSTR; + propvar.u.pszVal = str_space; + result = PropVariantToStringWithDefault(&propvar, default_value); + ok(result == default_value, "Unexpected value %s\n", wine_dbgstr_w(result)); + + propvar.vt = VT_LPSTR; + propvar.u.pszVal = str_test2; + result = PropVariantToStringWithDefault(&propvar, default_value); + ok(result == default_value, "Unexpected value %s\n", wine_dbgstr_w(result)); + + /* VT_BSTR */ + + propvar.vt = VT_BSTR; + propvar.u.bstrVal = NULL; + result = PropVariantToStringWithDefault(&propvar, default_value); + ok(!lstrcmpW(result, wstr_empty), "Unexpected value %s\n", wine_dbgstr_w(result)); + + propvar.vt = VT_BSTR; + propvar.u.bstrVal = SysAllocString(wstr_empty); + result = PropVariantToStringWithDefault(&propvar, default_value); + ok(!lstrcmpW(result, wstr_empty), "Unexpected value %s\n", wine_dbgstr_w(result)); + SysFreeString(propvar.u.bstrVal); + + propvar.vt = VT_BSTR; + propvar.u.bstrVal = SysAllocString(wstr_space); + result = PropVariantToStringWithDefault(&propvar, default_value); + ok(!lstrcmpW(result, wstr_space), "Unexpected value %s\n", wine_dbgstr_w(result)); + SysFreeString(propvar.u.bstrVal); + + propvar.vt = VT_BSTR; + propvar.u.bstrVal = SysAllocString(wstr_test2); + result = PropVariantToStringWithDefault(&propvar, default_value); + ok(!lstrcmpW(result, wstr_test2), "Unexpected value %s\n", wine_dbgstr_w(result)); + SysFreeString(propvar.u.bstrVal); +} + static void test_PropVariantChangeType_LPWSTR(void) { PROPVARIANT dest, src; @@ -1143,4 +1243,5 @@ START_TEST(propsys) test_intconversions(); test_PropVariantChangeType_LPWSTR(); test_PropVariantToBoolean(); + test_PropVariantToStringWithDefault(); } diff --git a/include/propvarutil.h b/include/propvarutil.h index 4dc3521..ced51ec 100644 --- a/include/propvarutil.h +++ b/include/propvarutil.h @@ -77,6 +77,7 @@ HRESULT WINAPI PropVariantToUInt16(REFPROPVARIANT propvarIn, USHORT *ret); HRESULT WINAPI PropVariantToUInt32(REFPROPVARIANT propvarIn, ULONG *ret); HRESULT WINAPI PropVariantToUInt64(REFPROPVARIANT propvarIn, ULONGLONG *ret); HRESULT WINAPI PropVariantToBoolean(REFPROPVARIANT propvarIn, BOOL *ret); +PCWSTR WINAPI PropVariantToStringWithDefault(REFPROPVARIANT propvarIn, LPCWSTR pszDefault); HRESULT WINAPI PropVariantToStringAlloc(REFPROPVARIANT propvarIn, WCHAR **ret);

1 0

Andrew Wesie : wined3d: Remove extraneous flush from EndScene.
by Alexandre Julliard March 3, 2019

March 3, 2019

Module: wine Branch: oldstable Commit: 666f63770fa04b9b8ae60024e144f994dd23734d URL: https://source.winehq.org/git/wine.git/?a=commit;h=666f63770fa04b9b8ae60024… Author: Andrew Wesie <awesie(a)gmail.com> Date: Thu Sep 27 13:40:23 2018 -0500 wined3d: Remove extraneous flush from EndScene. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45724 Signed-off-by: Andrew Wesie <awesie(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 504380a2b3122d7a44c20fd96a12d8309fdf1822) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/device.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d5c12b8..580c507 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3568,8 +3568,6 @@ HRESULT CDECL wined3d_device_end_scene(struct wined3d_device *device) return WINED3DERR_INVALIDCALL; } - wined3d_cs_emit_flush(device->cs); - device->inScene = FALSE; return WINED3D_OK; }

1 0

Alexandre Julliard : Wine release 4.3
by Alexandre Julliard March 1, 2019

March 1, 2019

Module: website Branch: master Commit: 3cc5254e2b51d9d24e8feabe0b7e2568e365f6ad URL: https://source.winehq.org/git/website.git/?a=commit;h=3cc5254e2b51d9d24e8fe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 1 23:42:30 2019 +0100 Wine release 4.3 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2019030101.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2019030101.xml b/news/en/2019030101.xml new file mode 100644 index 0000000..2aa9ddc --- /dev/null +++ b/news/en/2019030101.xml @@ -0,0 +1,16 @@ +<news> +<date>March 1, 2019</date> +<title>Wine 4.3 Released</title> +<body> + The Wine development release 4.3 is now available. + <a href="{$root}/announce/4.3">What's new</a> in this release: +<ul> + <li>Reimplementation of XAudio2 using the FAudio library.</li> + <li>Mono engine updated to the latest upstream.</li> + <li>More modern handling of iconic windows.</li> + <li>Improved handling of kernel objects.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/4.x/wine-4.3.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Michael Stefaniuc : urlmon: Remove useless casts to self.
by Alexandre Julliard March 1, 2019

March 1, 2019

Module: wine Branch: master Commit: 554a804742955c644132dda6ba1480f60e116fb6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=554a804742955c644132dda6… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Feb 28 21:39:47 2019 +0100 urlmon: Remove useless casts to self. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/bindctx.c | 2 +- dlls/urlmon/file.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/bindctx.c b/dlls/urlmon/bindctx.c index 2759f3d..6191751 100644 --- a/dlls/urlmon/bindctx.c +++ b/dlls/urlmon/bindctx.c @@ -45,7 +45,7 @@ static void *get_callback_iface(BindStatusCallback *This, REFIID riid) void *ret; HRESULT hres; - hres = IBindStatusCallback_QueryInterface(This->callback, riid, (void**)&ret); + hres = IBindStatusCallback_QueryInterface(This->callback, riid, &ret); if(FAILED(hres) && This->serv_prov) hres = IServiceProvider_QueryService(This->serv_prov, riid, riid, &ret); diff --git a/dlls/urlmon/file.c b/dlls/urlmon/file.c index 11e6ece..cc1ba81 100644 --- a/dlls/urlmon/file.c +++ b/dlls/urlmon/file.c @@ -434,7 +434,7 @@ HRESULT FileProtocol_Construct(IUnknown *outer, LPVOID *ppobj) ret->file = INVALID_HANDLE_VALUE; ret->priority = 0; ret->ref = 1; - ret->outer = outer ? outer : (IUnknown*)&ret->IUnknown_outer; + ret->outer = outer ? outer : &ret->IUnknown_outer; *ppobj = &ret->IUnknown_outer; return S_OK;

1 0