October 2021 - Wine-commits

Alexandre Julliard : libs: Import code from upstream libxml2 2.9.12.
by Alexandre Julliard 20 Oct '21

20 Oct '21

1 0

Alexandre Julliard : libs: Import code from upstream libxslt 1.1.34.
by Alexandre Julliard 20 Oct '21

20 Oct '21

Module: wine Branch: master Commit: c638618cbc5f6f26b0a0d1b32078b9ecca3af8df URL: https://source.winehq.org/git/wine.git/?a=commit;h=c638618cbc5f6f26b0a0d1b3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 20 11:33:05 2021 +0200 libs: Import code from upstream libxslt 1.1.34. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 26 + configure.ac | 2 + libs/xslt/AUTHORS | 63 + libs/xslt/COPYING | 53 + libs/xslt/Makefile.in | 23 + libs/xslt/libxslt/attributes.c | 1248 ++++++ libs/xslt/libxslt/attributes.h | 38 + libs/xslt/libxslt/attrvt.c | 396 ++ libs/xslt/libxslt/documents.c | 436 +++ libs/xslt/libxslt/documents.h | 93 + libs/xslt/libxslt/extensions.c | 2380 ++++++++++++ libs/xslt/libxslt/extensions.h | 262 ++ libs/xslt/libxslt/extra.c | 199 + libs/xslt/libxslt/extra.h | 72 + libs/xslt/libxslt/functions.c | 1008 +++++ libs/xslt/libxslt/functions.h | 78 + libs/xslt/libxslt/imports.c | 414 ++ libs/xslt/libxslt/imports.h | 75 + libs/xslt/libxslt/keys.c | 947 +++++ libs/xslt/libxslt/keys.h | 53 + libs/xslt/libxslt/libxslt.h | 36 + libs/xslt/libxslt/namespaces.c | 853 ++++ libs/xslt/libxslt/namespaces.h | 68 + libs/xslt/libxslt/numbers.c | 1363 +++++++ libs/xslt/libxslt/numbersInternals.h | 73 + libs/xslt/libxslt/pattern.c | 2642 +++++++++++++ libs/xslt/libxslt/pattern.h | 84 + libs/xslt/libxslt/preproc.c | 2376 ++++++++++++ libs/xslt/libxslt/preproc.h | 43 + libs/xslt/libxslt/security.c | 482 +++ libs/xslt/libxslt/security.h | 104 + libs/xslt/libxslt/templates.c | 864 +++++ libs/xslt/libxslt/templates.h | 77 + libs/xslt/libxslt/transform.c | 6524 +++++++++++++++++++++++++++++++ libs/xslt/libxslt/transform.h | 207 + libs/xslt/libxslt/trio.h | 216 ++ libs/xslt/libxslt/triodef.h | 220 ++ libs/xslt/libxslt/variables.c | 2374 ++++++++++++ libs/xslt/libxslt/variables.h | 118 + libs/xslt/libxslt/win32config.h | 129 + libs/xslt/libxslt/xslt.c | 7047 ++++++++++++++++++++++++++++++++++ libs/xslt/libxslt/xslt.h | 110 + libs/xslt/libxslt/xsltInternals.h | 1978 ++++++++++ libs/xslt/libxslt/xsltconfig.h | 180 + libs/xslt/libxslt/xsltexports.h | 142 + libs/xslt/libxslt/xsltlocale.c | 520 +++ libs/xslt/libxslt/xsltlocale.h | 76 + libs/xslt/libxslt/xsltutils.c | 2477 ++++++++++++ libs/xslt/libxslt/xsltutils.h | 313 ++ 49 files changed, 39562 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c638618cbc5f6f26b0a0…

1 0

Alexandre Julliard : mxsml3: Use the bundled libxml2 and libxslt and build with msvcrt.
by Alexandre Julliard 20 Oct '21

20 Oct '21

