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

[PATCH] riched20: Implement MSVC asm wrappers.
by Thomas Faber 18 Mar '19

18 Mar '19

Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> --- dlls/riched20/txthost.c | 23 +++++++++++++++++++++++ dlls/riched20/txtsrv.c | 12 ++++++++++++ 2 files changed, 35 insertions(+) diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index eaa6aaef065..d709502a1ec 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -502,6 +502,16 @@ DECLSPEC_HIDDEN HRESULT WINAPI ITextHostImpl_TxGetSelectionBarWidth(ITextHost *i #ifdef __i386__ /* thiscall functions are i386-specific */ #define THISCALL(func) (void *) __thiscall_ ## func +#ifdef _MSC_VER +#define DEFINE_THISCALL_WRAPPER(func,args) \ + __declspec(naked) HRESULT __thiscall_##func(void) \ + { \ + __asm pop eax \ + __asm push ecx \ + __asm push eax \ + __asm jmp func \ + } +#else /* _MSC_VER */ #define DEFINE_THISCALL_WRAPPER(func,args) \ extern HRESULT __thiscall_ ## func(void); \ __ASM_GLOBAL_FUNC(__thiscall_ ## func, \ @@ -509,6 +519,7 @@ DECLSPEC_HIDDEN HRESULT WINAPI ITextHostImpl_TxGetSelectionBarWidth(ITextHost *i "pushl %ecx\n\t" \ "pushl %eax\n\t" \ "jmp " __ASM_NAME(#func) __ASM_STDCALL(args) ) +#endif /* _MSC_VER */ #else /* __i386__ */ @@ -560,6 +571,17 @@ DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetSelectionBarWidth,8) #ifdef __i386__ /* thiscall functions are i386-specific */ #define STDCALL(func) (void *) __stdcall_ ## func +#ifdef _MSC_VER +#define DEFINE_STDCALL_WRAPPER(num,func,args) \ + __declspec(naked) HRESULT __stdcall_##func(void) \ + { \ + __asm pop eax \ + __asm pop ecx \ + __asm push eax \ + __asm mov eax, [ecx] \ + __asm jmp dword ptr [eax + 4*num] \ + } +#else /* _MSC_VER */ #define DEFINE_STDCALL_WRAPPER(num,func,args) \ extern HRESULT __stdcall_ ## func(void); \ __ASM_GLOBAL_FUNC(__stdcall_ ## func, \ @@ -568,6 +590,7 @@ DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetSelectionBarWidth,8) "pushl %eax\n\t" \ "movl (%ecx), %eax\n\t" \ "jmp *(4*(" #num "))(%eax)" ) +#endif /* _MSC_VER */ DEFINE_STDCALL_WRAPPER(3,ITextHostImpl_TxGetDC,4) DEFINE_STDCALL_WRAPPER(4,ITextHostImpl_TxReleaseDC,8) diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index 639a94fbd06..37b866a7f85 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -36,6 +36,16 @@ #ifdef __i386__ /* thiscall functions are i386-specific */ #define THISCALL(func) (void *) __thiscall_ ## func +#ifdef _MSC_VER +#define DEFINE_THISCALL_WRAPPER(func,args) \ + __declspec(naked) HRESULT __thiscall_##func(void) \ + { \ + __asm pop eax \ + __asm push ecx \ + __asm push eax \ + __asm jmp func \ + } +#else /* _MSC_VER */ #define DEFINE_THISCALL_WRAPPER(func,args) \ extern HRESULT __thiscall_ ## func(void); \ __ASM_GLOBAL_FUNC(__thiscall_ ## func, \ @@ -43,6 +53,8 @@ "pushl %ecx\n\t" \ "pushl %eax\n\t" \ "jmp " __ASM_NAME(#func) __ASM_STDCALL(args) ) +#endif /* _MSC_VER */ + #else /* __i386__ */ #define THISCALL(func) func -- 2.16.1.windows.2

2 1

[PATCH v3] kernel32: make GetEnvironmentStringsW returns a copy of the environment
by Jon Doron 18 Mar '19

18 Mar '19

There are certain applications which try to traverse the environement being returned, but this is problematic since they cannot acquire the PEB Lock (i.e cl.exe on Visual Studio 14.15) . To resolve the issue provide a copy of the current environment same as in GetEnvironmentStringsA . Signed-off-by: Jon Doron <arilou(a)gmail.com> --- dlls/kernel32/environ.c | 27 +++++++++++++++++++++++++-- dlls/kernel32/tests/environ.c | 15 +++++++++++++++ 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/environ.c b/dlls/kernel32/environ.c index 99bf706e95..5a5f50340e 100644 --- a/dlls/kernel32/environ.c +++ b/dlls/kernel32/environ.c @@ -139,7 +139,30 @@ LPSTR WINAPI GetEnvironmentStringsA(void) */ LPWSTR WINAPI GetEnvironmentStringsW(void) { - return NtCurrentTeb()->Peb->ProcessParameters->Environment; + LPWSTR ret, ptrW; + unsigned len; + + RtlAcquirePebLock(); + + ptrW = NtCurrentTeb()->Peb->ProcessParameters->Environment; + if (!ptrW || !*ptrW) + { + RtlReleasePebLock(); + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WCHAR) * 2); + } + + while (*ptrW) + ptrW += strlenW(ptrW) + 1; + + len = (ULONG_PTR)ptrW - (ULONG_PTR)NtCurrentTeb()->Peb->ProcessParameters->Environment; + ret = HeapAlloc(GetProcessHeap(), 0, len + sizeof(WCHAR)); + if (ret) { + memcpy(ret, NtCurrentTeb()->Peb->ProcessParameters->Environment, len); + ret[len / 2] = 0; + } + + RtlReleasePebLock(); + return ret; } @@ -157,7 +180,7 @@ BOOL WINAPI FreeEnvironmentStringsA( LPSTR ptr ) */ BOOL WINAPI FreeEnvironmentStringsW( LPWSTR ptr ) { - return TRUE; + return HeapFree( GetProcessHeap(), 0, ptr ); } diff --git a/dlls/kernel32/tests/environ.c b/dlls/kernel32/tests/environ.c index f8452be2ee..4249ea7ebe 100644 --- a/dlls/kernel32/tests/environ.c +++ b/dlls/kernel32/tests/environ.c @@ -554,6 +554,20 @@ static void test_GetComputerNameExW(void) HeapFree(GetProcessHeap(), 0, nameW); } +static void test_GetEnvironmentStringsW(void) +{ + PWCHAR env1; + PWCHAR env2; + + env1 = GetEnvironmentStringsW(); + env2 = GetEnvironmentStringsW(); + ok(env1 != env2 || + broken(env1 == env2), /* NT <= 5.1 */ + "should return different copies\n"); + FreeEnvironmentStringsW(env1); + FreeEnvironmentStringsW(env2); +} + START_TEST(environ) { init_functionpointers(); @@ -565,4 +579,5 @@ START_TEST(environ) test_GetComputerName(); test_GetComputerNameExA(); test_GetComputerNameExW(); + test_GetEnvironmentStringsW(); } -- 2.19.2

