November 2020 - Wine-Commits

Alistair Leslie-Hughes : xaudio2_9: Add version resource.
by Alexandre Julliard Nov. 12, 2020

Nov. 12, 2020

Module: wine Branch: master Commit: fa6d22b976214ff4dfb32b431500b4cd1f7610a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa6d22b976214ff4dfb32b43… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Nov 10 20:29:59 2020 +1100 xaudio2_9: Add version resource. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50101 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_9/Makefile.in | 2 ++ dlls/xaudio2_9/version.rc | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/dlls/xaudio2_9/Makefile.in b/dlls/xaudio2_9/Makefile.in index 1a1982781a1..86f7b99e5eb 100644 --- a/dlls/xaudio2_9/Makefile.in +++ b/dlls/xaudio2_9/Makefile.in @@ -14,3 +14,5 @@ C_SRCS = \ xaudio_dll.c IDL_SRCS = xaudio_classes.idl + +RC_SRCS = version.rc diff --git a/dlls/xaudio2_9/version.rc b/dlls/xaudio2_9/version.rc new file mode 100644 index 00000000000..606abad0600 --- /dev/null +++ b/dlls/xaudio2_9/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2020 Alsitair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Wine xaudio2_9" +#define WINE_FILENAME_STR "xaudio2_9.dll" +#define WINE_FILEVERSION 10,0,19041,1 +#define WINE_FILEVERSION_STR "10.0.19041.1" +#define WINE_PRODUCTVERSION 10,0,19041,1 +#define WINE_PRODUCTVERSION_STR "10.0.19041.1" + +#include "wine/wine_common_ver.rc"

1 0

Nikolay Sivov : mfplat/tests: Remove a couple of failing tests.
by Alexandre Julliard Nov. 12, 2020

Nov. 12, 2020

Module: wine Branch: master Commit: 37aa12e7c808fd47f515dbb509813cce7fd4df7d URL: https://source.winehq.org/git/wine.git/?a=commit;h=37aa12e7c808fd47f515dbb5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 12 16:56:58 2020 +0300 mfplat/tests: Remove a couple of failing tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 4f5cf268d2a..c9a01644c6b 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -502,15 +502,6 @@ static void test_source_resolver(void) &obj_type, NULL); ok(hr == E_POINTER, "got 0x%08x\n", hr); - hr = IMFSourceResolver_CreateObjectFromByteStream(resolver, stream, NULL, MF_RESOLUTION_MEDIASOURCE, NULL, - &obj_type, (IUnknown **)&mediasource); - ok(hr == MF_E_UNSUPPORTED_BYTESTREAM_TYPE, "got 0x%08x\n", hr); - if (hr == S_OK) IMFMediaSource_Release(mediasource); - - hr = IMFSourceResolver_CreateObjectFromByteStream(resolver, stream, NULL, MF_RESOLUTION_BYTESTREAM, NULL, - &obj_type, (IUnknown **)&mediasource); - ok(hr == MF_E_UNSUPPORTED_BYTESTREAM_TYPE, "got 0x%08x\n", hr); - IMFByteStream_Release(stream); /* Create from URL. */

1 0

Alexandre Julliard : glu32: Build with msvcrt.
by Alexandre Julliard Nov. 12, 2020

Nov. 12, 2020