Module: wine Branch: master Commit: bca1b7f2faeb0798f4af420c15ff5a1b1f7b40af URL: https://source.winehq.org/git/wine.git/?a=commit;h=bca1b7f2faeb0798f4af420c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 20 11:39:06 2021 +0200 mxsml3: Use the bundled libxml2 and libxslt and build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 454 -------------------------------------------- configure.ac | 51 ----- dlls/msxml3/Makefile.in | 7 +- dlls/msxml3/attribute.c | 14 +- dlls/msxml3/cdata.c | 12 +- dlls/msxml3/comment.c | 12 +- dlls/msxml3/dispex.c | 6 +- dlls/msxml3/docfrag.c | 12 +- dlls/msxml3/doctype.c | 12 +- dlls/msxml3/domdoc.c | 61 +----- dlls/msxml3/element.c | 30 ++- dlls/msxml3/entityref.c | 12 +- dlls/msxml3/factory.c | 8 +- dlls/msxml3/httprequest.c | 33 ++-- dlls/msxml3/main.c | 112 ++--------- dlls/msxml3/msxml_private.h | 30 +-- dlls/msxml3/mxnamespace.c | 8 +- dlls/msxml3/mxwriter.c | 7 +- dlls/msxml3/node.c | 87 ++------- dlls/msxml3/nodelist.c | 12 +- dlls/msxml3/nodemap.c | 12 +- dlls/msxml3/pi.c | 18 +- dlls/msxml3/saxreader.c | 41 ++-- dlls/msxml3/schema.c | 56 ++---- dlls/msxml3/selection.c | 16 +- dlls/msxml3/stylesheet.c | 15 +- dlls/msxml3/text.c | 14 +- dlls/msxml3/xdr.c | 11 +- dlls/msxml3/xmldoc.c | 25 +-- dlls/msxml3/xmlelem.c | 12 +- dlls/msxml3/xmlview.c | 5 +- dlls/msxml3/xslpattern.h | 8 - dlls/msxml3/xslpattern.l | 7 - dlls/msxml3/xslpattern.y | 6 - include/config.h.in | 39 ---- 35 files changed, 150 insertions(+), 1115 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bca1b7f2faeb0798f4af…

1 0

Alexandre Julliard : libs: Import upstream code from gsm 1.0.19.
by Alexandre Julliard 20 Oct '21

20 Oct '21

Module: wine Branch: master Commit: 116ea9cec442ce66df2d4b94e34f81ff466bd91c URL: https://source.winehq.org/git/wine.git/?a=commit;h=116ea9cec442ce66df2d4b94… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 20 11:45:59 2021 +0200 libs: Import upstream code from gsm 1.0.19. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 24 ++ configure.ac | 2 + libs/gsm/COPYRIGHT | 35 ++ libs/gsm/Makefile.in | 19 + libs/gsm/inc/gsm.h | 79 ++++ libs/gsm/inc/private.h | 277 +++++++++++++ libs/gsm/inc/proto.h | 65 ++++ libs/gsm/inc/unproto.h | 23 ++ libs/gsm/src/add.c | 235 +++++++++++ libs/gsm/src/code.c | 89 +++++ libs/gsm/src/decode.c | 63 +++ libs/gsm/src/gsm_create.c | 28 ++ libs/gsm/src/gsm_decode.c | 361 +++++++++++++++++ libs/gsm/src/gsm_destroy.c | 16 + libs/gsm/src/gsm_encode.c | 451 +++++++++++++++++++++ libs/gsm/src/gsm_option.c | 69 ++++ libs/gsm/src/gsm_print.c | 167 ++++++++ libs/gsm/src/long_term.c | 949 +++++++++++++++++++++++++++++++++++++++++++++ libs/gsm/src/lpc.c | 341 ++++++++++++++++ libs/gsm/src/preprocess.c | 113 ++++++ libs/gsm/src/rpe.c | 488 +++++++++++++++++++++++ libs/gsm/src/short_term.c | 429 ++++++++++++++++++++ libs/gsm/src/table.c | 63 +++ 23 files changed, 4386 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=116ea9cec442ce66df2d…

1 0

Zhiyi Zhang : uxtheme: Pass size in bytes to RegQueryValueExW().
by Alexandre Julliard 20 Oct '21

20 Oct '21