1 0

[PATCH 5/5] include: Introduce ascii_toupper and use it in msvcrt.
by Piotr Caban 17 Mar '19

17 Mar '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/file.c | 2 +- dlls/msvcrt/mbcs.c | 6 +++--- include/wine/strings.h | 5 +++++ 3 files changed, 9 insertions(+), 4 deletions(-)

1 0

[PATCH 4/5] include: Introduce ascii_tolower and use it in msvcrt.
by Piotr Caban 17 Mar '19

17 Mar '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/file.c | 5 +++-- dlls/msvcrt/mbcs.c | 6 +++--- dlls/msvcrt/string.c | 22 +++++++++++----------- include/wine/strings.h | 5 +++++ 4 files changed, 22 insertions(+), 16 deletions(-)

1 0

[PATCH 2/5] msvcrt: Use correct locale when comparing strings in getenv.
by Piotr Caban 17 Mar '19

17 Mar '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/environ.c | 2 +- dlls/msvcrt/msvcrt.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-)

1 0

[PATCH 1/5] msvcrt: Correctly set _stat64.st_dev fields in _wstat64.
by Piotr Caban 17 Mar '19

17 Mar '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/file.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

Re: [PATCH v1] kernel32: make GetEnvironmentStringsW returns a copy of the environment
by Nikolay Sivov 17 Mar '19

17 Mar '19