Module: wine Branch: master Commit: f60ec4ea06e7ed0f4879523f79901fc64cb1ae35 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f60ec4ea06e7ed0f4879523f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 12 11:20:28 2020 +0100 glu32: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/glu32/Makefile.in | 2 ++ dlls/glu32/glu.c | 3 --- dlls/glu32/mipmap.c | 9 --------- dlls/glu32/project.c | 3 --- dlls/glu32/quad.c | 3 --- 5 files changed, 2 insertions(+), 18 deletions(-) diff --git a/dlls/glu32/Makefile.in b/dlls/glu32/Makefile.in index 71d019d4fc1..587191229f8 100644 --- a/dlls/glu32/Makefile.in +++ b/dlls/glu32/Makefile.in @@ -2,6 +2,8 @@ MODULE = glu32.dll IMPORTLIB = glu32 IMPORTS = opengl32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ geom.c \ glu.c \ diff --git a/dlls/glu32/glu.c b/dlls/glu32/glu.c index 09d099f485d..9305b90d308 100644 --- a/dlls/glu32/glu.c +++ b/dlls/glu32/glu.c @@ -17,9 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include <assert.h> #include <stdarg.h> diff --git a/dlls/glu32/mipmap.c b/dlls/glu32/mipmap.c index 2eff5583bcf..6877e2f342c 100644 --- a/dlls/glu32/mipmap.c +++ b/dlls/glu32/mipmap.c @@ -28,9 +28,6 @@ * Silicon Graphics, Inc. */ -#include "config.h" -#include "wine/port.h" - #include <assert.h> #include <stdarg.h> #include <stdlib.h> @@ -4770,10 +4767,6 @@ static void fill_image(const PixelStorageModes *psm, assert(iter2 == &newimage[width*height* elements_per_group(format,0)]); } - assert( iter == &((const GLubyte *)userdata)[rowsize*height + - psm->unpack_skip_rows * rowsize + - psm->unpack_skip_pixels * group_size] ); - } /* else */ } /* fill_image() */ @@ -6049,8 +6042,6 @@ static void scaleInternalPackedPixel(int components, highy_int++; } } - - assert(outindex == (widthOut*heightOut - 1)); } /* scaleInternalPackedPixel() */ /* rowSizeInBytes is at least the width (in bytes) due to padding on diff --git a/dlls/glu32/project.c b/dlls/glu32/project.c index 3db0331e96b..dc104541b8f 100644 --- a/dlls/glu32/project.c +++ b/dlls/glu32/project.c @@ -28,9 +28,6 @@ * Silicon Graphics, Inc. */ -#include "config.h" -#include "wine/port.h" - #include <math.h> #include "windef.h" diff --git a/dlls/glu32/quad.c b/dlls/glu32/quad.c index f9914ed31c8..9ffaa6bd4de 100644 --- a/dlls/glu32/quad.c +++ b/dlls/glu32/quad.c @@ -28,9 +28,6 @@ * Silicon Graphics, Inc. */ -#include "config.h" -#include "wine/port.h" - #include <stdarg.h> #include <math.h>

1 0

Dmitry Timoshkov : crypt32: Add support for CMSG_SIGNER_AUTH_ATTR_PARAM for a being decoded signed message.
by Alexandre Julliard Nov. 12, 2020

Nov. 12, 2020