Module: wine Branch: master Commit: 9314b59a7d591382b694bc651e563cfff37af664 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9314b59a7d591382b694bc65… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Oct 20 10:06:25 2021 +0800 uxtheme: Pass size in bytes to RegQueryValueExW(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/system.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index 18b93435e4c..628bd9bfdc4 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -85,7 +85,7 @@ static BOOL CALLBACK UXTHEME_broadcast_msg (HWND hWnd, LPARAM msg) static DWORD query_reg_path (HKEY hKey, LPCWSTR lpszValue, LPVOID pvData) { - DWORD dwRet, dwType, dwUnExpDataLen = MAX_PATH, dwExpDataLen; + DWORD dwRet, dwType, dwUnExpDataLen = MAX_PATH * sizeof(WCHAR), dwExpDataLen; TRACE("(hkey=%p,%s,%p)\n", hKey, debugstr_w(lpszValue), pvData); @@ -147,7 +147,7 @@ static void UXTHEME_LoadTheme(void) /* Get current theme configuration */ if(!RegOpenKeyW(HKEY_CURRENT_USER, szThemeManager, &hKey)) { TRACE("Loading theme config\n"); - buffsize = ARRAY_SIZE(tmp); + buffsize = sizeof(tmp); if (!RegQueryValueExW(hKey, L"ThemeActive", NULL, NULL, (BYTE*)tmp, &buffsize)) { bThemeActive = (tmp[0] != '0'); } @@ -155,10 +155,10 @@ static void UXTHEME_LoadTheme(void) bThemeActive = FALSE; TRACE("Failed to get ThemeActive: %d\n", GetLastError()); } - buffsize = ARRAY_SIZE(szCurrentColor); + buffsize = sizeof(szCurrentColor); if (RegQueryValueExW(hKey, L"ColorName", NULL, NULL, (BYTE*)szCurrentColor, &buffsize)) szCurrentColor[0] = '\0'; - buffsize = ARRAY_SIZE(szCurrentSize); + buffsize = sizeof(szCurrentSize); if (RegQueryValueExW(hKey, L"SizeName", NULL, NULL, (BYTE*)szCurrentSize, &buffsize)) szCurrentSize[0] = '\0'; if (query_reg_path (hKey, L"DllName", szCurrentTheme))

1 0

Zhiyi Zhang : winemac.drv: Pass size in bytes to RegQueryValueExW().
by Alexandre Julliard 20 Oct '21

20 Oct '21

Module: wine Branch: master Commit: bb5b1d75546ed16ce548f60facd0d09c81b5a20d URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb5b1d75546ed16ce548f60f… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Oct 20 10:06:37 2021 +0800 winemac.drv: Pass size in bytes to RegQueryValueExW(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/display.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 4a3b1ff39cb..99c852d7ffe 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -1475,7 +1475,7 @@ static BOOL link_device(const WCHAR *instance, const GUID *guid) if (lr) continue; - length = ARRAY_SIZE(device_instance); + length = sizeof(device_instance); lr = RegQueryValueExW(device_key, device_instanceW, NULL, NULL, (BYTE *)device_instance, &length); if (lr || lstrcmpiW(device_instance, instance)) {

1 0

Zhiyi Zhang : winex11.drv: Pass size in bytes to RegQueryValueExW().
by Alexandre Julliard 20 Oct '21

20 Oct '21

Module: wine Branch: master Commit: 2adf4376d86119b8a6f7cde51c9a972564575bac URL: https://source.winehq.org/git/wine.git/?a=commit;h=2adf4376d86119b8a6f7cde5… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Oct 20 10:06:47 2021 +0800 winex11.drv: Pass size in bytes to RegQueryValueExW(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/display.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 57091522078..7f03f94db90 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -434,7 +434,7 @@ static BOOL link_device(const WCHAR *instance, const GUID *guid) if (lr) continue; - length = ARRAY_SIZE(device_instance); + length = sizeof(device_instance); lr = RegQueryValueExW(device_key, device_instanceW, NULL, NULL, (BYTE *)device_instance, &length); if (lr || lstrcmpiW(device_instance, instance)) {

1 0

Zhiyi Zhang : cmd: Pass size in bytes to RegQueryValueExW().
by Alexandre Julliard 20 Oct '21

20 Oct '21

Module: wine Branch: master Commit: efd98caef1908a05a38201c666218171b5eed765 URL: https://source.winehq.org/git/wine.git/?a=commit;h=efd98caef1908a05a38201c6… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Oct 20 10:06:56 2021 +0800 cmd: Pass size in bytes to RegQueryValueExW(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/builtins.c | 5 +++-- programs/cmd/wcmdmain.c | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index a55ce6e0244..d0a954d90fa 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -4763,7 +4763,7 @@ void WCMD_assoc (const WCHAR *args, BOOL assoc) { WCHAR *newValue; LONG rc = ERROR_SUCCESS; WCHAR keyValue[MAXSTRING]; - DWORD valueLen = MAXSTRING; + DWORD valueLen; HKEY readKey; /* See if parameter includes '=' */ @@ -4803,7 +4803,7 @@ void WCMD_assoc (const WCHAR *args, BOOL assoc) { if (RegOpenKeyExW(key, subkey, 0, accessOptions, &readKey) == ERROR_SUCCESS) { - valueLen = ARRAY_SIZE(keyValue); + valueLen = sizeof(keyValue); rc = RegQueryValueExW(readKey, NULL, NULL, NULL, (LPBYTE)keyValue, &valueLen); WCMD_output_asis(keyName); WCMD_output_asis(L"="); @@ -4836,6 +4836,7 @@ void WCMD_assoc (const WCHAR *args, BOOL assoc) { if (RegOpenKeyExW(key, subkey, 0, accessOptions, &readKey) == ERROR_SUCCESS) { + valueLen = sizeof(keyValue); rc = RegQueryValueExW(readKey, NULL, NULL, NULL, (LPBYTE)keyValue, &valueLen); WCMD_output_asis(args); WCMD_output_asis(L"="); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 8c6ed1c057c..4ed1c96a9c2 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -2700,7 +2700,7 @@ int __cdecl wmain (int argc, WCHAR *argvW[]) size = sizeof(DWORD); RegQueryValueExW(key, L"DefaultColor", NULL, NULL, (BYTE *)&value, &size); } else if (type == REG_SZ) { - size = ARRAY_SIZE(strvalue); + size = sizeof(strvalue); RegQueryValueExW(key, L"DefaultColor", NULL, NULL, (BYTE *)strvalue, &size); value = wcstoul(strvalue, NULL, 10); } @@ -2719,7 +2719,7 @@ int __cdecl wmain (int argc, WCHAR *argvW[]) size = sizeof(DWORD); RegQueryValueExW(key, L"DefaultColor", NULL, NULL, (BYTE *)&value, &size); } else if (type == REG_SZ) { - size = ARRAY_SIZE(strvalue); + size = sizeof(strvalue); RegQueryValueExW(key, L"DefaultColor", NULL, NULL, (BYTE *)strvalue, &size); value = wcstoul(strvalue, NULL, 10); }

1 0

Zhiyi Zhang : winecfg: Pass size in bytes to RegQueryValueExW().
by Alexandre Julliard 20 Oct '21

20 Oct '21

Module: wine Branch: master Commit: b2099bce9bf35697bbb522aede21faf39be21baa URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2099bce9bf35697bbb522ae… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Oct 20 10:07:06 2021 +0800 winecfg: Pass size in bytes to RegQueryValueExW(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winecfg/drive.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winecfg/drive.c b/programs/winecfg/drive.c index bee5be3af34..b4b4239c003 100644 --- a/programs/winecfg/drive.c +++ b/programs/winecfg/drive.c @@ -140,7 +140,7 @@ static DWORD get_drive_type( char letter ) else { WCHAR buffer[80]; - DWORD size = ARRAY_SIZE(buffer); + DWORD size = sizeof(buffer); if (!RegQueryValueExW( hKey, driveValue, NULL, NULL, (LPBYTE)buffer, &size )) {

1 0

Zhiyi Zhang : winefile: Set size before calling RegQueryValueExW().
by Alexandre Julliard 20 Oct '21

20 Oct '21

Module: wine Branch: master Commit: e45d51fddabfa9e5f5d2a19bb8df2e12134dcf45 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e45d51fddabfa9e5f5d2a19b… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Oct 20 10:07:14 2021 +0800 winefile: Set size before calling RegQueryValueExW(). The value in size may be invalid if previous RegQueryValueExW() calls failed. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winefile/winefile.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index fa78237cccf..8ad785b924a 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -1220,20 +1220,22 @@ static windowOptions load_registry_settings(void) RegOpenKeyExW( HKEY_CURRENT_USER, registry_key, 0, KEY_QUERY_VALUE, &hKey ); - size = sizeof(DWORD); - + size = sizeof(opts.start_x); if( RegQueryValueExW( hKey, reg_start_x, NULL, &type, (LPBYTE) &opts.start_x, &size ) != ERROR_SUCCESS ) opts.start_x = CW_USEDEFAULT; + size = sizeof(opts.start_y); if( RegQueryValueExW( hKey, reg_start_y, NULL, &type, (LPBYTE) &opts.start_y, &size ) != ERROR_SUCCESS ) opts.start_y = CW_USEDEFAULT; + size = sizeof(opts.width); if( RegQueryValueExW( hKey, reg_width, NULL, &type, (LPBYTE) &opts.width, &size ) != ERROR_SUCCESS ) opts.width = CW_USEDEFAULT; + size = sizeof(opts.height); if( RegQueryValueExW( hKey, reg_height, NULL, &type, (LPBYTE) &opts.height, &size ) != ERROR_SUCCESS ) opts.height = CW_USEDEFAULT;

1 0