On 3/17/19 6:27 PM, Jon Doron wrote: > Also one thing worth noting how do you want me to code a test for > this? This part in the PEB is opaque > (https://docs.microsoft.com/en-us/windows/desktop/api/winternl/) Just call it two times and compare pointers. > > Thanks, > Jon. > > On Sun, Mar 17, 2019, 17:23 Jon Doron <arilou(a)gmail.com > <mailto:arilou(a)gmail.com>> wrote: > > Hi Nikolay I looked and noticed on XP the behavior is what's > currently in Wine but from NT6 aka Vista it's the new behavior > that I have implemented > > Do you want me to code a test that runs only if it's nt 6 and above? > It should run on both, with one case marked broken() for example. I think the real question is why this has anything to do with PEB lock, if current implementation does not require locking. > > Thanks, > Jon. > > On Sat, Mar 16, 2019, 21:02 Nikolay Sivov <nsivov(a)codeweavers.com > <mailto:nsivov(a)codeweavers.com>> wrote: > > On 3/16/19 9:57 PM, Jon Doron wrote: > > There are certain applications which try to traverse the > environement > > being returned, but this is problematic since they cannot > acquire the > > PEB Lock (i.e cl.exe on Visual Studio 14.15) . To resolve > the issue > > provide a copy of the current environment same as in > > GetEnvironmentStringsA . > Please add a test to confirm this change. >

2 1

Wine staging 4.4 release
by Alistair Leslie-Hughes 17 Mar '19

17 Mar '19

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 4.4 (770 patches are applied to wine vanilla) NOTE: All FAudio patches has been reverted due to the lack of offical package support. This will allow games that require XAudio2 support to still function. Upstreamed (Either directly from staging or fixed with a similar patch). * d3d8: Improve ValidatePixelShader stub. * wmvcore: Implement WMCreateSyncReader. * wmvcore: Implement WMCreateSyncReaderPriv. * iccvid: Fix calculation of stride and size. * msvidc32: Add support for converting 16 bit depth to 24 bit. * msvidc32: Fix calculation of stride and size. * setupapi: Added CM_Request_Device_EjectA/W stub. * setupapi: Add SetupDiInstallDeviceInterfaces. * setupapi: Add SetupDiRegisterCoDeviceInstallers stub. * msidb: Add stub tool for manipulating MSI databases. * msidb: Add support for importing database tables. * msidb: Add support for adding stream/cabinet files to MSI databases. * msi: Add support for deleting streams from an MSI database. * msidb: Add support for removing stream/cabinet files from MSI databases. * msidb: Add support for extracting stream/cabinet files from MSI databases. * msidb: Add support for exporting database tables. * msidb: Add support for exporting with short (DOS) filenames. * msi: Add support for exporting the _SummaryInformation table. * msi: Break out field exporting into a separate routine. * msi: Add support for exporting binary streams (Binary/Icon tables). * msidb: Add support for wildcard (full database) export. Added: * [33018] pdh: Support the 'Processor' object string. Updated: * d3dx9_36-DrawText * wined3d-SWVP-shaders * wined3d-Indexed_Vertex_Blending Where can you help * Run Steam/Battle.net/UPlay. * Try you favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH v2] kernel32: make GetEnvironmentStringsW returns a copy of the environment
by Jon Doron 17 Mar '19

17 Mar '19

There are certain applications which try to traverse the environement being returned, but this is problematic since they cannot acquire the PEB Lock (i.e cl.exe on Visual Studio 14.15) . To resolve the issue provide a copy of the current environment same as in GetEnvironmentStringsA . Signed-off-by: Jon Doron <arilou(a)gmail.com> --- dlls/kernel32/environ.c | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/environ.c b/dlls/kernel32/environ.c index 99bf706e95..5a5f50340e 100644 --- a/dlls/kernel32/environ.c +++ b/dlls/kernel32/environ.c @@ -139,7 +139,30 @@ LPSTR WINAPI GetEnvironmentStringsA(void) */ LPWSTR WINAPI GetEnvironmentStringsW(void) { - return NtCurrentTeb()->Peb->ProcessParameters->Environment; + LPWSTR ret, ptrW; + unsigned len; + + RtlAcquirePebLock(); + + ptrW = NtCurrentTeb()->Peb->ProcessParameters->Environment; + if (!ptrW || !*ptrW) + { + RtlReleasePebLock(); + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WCHAR) * 2); + } + + while (*ptrW) + ptrW += strlenW(ptrW) + 1; + + len = (ULONG_PTR)ptrW - (ULONG_PTR)NtCurrentTeb()->Peb->ProcessParameters->Environment; + ret = HeapAlloc(GetProcessHeap(), 0, len + sizeof(WCHAR)); + if (ret) { + memcpy(ret, NtCurrentTeb()->Peb->ProcessParameters->Environment, len); + ret[len / 2] = 0; + } + + RtlReleasePebLock(); + return ret; } @@ -157,7 +180,7 @@ BOOL WINAPI FreeEnvironmentStringsA( LPSTR ptr ) */ BOOL WINAPI FreeEnvironmentStringsW( LPWSTR ptr ) { - return TRUE; + return HeapFree( GetProcessHeap(), 0, ptr ); } -- 2.19.2

2 1

[PATCH] mfplat/tests: A wording tweak in a win_skip() messages.
by Francois Gouget 16 Mar '19

16 Mar '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/mfplat/tests/mfplat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 38151d90207..3a102e2aa29 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -825,7 +825,7 @@ static void test_MFCreateMFByteStreamOnStream(void) if (hr != S_OK) { - win_skip("Can not retrieve IMFAttributes interface from IMFByteStream\n"); + win_skip("Cannot retrieve IMFAttributes interface from IMFByteStream\n"); IStream_Release(stream); IMFByteStream_Release(bytestream); return; -- 2.20.1

1 0