November 2019 - Wine-Commits

Michael Müller : msvidc32: Add support for converting 16 bit depth to 24 bit.
by Alexandre Julliard Nov. 25, 2019

Nov. 25, 2019

Module: wine Branch: stable Commit: f4cdd561923623521de4e276db7d24e2cfedb529 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4cdd561923623521de4e276… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Mar 6 08:57:39 2019 +0100 msvidc32: Add support for converting 16 bit depth to 24 bit. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=14695 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e287917a3aefbf0f3d882a9096de8f12a2598164) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvfw32/tests/msvfw.c | 5 +++ dlls/msvidc32/msvideo1.c | 91 ++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 84 insertions(+), 12 deletions(-) diff --git a/dlls/msvfw32/tests/msvfw.c b/dlls/msvfw32/tests/msvfw.c index 1791fcf77e..710959a27d 100644 --- a/dlls/msvfw32/tests/msvfw.c +++ b/dlls/msvfw32/tests/msvfw.c @@ -247,6 +247,11 @@ static void test_Locate(void) todo_wine ok(err == ICERR_OK, "Query MSVC->RGB16 height<0: %d\n", err); bo.biHeight = -bo.biHeight; + bo.biBitCount = 24; + err = ICDecompressQuery(h, &bi, &bo); + ok(err == ICERR_OK, "Query MSVC 16->24: %d\n", err); + bo.biBitCount = 16; + bi.biCompression = mmioFOURCC('m','s','v','c'); err = ICDecompressQuery(h, &bi, &bo); ok(err == ICERR_BADFORMAT, "Query msvc->RGB16: %d\n", err); diff --git a/dlls/msvidc32/msvideo1.c b/dlls/msvidc32/msvideo1.c index 5a750d1b3d..9c1323b707 100644 --- a/dlls/msvidc32/msvideo1.c +++ b/dlls/msvidc32/msvideo1.c @@ -67,7 +67,7 @@ typedef BYTE uint8_t; typedef struct Msvideo1Context { DWORD dwMagic; - BOOL mode_8bit; /* if it's not 8-bit, it's 16-bit */ + int depth; } Msvideo1Context; static void @@ -327,8 +327,15 @@ CRAM_DecompressQuery( Msvideo1Context *info, LPBITMAPINFO in, LPBITMAPINFO out ) TRACE("out->bpp = %d\n", out->bmiHeader.biBitCount ); TRACE("out->height = %d\n", out->bmiHeader.biHeight ); TRACE("out->width = %d\n", out->bmiHeader.biWidth ); - if(( in->bmiHeader.biBitCount != out->bmiHeader.biBitCount ) || - ( in->bmiHeader.biPlanes != out->bmiHeader.biPlanes ) || + + if ((in->bmiHeader.biBitCount != out->bmiHeader.biBitCount) && + (in->bmiHeader.biBitCount != 16 || out->bmiHeader.biBitCount != 24)) + { + TRACE("incompatible depth requested\n"); + return ICERR_BADFORMAT; + } + + if(( in->bmiHeader.biPlanes != out->bmiHeader.biPlanes ) || ( in->bmiHeader.biHeight != out->bmiHeader.biHeight ) || ( in->bmiHeader.biWidth != out->bmiHeader.biWidth )) { @@ -376,21 +383,52 @@ static LRESULT CRAM_DecompressBegin( Msvideo1Context *info, LPBITMAPINFO in, LPB TRACE("bitmap is %d bpp\n", in->bmiHeader.biBitCount); if( in->bmiHeader.biBitCount == 8 ) - info->mode_8bit = TRUE; + info->depth = 8; else if( in->bmiHeader.biBitCount == 16 ) - info->mode_8bit = FALSE; + info->depth = 16; else { - info->mode_8bit = FALSE; + info->depth = 0; FIXME("Unsupported output format %i\n", in->bmiHeader.biBitCount); } return ICERR_OK; } +static void convert_depth(char *input, int depth_in, char *output, BITMAPINFOHEADER *out_hdr) +{ + int x, y; + + if (depth_in == 16 && out_hdr->biBitCount == 24) + { + static const unsigned char convert_5to8[] = + { + 0x00, 0x08, 0x10, 0x19, 0x21, 0x29, 0x31, 0x3a, + 0x42, 0x4a, 0x52, 0x5a, 0x63, 0x6b, 0x73, 0x7b, + 0x84, 0x8c, 0x94, 0x9c, 0xa5, 0xad, 0xb5, 0xbd, + 0xc5, 0xce, 0xd6, 0xde, 0xe6, 0xef, 0xf7, 0xff, + }; + + WORD *src = (WORD *)input; + for (y = 0; y < out_hdr->biHeight; y++) + { + for (x = 0; x < out_hdr->biWidth; x++) + { + WORD pixel = *src++; + *output++ = convert_5to8[(pixel & 0x7c00u) >> 10]; + *output++ = convert_5to8[(pixel & 0x03e0u) >> 5]; + *output++ = convert_5to8[(pixel & 0x001fu)]; + } + } + } + else + FIXME("Conversion from %d to %d bit unimplemented\n", depth_in, out_hdr->biBitCount); +} + static LRESULT CRAM_Decompress( Msvideo1Context *info, ICDECOMPRESS *icd, DWORD size ) { LONG width, height, stride, sz; + void *output; TRACE("ICM_DECOMPRESS %p %p %d\n", info, icd, size); @@ -404,15 +442,29 @@ static LRESULT CRAM_Decompress( Msvideo1Context *info, ICDECOMPRESS *icd, DWORD stride = width; /* in bytes or 16bit words */ sz = icd->lpbiInput->biSizeImage; - if (info->mode_8bit) + output = icd->lpOutput; + + if (icd->lpbiOutput->biBitCount != info->depth) + { + output = HeapAlloc(GetProcessHeap(), 0, icd->lpbiOutput->biWidth * icd->lpbiOutput->biHeight * info->depth / 8); + if (!output) return ICERR_MEMORY; + } + + if (info->depth == 8) { msvideo1_decode_8bit( width, height, icd->lpInput, sz, - icd->lpOutput, stride); + output, stride ); } else { msvideo1_decode_16bit( width, height, icd->lpInput, sz, - icd->lpOutput, stride); + output, stride ); + } + + if (icd->lpbiOutput->biBitCount != info->depth) + { + convert_depth(output, info->depth, icd->lpOutput, icd->lpbiOutput); + HeapFree(GetProcessHeap(), 0, output); } return ICERR_OK; @@ -421,6 +473,7 @@ static LRESULT CRAM_Decompress( Msvideo1Context *info, ICDECOMPRESS *icd, DWORD static LRESULT CRAM_DecompressEx( Msvideo1Context *info, ICDECOMPRESSEX *icd, DWORD size ) { LONG width, height, stride, sz; + void *output; TRACE("ICM_DECOMPRESSEX %p %p %d\n", info, icd, size); @@ -434,15 +487,29 @@ static LRESULT CRAM_DecompressEx( Msvideo1Context *info, ICDECOMPRESSEX *icd, DW stride = width; sz = icd->lpbiSrc->biSizeImage; - if (info->mode_8bit) + output = icd->lpDst; + + if (icd->lpbiDst->biBitCount != info->depth) + { + output = HeapAlloc(GetProcessHeap(), 0, icd->lpbiDst->biWidth * icd->lpbiDst->biHeight * info->depth / 8); + if (!output) return ICERR_MEMORY; + } + + if (info->depth == 8) { msvideo1_decode_8bit( width, height, icd->lpSrc, sz, - icd->lpDst, stride); + output, stride ); } else { msvideo1_decode_16bit( width, height, icd->lpSrc, sz, - icd->lpDst, stride); + output, stride ); + } + + if (icd->lpbiDst->biBitCount != info->depth) + { + convert_depth(output, info->depth, icd->lpDst, icd->lpbiDst); + HeapFree(GetProcessHeap(), 0, output); } return ICERR_OK;

1 0

Michael Müller : msvidc32: Fix calculation of stride and size.
by Alexandre Julliard Nov. 25, 2019

Nov. 25, 2019

Module: wine Branch: stable Commit: 7e18c69962862094542c822b7415b90fce921311 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e18c69962862094542c822b… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Mar 6 08:57:40 2019 +0100 msvidc32: Fix calculation of stride and size. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=23175 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=25180 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit fb7f937305f9242c675d4ff9a7976cf121710159) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvfw32/tests/msvfw.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/msvidc32/msvideo1.c | 34 +++++++++++++++++++++++++--------- 2 files changed, 64 insertions(+), 9 deletions(-) diff --git a/dlls/msvfw32/tests/msvfw.c b/dlls/msvfw32/tests/msvfw.c index 710959a27d..80d6f35805 100644 --- a/dlls/msvfw32/tests/msvfw.c +++ b/dlls/msvfw32/tests/msvfw.c @@ -252,6 +252,45 @@ static void test_Locate(void) ok(err == ICERR_OK, "Query MSVC 16->24: %d\n", err); bo.biBitCount = 16; + bi.biWidth = 553; + + bi.biBitCount = 8; + err = ICDecompressGetFormat(h, &bi, &tmp); + ok(err == ICERR_OK, "Query MSVC output format: %d\n", err); + ok(tmp.biBitCount == 8, "Expected 8 bit, got %d bit\n", tmp.biBitCount); + ok(tmp.biWidth == 552, "Expected width 552, got %d\n", tmp.biWidth); + ok(tmp.biSizeImage == get_stride(552, 8) * 8, "Expected size %d, got %d\n", + get_stride(552, 8) * 8, tmp.biSizeImage); + + bi.biBitCount = 15; + err = ICDecompressGetFormat(h, &bi, &tmp); + ok(err == ICERR_BADFORMAT, "Query MSVC output format: %d\n", err); + + bi.biBitCount = 16; + err = ICDecompressGetFormat(h, &bi, &tmp); + ok(err == ICERR_OK, "Query MSVC output format: %d\n", err); + ok(tmp.biBitCount == 16, "Expected 16 bit, got %d bit\n", tmp.biBitCount); + ok(tmp.biWidth == 552, "Expected width 552, got %d\n", tmp.biWidth); + ok(tmp.biSizeImage == get_stride(552, 16) * 8, "Expected size %d, got %d\n", + get_stride(552, 16) * 8, tmp.biSizeImage); + + bi.biBitCount = 24; + err = ICDecompressGetFormat(h, &bi, &tmp); + ok(err == ICERR_BADFORMAT, "Query MSVC output format: %d\n", err); + + bi.biBitCount = 32; + err = ICDecompressGetFormat(h, &bi, &tmp); + ok(err == ICERR_BADFORMAT, "Query MSVC output format: %d\n", err); + + bi.biHeight = 17; + bi.biBitCount = 8; + err = ICDecompressGetFormat(h, &bi, &tmp); + ok(err == ICERR_OK, "Query MSVC output format: %d\n", err); + ok(tmp.biHeight == 16, "Expected height 16, got %d\n", tmp.biHeight); + bi.biHeight = 8; + + bi.biWidth = 32; + bi.biCompression = mmioFOURCC('m','s','v','c'); err = ICDecompressQuery(h, &bi, &bo); ok(err == ICERR_BADFORMAT, "Query msvc->RGB16: %d\n", err); diff --git a/dlls/msvidc32/msvideo1.c b/dlls/msvidc32/msvideo1.c index 9c1323b707..7b866d04ca 100644 --- a/dlls/msvidc32/msvideo1.c +++ b/dlls/msvidc32/msvideo1.c @@ -70,6 +70,11 @@ typedef struct Msvideo1Context { int depth; } Msvideo1Context; +static inline int get_stride(int width, int depth) +{ + return ((depth * width + 31) >> 3) & ~3; +} + static void msvideo1_decode_8bit( int width, int height, const unsigned char *buf, int buf_size, unsigned char *pixels, int stride) @@ -362,12 +367,17 @@ CRAM_DecompressGetFormat( Msvideo1Context *info, LPBITMAPINFO in, LPBITMAPINFO o if (in->bmiHeader.biBitCount <= 8) size += in->bmiHeader.biClrUsed * sizeof(RGBQUAD); + if (in->bmiHeader.biBitCount != 8 && in->bmiHeader.biBitCount != 16) + return ICERR_BADFORMAT; + if( out ) { memcpy( out, in, size ); + out->bmiHeader.biWidth = in->bmiHeader.biWidth & ~1; + out->bmiHeader.biHeight = in->bmiHeader.biHeight & ~1; out->bmiHeader.biCompression = BI_RGB; - out->bmiHeader.biSizeImage = in->bmiHeader.biHeight - * in->bmiHeader.biWidth *4; + out->bmiHeader.biSizeImage = in->bmiHeader.biHeight * + get_stride(out->bmiHeader.biWidth, out->bmiHeader.biBitCount); return ICERR_OK; } @@ -398,6 +408,8 @@ static LRESULT CRAM_DecompressBegin( Msvideo1Context *info, LPBITMAPINFO in, LPB static void convert_depth(char *input, int depth_in, char *output, BITMAPINFOHEADER *out_hdr) { int x, y; + int stride_in = get_stride(out_hdr->biWidth, depth_in); + int stride_out = get_stride(out_hdr->biWidth, out_hdr->biBitCount); if (depth_in == 16 && out_hdr->biBitCount == 24) { @@ -409,15 +421,17 @@ static void convert_depth(char *input, int depth_in, char *output, BITMAPINFOHEA 0xc5, 0xce, 0xd6, 0xde, 0xe6, 0xef, 0xf7, 0xff, }; - WORD *src = (WORD *)input; for (y = 0; y < out_hdr->biHeight; y++) { + WORD *src_row = (WORD *)(input + y * stride_in); + char *out_row = output + y * stride_out; + for (x = 0; x < out_hdr->biWidth; x++) { - WORD pixel = *src++; - *output++ = convert_5to8[(pixel & 0x7c00u) >> 10]; - *output++ = convert_5to8[(pixel & 0x03e0u) >> 5]; - *output++ = convert_5to8[(pixel & 0x001fu)]; + WORD pixel = *src_row++; + *out_row++ = convert_5to8[(pixel & 0x7c00u) >> 10]; + *out_row++ = convert_5to8[(pixel & 0x03e0u) >> 5]; + *out_row++ = convert_5to8[(pixel & 0x001fu)]; } } } @@ -439,7 +453,6 @@ static LRESULT CRAM_Decompress( Msvideo1Context *info, ICDECOMPRESS *icd, DWORD width = icd->lpbiInput->biWidth; height = icd->lpbiInput->biHeight; - stride = width; /* in bytes or 16bit words */ sz = icd->lpbiInput->biSizeImage; output = icd->lpOutput; @@ -452,11 +465,13 @@ static LRESULT CRAM_Decompress( Msvideo1Context *info, ICDECOMPRESS *icd, DWORD if (info->depth == 8) { + stride = get_stride(width, 8); msvideo1_decode_8bit( width, height, icd->lpInput, sz, output, stride ); } else { + stride = get_stride(width, 16) / 2; msvideo1_decode_16bit( width, height, icd->lpInput, sz, output, stride ); } @@ -484,7 +499,6 @@ static LRESULT CRAM_DecompressEx( Msvideo1Context *info, ICDECOMPRESSEX *icd, DW width = icd->lpbiSrc->biWidth; height = icd->lpbiSrc->biHeight; - stride = width; sz = icd->lpbiSrc->biSizeImage; output = icd->lpDst; @@ -497,11 +511,13 @@ static LRESULT CRAM_DecompressEx( Msvideo1Context *info, ICDECOMPRESSEX *icd, DW if (info->depth == 8) { + stride = get_stride(width, 8); msvideo1_decode_8bit( width, height, icd->lpSrc, sz, output, stride ); } else { + stride = get_stride(width, 16) / 2; msvideo1_decode_16bit( width, height, icd->lpSrc, sz, output, stride ); }

1 0

Alex Henrie : ntoskrnl: Add MmIsThisAnNtAsSystem().
by Alexandre Julliard Nov. 25, 2019

Nov. 25, 2019

Module: wine Branch: stable Commit: 08a38b915a22f18104fee8d63a0d24e12c90e96f URL: https://source.winehq.org/git/wine.git/?a=commit;h=08a38b915a22f18104fee8d6… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Aug 1 23:49:33 2019 -0600 ntoskrnl: Add MmIsThisAnNtAsSystem(). This function returns FALSE on all server and non-server versions of Windows since XP except for Windows Server 2003. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47578 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 433c14b06442eaa63d58af2561c96847228f4fb7) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 8 ++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 80321a9879..5958907a1e 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2900,6 +2900,14 @@ PVOID WINAPI MmGetSystemRoutineAddress(PUNICODE_STRING SystemRoutineName) return pFunc; } +/*********************************************************************** + * MmIsThisAnNtAsSystem (NTOSKRNL.EXE.@) + */ +BOOLEAN WINAPI MmIsThisAnNtAsSystem(void) +{ + TRACE("\n"); + return FALSE; +} /*********************************************************************** * MmQuerySystemSize (NTOSKRNL.EXE.@) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index dec60fe61a..c62a79eb0a 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -689,7 +689,7 @@ @ stub MmIsDriverVerifying @ stub MmIsNonPagedSystemAddressValid @ stub MmIsRecursiveIoFault -@ stub MmIsThisAnNtAsSystem +@ stdcall MmIsThisAnNtAsSystem() @ stub MmIsVerifierEnabled @ stub MmLockPagableDataSection @ stub MmLockPagableImageSection

1 0

Ethan Lee : xaudio2: Export functions by ordinal.
by Alexandre Julliard Nov. 25, 2019

Nov. 25, 2019

Module: wine Branch: stable Commit: 0508ac9c792ace1fd3a54f62c792e29d7c9ff020 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0508ac9c792ace1fd3a54f62… Author: Ethan Lee <elee(a)codeweavers.com> Date: Tue Jul 2 11:01:06 2019 -0400 xaudio2: Export functions by ordinal. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47437 Signed-off-by: Ethan Lee <elee(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 92a5299b1d0a0775e1158f334c0348a3ffe8f063) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/xaudio2_8/xaudio2_8.spec | 12 ++++++------ dlls/xaudio2_9/xaudio2_9.spec | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/xaudio2_8/xaudio2_8.spec b/dlls/xaudio2_8/xaudio2_8.spec index 0b9f23866b..78bf05bdb6 100644 --- a/dlls/xaudio2_8/xaudio2_8.spec +++ b/dlls/xaudio2_8/xaudio2_8.spec @@ -1,6 +1,6 @@ -@ stdcall XAudio2Create(ptr long long) -@ stdcall CreateAudioVolumeMeter(ptr) -@ stdcall CreateAudioReverb(ptr) -@ cdecl CreateFX(ptr ptr ptr long) -@ cdecl X3DAudioCalculate(ptr ptr ptr long ptr) -@ cdecl X3DAudioInitialize(long float ptr) +1 stdcall -ordinal XAudio2Create(ptr long long) +2 stdcall -ordinal CreateAudioReverb(ptr) +3 stdcall -ordinal CreateAudioVolumeMeter(ptr) +4 cdecl -ordinal CreateFX(ptr ptr ptr long) +5 cdecl -ordinal X3DAudioCalculate(ptr ptr ptr long ptr) +6 cdecl -ordinal X3DAudioInitialize(long float ptr) diff --git a/dlls/xaudio2_9/xaudio2_9.spec b/dlls/xaudio2_9/xaudio2_9.spec index 0b9f23866b..78bf05bdb6 100644 --- a/dlls/xaudio2_9/xaudio2_9.spec +++ b/dlls/xaudio2_9/xaudio2_9.spec @@ -1,6 +1,6 @@ -@ stdcall XAudio2Create(ptr long long) -@ stdcall CreateAudioVolumeMeter(ptr) -@ stdcall CreateAudioReverb(ptr) -@ cdecl CreateFX(ptr ptr ptr long) -@ cdecl X3DAudioCalculate(ptr ptr ptr long ptr) -@ cdecl X3DAudioInitialize(long float ptr) +1 stdcall -ordinal XAudio2Create(ptr long long) +2 stdcall -ordinal CreateAudioReverb(ptr) +3 stdcall -ordinal CreateAudioVolumeMeter(ptr) +4 cdecl -ordinal CreateFX(ptr ptr ptr long) +5 cdecl -ordinal X3DAudioCalculate(ptr ptr ptr long ptr) +6 cdecl -ordinal X3DAudioInitialize(long float ptr)

1 0

Zebediah Figura : msi: Close all handles opened by a custom action thread.
by Alexandre Julliard Nov. 25, 2019

Nov. 25, 2019

Module: wine Branch: stable Commit: a2ea837849c2920b7cd5a8e2ffc31ff1c1393fcb URL: https://source.winehq.org/git/wine.git/?a=commit;h=a2ea837849c2920b7cd5a8e2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jun 30 17:14:18 2019 -0500 msi: Close all handles opened by a custom action thread. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47418 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e4e7e956bd93f0ffd597a041a58c82c02c811ac0) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msi/custom.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 3cb0f3170a..650dea9f7a 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -580,7 +580,8 @@ UINT CDECL __wine_msi_call_dll_function(const GUID *guid) midl_user_free(dll); midl_user_free(proc); - MsiCloseHandle(hPackage); + + MsiCloseAllHandles(); return r; }

1 0

Dmitry Timoshkov : msvcrt: Fix handling of dst == src in wcscpy_s.
by Alexandre Julliard Nov. 25, 2019

Nov. 25, 2019

Module: wine Branch: stable Commit: aa2bc9536219a34b09768aaac1959bd5f46056fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa2bc9536219a34b09768aaa… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jun 24 11:49:34 2019 +0800 msvcrt: Fix handling of dst == src in wcscpy_s. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 9ade30d0ce7f107e775c72e628ff6e4444b9bdf4) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/tests/string.c | 5 +++++ dlls/msvcrt/wcs.c | 13 +++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 9a1149dcb6..79a502bca9 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -1020,6 +1020,11 @@ static void test_wcscpy_s(void) ok(ret == 0, "expected 0 got %d\n", ret); ok(lstrcmpW(szDest, szLongText) == 0, "szDest != szLongText\n"); + /* dest == source */ + ret = p_wcscpy_s(szDest, 18, szDest); + ok(ret == 0, "expected 0 got %d\n", ret); + ok(lstrcmpW(szDest, szLongText) == 0, "szDest != szLongText\n"); + /* Copy smaller buffer size */ errno = EBADF; szDest[0] = 'A'; diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index dc5419cb72..b352bf7a88 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -2041,16 +2041,21 @@ INT CDECL MSVCRT_wcscpy_s( MSVCRT_wchar_t* wcDest, MSVCRT_size_t numElement, con if(!MSVCRT_CHECK_PMT(wcDest)) return MSVCRT_EINVAL; if(!MSVCRT_CHECK_PMT(numElement)) return MSVCRT_EINVAL; - wcDest[0] = 0; - - if(!MSVCRT_CHECK_PMT(wcSrc)) return MSVCRT_EINVAL; + if(!MSVCRT_CHECK_PMT(wcSrc)) + { + wcDest[0] = 0; + return MSVCRT_EINVAL; + } size = strlenW(wcSrc) + 1; if(!MSVCRT_CHECK_PMT_ERR(size <= numElement, MSVCRT_ERANGE)) + { + wcDest[0] = 0; return MSVCRT_ERANGE; + } - memcpy( wcDest, wcSrc, size*sizeof(WCHAR) ); + memmove( wcDest, wcSrc, size*sizeof(WCHAR) ); return 0; }

1 0

Henri Verbeet : wined3d: Handle Windows 8.1 in wined3d_driver_info_init().
by Alexandre Julliard Nov. 25, 2019

Nov. 25, 2019

Module: wine Branch: stable Commit: 508b45c46372a088d4f2c37be4c8834810829d42 URL: https://source.winehq.org/git/wine.git/?a=commit;h=508b45c46372a088d4f2c37b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 26 15:24:23 2019 +0430 wined3d: Handle Windows 8.1 in wined3d_driver_info_init(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 0bcb2de66a3d98a291c1e432b1a9c88c17def4b6) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/directx.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 51320e6588..329ef0c37c 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -113,11 +113,13 @@ ULONG CDECL wined3d_decref(struct wined3d *wined3d) * The driver version has the form "x.y.z.w". * * "x" is the Windows version the driver is meant for: - * 4 -> 95/98/NT4 - * 5 -> 2000 - * 6 -> 2000/XP - * 7 -> Vista - * 8 -> Win 7 + * 4 -> 95/98/NT4 + * 5 -> 2000 + * 6 -> 2000/XP + * 7 -> Vista + * 8 -> Windows 7 + * 9 -> Windows 8 + * 10 -> Windows 10 * * "y" is the maximum Direct3D version the driver supports. * y -> d3d version mapping: @@ -549,7 +551,7 @@ void wined3d_driver_info_init(struct wined3d_driver_info *driver_info, } else { - if (os_version.dwMinorVersion > 2) + if (os_version.dwMinorVersion > 3) { FIXME("Unhandled OS version %u.%u, reporting Win 8.\n", os_version.dwMajorVersion, os_version.dwMinorVersion);

1 0

Alistair Leslie-Hughes : winebus.sys: Increase buffer size to match max length available.
by Alexandre Julliard Nov. 25, 2019

Nov. 25, 2019

Module: wine Branch: stable Commit: ba957cd2e4d0b4e06faeb9a822414fc69473ed26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba957cd2e4d0b4e06faeb9a8… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jun 28 05:20:59 2019 +0000 winebus.sys: Increase buffer size to match max length available. The current buffer is 1024, however the ioctl call can handle a max length of 8191. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47013 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 90a1e5d943724f8cb5e51fe806cb38ce6c98c4c1) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winebus.sys/bus_udev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 3c89963dcc..6683731181 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -862,7 +862,7 @@ static NTSTATUS hidraw_set_feature_report(DEVICE_OBJECT *device, UCHAR id, BYTE int rc; struct platform_private* ext = impl_from_DEVICE_OBJECT(device); BYTE *feature_buffer; - BYTE buffer[1024]; + BYTE buffer[8192]; if (id == 0) {

1 0

Qian Hong : advapi32: Initialize the LsaLookupSids() LSA_TRANSLATED_NAME.Name string properly.
by Alexandre Julliard Nov. 25, 2019

Nov. 25, 2019

Module: wine Branch: stable Commit: dce4b41cfd6a9e38cc85305e1494032250c4c19e URL: https://source.winehq.org/git/wine.git/?a=commit;h=dce4b41cfd6a9e38cc85305e… Author: Qian Hong <qhong(a)codeweavers.com> Date: Fri Aug 2 06:29:16 2019 +0200 advapi32: Initialize the LsaLookupSids() LSA_TRANSLATED_NAME.Name string properly. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=39129 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 2e53f8bccb65d112e5e341586c730094950fe6c3) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/advapi32/lsa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c index 354db65929..3ee24868ce 100644 --- a/dlls/advapi32/lsa.c +++ b/dlls/advapi32/lsa.c @@ -508,7 +508,7 @@ NTSTATUS WINAPI LsaLookupSids( { (*Names)[i].Use = SidTypeUnknown; (*Names)[i].DomainIndex = -1; - (*Names)[i].Name.Buffer = NULL; + RtlInitUnicodeStringEx(&(*Names)[i].Name, NULL); memset(&(*ReferencedDomains)->Domains[i], 0, sizeof(LSA_TRUST_INFORMATION));

1 0

Hans Leidekker : bcrypt: Ignore the size parameter in BCRYPT_CHAINING_MODE setters.
by Alexandre Julliard Nov. 25, 2019

Nov. 25, 2019

Module: wine Branch: stable Commit: 9899acf0d82524b88fddf8664fa4db652b4045a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9899acf0d82524b88fddf866… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 5 10:38:01 2019 +0200 bcrypt: Ignore the size parameter in BCRYPT_CHAINING_MODE setters. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47432 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 691fcebf3d0d403fe6817821fbe28bc25f983051) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 8 ++++---- dlls/bcrypt/gnutls.c | 8 ++++---- dlls/bcrypt/macos.c | 6 +++--- dlls/bcrypt/tests/bcrypt.c | 21 ++++++++++++++++++++- 4 files changed, 31 insertions(+), 12 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index c41c409042..7bf9bb2f01 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -501,24 +501,24 @@ static NTSTATUS set_alg_property( struct algorithm *alg, const WCHAR *prop, UCHA case ALG_ID_AES: if (!strcmpW( prop, BCRYPT_CHAINING_MODE )) { - if (!strncmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_ECB, size )) + if (!strcmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_ECB )) { alg->mode = MODE_ID_ECB; return STATUS_SUCCESS; } - else if (!strncmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_CBC, size )) + else if (!strcmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_CBC )) { alg->mode = MODE_ID_CBC; return STATUS_SUCCESS; } - else if (!strncmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_GCM, size )) + else if (!strcmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_GCM )) { alg->mode = MODE_ID_GCM; return STATUS_SUCCESS; } else { - FIXME( "unsupported mode %s\n", debugstr_wn( (WCHAR *)value, size ) ); + FIXME( "unsupported mode %s\n", debugstr_w((WCHAR *)value) ); return STATUS_NOT_IMPLEMENTED; } } diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index 5a656ccba2..1474ce430d 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -355,24 +355,24 @@ NTSTATUS key_set_property( struct key *key, const WCHAR *prop, UCHAR *value, ULO { if (!strcmpW( prop, BCRYPT_CHAINING_MODE )) { - if (!strncmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_ECB, size )) + if (!strcmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_ECB )) { key->u.s.mode = MODE_ID_ECB; return STATUS_SUCCESS; } - else if (!strncmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_CBC, size )) + else if (!strcmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_CBC )) { key->u.s.mode = MODE_ID_CBC; return STATUS_SUCCESS; } - else if (!strncmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_GCM, size )) + else if (!strcmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_GCM )) { key->u.s.mode = MODE_ID_GCM; return STATUS_SUCCESS; } else { - FIXME( "unsupported mode %s\n", debugstr_wn( (WCHAR *)value, size ) ); + FIXME( "unsupported mode %s\n", debugstr_w((WCHAR *)value) ); return STATUS_NOT_IMPLEMENTED; } } diff --git a/dlls/bcrypt/macos.c b/dlls/bcrypt/macos.c index 0e0ed8379d..b7af035af8 100644 --- a/dlls/bcrypt/macos.c +++ b/dlls/bcrypt/macos.c @@ -48,19 +48,19 @@ NTSTATUS key_set_property( struct key *key, const WCHAR *prop, UCHAR *value, ULO { if (!strcmpW( prop, BCRYPT_CHAINING_MODE )) { - if (!strncmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_ECB, size )) + if (!strcmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_ECB )) { key->u.s.mode = MODE_ID_ECB; return STATUS_SUCCESS; } - else if (!strncmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_CBC, size )) + else if (!strcmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_CBC )) { key->u.s.mode = MODE_ID_CBC; return STATUS_SUCCESS; } else { - FIXME( "unsupported mode %s\n", debugstr_wn( (WCHAR *)value, size ) ); + FIXME( "unsupported mode %s\n", debugstr_w((WCHAR *)value) ); return STATUS_NOT_IMPLEMENTED; } } diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 7274516840..f39fc8e3ab 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -488,7 +488,7 @@ static void test_aes(void) ok(key_lengths.dwIncrement == 64, "Expected 64, got %d\n", key_lengths.dwIncrement); memcpy(mode, BCRYPT_CHAIN_MODE_GCM, sizeof(BCRYPT_CHAIN_MODE_GCM)); - ret = pBCryptSetProperty(alg, BCRYPT_CHAINING_MODE, mode, sizeof(mode), 0); + ret = pBCryptSetProperty(alg, BCRYPT_CHAINING_MODE, mode, 0, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); size = 0; @@ -543,6 +543,25 @@ static void test_BCryptGenerateSymmetricKey(void) sizeof(BCRYPT_CHAIN_MODE_CBC), 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + size = 0; + memset(mode, 0, sizeof(mode)); + ret = pBCryptGetProperty(key, BCRYPT_CHAINING_MODE, mode, sizeof(mode), &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(!lstrcmpW((const WCHAR *)mode, BCRYPT_CHAIN_MODE_CBC), "got %s\n", wine_dbgstr_w((const WCHAR *)mode)); + ok(size == 64, "got %u\n", size); + + ret = pBCryptSetProperty(key, BCRYPT_CHAINING_MODE, (UCHAR *)BCRYPT_CHAIN_MODE_ECB, 0, 0); + ok(ret == STATUS_SUCCESS || broken(ret == STATUS_NOT_SUPPORTED) /* < Win 8 */, "got %08x\n", ret); + if (ret == STATUS_SUCCESS) + { + size = 0; + memset(mode, 0, sizeof(mode)); + ret = pBCryptGetProperty(key, BCRYPT_CHAINING_MODE, mode, sizeof(mode), &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(!lstrcmpW((const WCHAR *)mode, BCRYPT_CHAIN_MODE_ECB), "got %s\n", wine_dbgstr_w((const WCHAR *)mode)); + ok(size == 64, "got %u\n", size); + } + ret = pBCryptSetProperty(key, BCRYPT_CHAINING_MODE, (UCHAR *)BCRYPT_CHAIN_MODE_CBC, sizeof(BCRYPT_CHAIN_MODE_CBC), 0); ok(ret == STATUS_SUCCESS || broken(ret == STATUS_NOT_SUPPORTED) /* < Win 8 */, "got %08x\n", ret);

1 0