Module: wine Branch: master Commit: 4c9c6ca417f81d64153903d97e31b580a0842332 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c9c6ca417f81d64153903d9… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Nov 12 11:15:05 2020 +0300 crypt32: Add support for CMSG_SIGNER_AUTH_ATTR_PARAM for a being decoded signed message. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/msg.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 88c27a1c664..ba3690b2642 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -3194,6 +3194,18 @@ static BOOL CDecodeSignedMsg_GetParam(CDecodeMsg *msg, DWORD dwParamType, else SetLastError(CRYPT_E_INVALID_MSG_TYPE); break; + case CMSG_SIGNER_AUTH_ATTR_PARAM: + if (msg->u.signed_data.info) + { + if (dwIndex >= msg->u.signed_data.info->cSignerInfo) + SetLastError(CRYPT_E_INVALID_INDEX); + else + ret = CRYPT_CopyAttr(pvData, pcbData, + &msg->u.signed_data.info->rgSignerInfo[dwIndex].AuthAttrs); + } + else + SetLastError(CRYPT_E_INVALID_MSG_TYPE); + break; case CMSG_SIGNER_UNAUTH_ATTR_PARAM: if (msg->u.signed_data.info) {

1 0

Dmitry Timoshkov : crypt32: Make helper for copying CMSG_CMS_SIGNER_INFO attributes more generic.
by Alexandre Julliard Nov. 12, 2020

Nov. 12, 2020

Module: wine Branch: master Commit: 1b87f222eddac50b0840eccae3c1b01a57b55cef URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b87f222eddac50b0840ecca… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Nov 12 11:15:01 2020 +0300 crypt32: Make helper for copying CMSG_CMS_SIGNER_INFO attributes more generic. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/msg.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index b71c52bb0f6..88c27a1c664 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -2995,15 +2995,14 @@ static BOOL CDecodeEnvelopedMsg_GetParam(CDecodeMsg *msg, DWORD dwParamType, return ret; } -static BOOL CRYPT_CopyUnauthAttr(void *pvData, DWORD *pcbData, - const CMSG_CMS_SIGNER_INFO *in) +static BOOL CRYPT_CopyAttr(void *pvData, DWORD *pcbData, const CRYPT_ATTRIBUTES *attr) { DWORD size; BOOL ret; - TRACE("(%p, %d, %p)\n", pvData, pvData ? *pcbData : 0, in); + TRACE("(%p, %d, %p)\n", pvData, pvData ? *pcbData : 0, attr); - size = CRYPT_SizeOfAttributes(&in->UnauthAttrs); + size = CRYPT_SizeOfAttributes(attr); if (!pvData) { *pcbData = size; @@ -3016,12 +3015,8 @@ static BOOL CRYPT_CopyUnauthAttr(void *pvData, DWORD *pcbData, ret = FALSE; } else - { - CRYPT_ATTRIBUTES *out = pvData; + ret = CRYPT_ConstructAttributes(pvData, attr); - CRYPT_ConstructAttributes(out,&in->UnauthAttrs); - ret = TRUE; - } TRACE("returning %d\n", ret); return ret; } @@ -3205,8 +3200,8 @@ static BOOL CDecodeSignedMsg_GetParam(CDecodeMsg *msg, DWORD dwParamType, if (dwIndex >= msg->u.signed_data.info->cSignerInfo) SetLastError(CRYPT_E_INVALID_INDEX); else - ret = CRYPT_CopyUnauthAttr(pvData, pcbData, - &msg->u.signed_data.info->rgSignerInfo[dwIndex]); + ret = CRYPT_CopyAttr(pvData, pcbData, + &msg->u.signed_data.info->rgSignerInfo[dwIndex].UnauthAttrs); } else SetLastError(CRYPT_E_INVALID_MSG_TYPE);

1 0

Haoyang Chen : gdi32: Avoid exceeding the actual bitmap height.
by Alexandre Julliard Nov. 12, 2020

Nov. 12, 2020

Module: wine Branch: master Commit: abd0cddc5fbf45736b5846affb12e299f5f3e99f URL: https://source.winehq.org/git/wine.git/?a=commit;h=abd0cddc5fbf45736b5846af… Author: Haoyang Chen <chenhaoyang(a)uniontech.com> Date: Thu Nov 12 10:38:15 2020 +0000 gdi32: Avoid exceeding the actual bitmap height. The bottom-up case is handled earlier on. For the top-down case, 'lines' is left untouched. Signed-off-by: Haoyang Chen <chenhaoyang(a)uniontech.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 10a7a957973..790ecf06501 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -824,7 +824,7 @@ INT CDECL nulldrv_SetDIBitsToDevice( PHYSDEV dev, INT x_dst, INT y_dst, DWORD cx } else if (src.y >= lines) return lines; } - src_info->bmiHeader.biHeight = top_down ? -lines : lines; + src_info->bmiHeader.biHeight = top_down ? -min( lines, height ) : lines; src_info->bmiHeader.biSizeImage = get_dib_image_size( src_info ); }

1 0

Jacek Caban : conhost/tests: Silence debug output in child process if std output is a console.
by Alexandre Julliard Nov. 12, 2020

Nov. 12, 2020

Module: wine Branch: master Commit: 87a9d790abc95e6479af97aff7e88df240fb7e70 URL: https://source.winehq.org/git/wine.git/?a=commit;h=87a9d790abc95e6479af97af… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 12 19:56:11 2020 +0100 conhost/tests: Silence debug output in child process if std output is a console. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/tests/tty.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/programs/conhost/tests/tty.c b/programs/conhost/tests/tty.c index 4eb85a17a01..9b1ab77dc0b 100644 --- a/programs/conhost/tests/tty.c +++ b/programs/conhost/tests/tty.c @@ -1402,7 +1402,11 @@ START_TEST(tty) if (argc > 3) { HANDLE pipe; + DWORD mode; sscanf(argv[3], "%p", &pipe); + /* if std output is console, silence debug output so it does not interfere with tests */ + if (GetConsoleMode(GetStdHandle(STD_OUTPUT_HANDLE), &mode)) + winetest_debug = 0; child_process(pipe); return; }

1 0

Hans Leidekker : odbccp32: Map system DSN requests to user DSN requests in SQLConfigDataSource.
by Alexandre Julliard Nov. 12, 2020

Nov. 12, 2020

Module: wine Branch: master Commit: c8eae716b6857f312d921bba6bcbaa1d59cc53f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c8eae716b6857f312d921bba… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 12 11:35:13 2020 +0100 odbccp32: Map system DSN requests to user DSN requests in SQLConfigDataSource. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50116 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/odbccp32/odbccp32.c | 54 +++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 51 insertions(+), 3 deletions(-) diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index c842872fa6e..0e4a12534c8 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -338,10 +338,40 @@ fail: return FALSE; } +static WORD map_request(WORD request) +{ + switch (request) + { + case ODBC_ADD_DSN: + case ODBC_ADD_SYS_DSN: + return ODBC_ADD_DSN; + + case ODBC_CONFIG_DSN: + case ODBC_CONFIG_SYS_DSN: + return ODBC_CONFIG_DSN; + + case ODBC_REMOVE_DSN: + case ODBC_REMOVE_SYS_DSN: + return ODBC_REMOVE_DSN; + + default: + FIXME("unhandled request %u\n", request); + return 0; + } +} + +static UWORD get_config_mode(WORD request) +{ + if (request == ODBC_ADD_DSN || request == ODBC_CONFIG_DSN || request == ODBC_REMOVE_DSN) return ODBC_USER_DSN; + return ODBC_SYSTEM_DSN; +} + BOOL WINAPI SQLConfigDataSourceW(HWND hwnd, WORD request, LPCWSTR driver, LPCWSTR attributes) { HMODULE mod; BOOL ret = FALSE; + UWORD config_mode_prev = config_mode; + WORD mapped_request; TRACE("%p, %d, %s, %s\n", hwnd, request, debugstr_w(driver), debugstr_w(attributes)); if (TRACE_ON(odbc)) @@ -353,16 +383,24 @@ BOOL WINAPI SQLConfigDataSourceW(HWND hwnd, WORD request, LPCWSTR driver, LPCWST clear_errors(); + mapped_request = map_request(request); + if (!mapped_request) + return FALSE; + mod = load_config_driver(driver); if (!mod) return FALSE; + config_mode = get_config_mode(request); + pConfigDSNW = (void*)GetProcAddress(mod, "ConfigDSNW"); if(pConfigDSNW) - ret = pConfigDSNW(hwnd, request, driver, attributes); + ret = pConfigDSNW(hwnd, mapped_request, driver, attributes); else ERR("Failed to find ConfigDSNW\n"); + config_mode = config_mode_prev; + if (!ret) push_error(ODBC_ERROR_REQUEST_FAILED, odbc_error_request_failed); @@ -376,6 +414,8 @@ BOOL WINAPI SQLConfigDataSource(HWND hwnd, WORD request, LPCSTR driver, LPCSTR a HMODULE mod; BOOL ret = FALSE; WCHAR *driverW; + UWORD config_mode_prev = config_mode; + WORD mapped_request; TRACE("%p, %d, %s, %s\n", hwnd, request, debugstr_a(driver), debugstr_a(attributes)); @@ -388,6 +428,10 @@ BOOL WINAPI SQLConfigDataSource(HWND hwnd, WORD request, LPCSTR driver, LPCSTR a clear_errors(); + mapped_request = map_request(request); + if (!mapped_request) + return FALSE; + driverW = heap_strdupAtoW(driver); if (!driverW) { @@ -402,11 +446,13 @@ BOOL WINAPI SQLConfigDataSource(HWND hwnd, WORD request, LPCSTR driver, LPCSTR a return FALSE; } + config_mode = get_config_mode(request); + pConfigDSN = (void*)GetProcAddress(mod, "ConfigDSN"); if (pConfigDSN) { TRACE("Calling ConfigDSN\n"); - ret = pConfigDSN(hwnd, request, driver, attributes); + ret = pConfigDSN(hwnd, mapped_request, driver, attributes); } else { @@ -418,11 +464,13 @@ BOOL WINAPI SQLConfigDataSource(HWND hwnd, WORD request, LPCSTR driver, LPCSTR a attr = SQLInstall_strdup_multi(attributes); if(attr) - ret = pConfigDSNW(hwnd, request, driverW, attr); + ret = pConfigDSNW(hwnd, mapped_request, driverW, attr); heap_free(attr); } } + config_mode = config_mode_prev; + if (!ret) push_error(ODBC_ERROR_REQUEST_FAILED, odbc_error_request_failed);

1 0

Nikolay Sivov : oledb32: Use wide-char string literals.
by Alexandre Julliard Nov. 12, 2020

Nov. 12, 2020

Module: wine Branch: master Commit: 18640435497b46f7a6ab637d4689ae5f0168f424 URL: https://source.winehq.org/git/wine.git/?a=commit;h=18640435497b46f7a6ab637d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 12 09:52:33 2020 +0300 oledb32: Use wide-char string literals. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/convert.c | 18 ++----- dlls/oledb32/datainit.c | 127 +++++++++++++++++------------------------------ dlls/oledb32/dslocator.c | 3 +- 3 files changed, 51 insertions(+), 97 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=18640435497b46f7a6ab…

1 0

Michael Stefaniuc : start: Use wide-char string literals.
by Alexandre Julliard Nov. 12, 2020

Nov. 12, 2020

Module: wine Branch: master Commit: 6e8af61f101519624df5528930b58e0784f0614c URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e8af61f101519624df55289… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Nov 12 00:37:56 2020 +0100 start: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/start/start.c | 107 ++++++++++++++++--------------------------------- 1 file changed, 34 insertions(+), 73 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6e8af61f101519624df5…

1 0