February 2022 - Wine-commits

Francois Gouget : d3d11/tests: Fix the spelling of a couple of comments.
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: wine Branch: master Commit: 6c25edfe24138b7eef00f541b0edbb3b01f8b7bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c25edfe24138b7eef00f541… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Feb 14 13:58:17 2022 +0100 d3d11/tests: Fix the spelling of a couple of comments. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 52c8816b689..236fa85a257 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -5960,7 +5960,7 @@ static void test_pipeline_statistics_query(void) get_query_data(context, query, &data, sizeof(data)); /* WARP devices randomly return all-zeroed structures as if the draw did not happen. Flushing and - * sleeping a second before ending the query reduces the likelyhood of hitting the bug a lot, but + * sleeping a second before ending the query reduces the likelihood of hitting the bug a lot, but * does not eliminate it entirely. To make things work reliably ignore such broken results. */ if (is_warp_device(device) && !memcmp(&data, &zero_data, sizeof(data))) { @@ -7453,8 +7453,8 @@ static void test_device_context_state(void) * * The tests below suggest that a ContextState object stores its own state * for every device it is used with. This isn't entirely true, e.g. the - * primitive topology can be transfered between devices, but will cause odd - * refcounting behavior afterwards (IAGetPrimitiveTopology will leak 54 + * primitive topology can be transferred between devices, but will cause + * odd refcounting behavior afterwards (IAGetPrimitiveTopology will leak 54 * references on the context's device for example). */ if (0) {

1 0

Francois Gouget : msdasql: Remove a couple of unneeded NULL casts.
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: wine Branch: master Commit: 64a778338664ec65994f9a185d8c7b2cf2174890 URL: https://source.winehq.org/git/wine.git/?a=commit;h=64a778338664ec65994f9a18… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Feb 14 13:57:28 2022 +0100 msdasql: Remove a couple of unneeded NULL casts. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdasql/msdasql_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msdasql/msdasql_main.c b/dlls/msdasql/msdasql_main.c index 3e1af95b1a7..60d46349590 100644 --- a/dlls/msdasql/msdasql_main.c +++ b/dlls/msdasql/msdasql_main.c @@ -547,7 +547,7 @@ static HRESULT WINAPI dbinit_Initialize(IDBInitialize *iface) } ret = SQLConnectW( provider->hdbc, (SQLWCHAR *)V_BSTR(&provider->properties[i].value), - SQL_NTS, (SQLWCHAR *)NULL, SQL_NTS, (SQLWCHAR *)NULL, SQL_NTS ); + SQL_NTS, NULL, SQL_NTS, NULL, SQL_NTS ); TRACE("SQLConnectW ret %d\n", ret); if (ret != SQL_SUCCESS) {

1 0

Francois Gouget : kernel32/tests: Add a trailing linefeed to an ok() message.
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: wine Branch: master Commit: 0016df0fb142f5b7be82c1b93e20409ae7fa2e62 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0016df0fb142f5b7be82c1b9… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Feb 14 13:57:36 2022 +0100 kernel32/tests: Add a trailing linefeed to an ok() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index f73ef627c67..053e103bf14 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -3081,7 +3081,7 @@ static void test_blocking_rw(HANDLE writer, HANDLE reader, DWORD buf_size, BOOL res = pCancelIoEx(reader, &read_overlapped2); ok(res, "CancelIoEx failed with error %d\n", GetLastError()); res = pCancelIoEx(reader, &read_overlapped2); - ok(!res, "CancelIOEx succeeded unexpectedly"); + ok(!res, "CancelIOEx succeeded unexpectedly\n"); ok(GetLastError() == ERROR_NOT_FOUND, "In CancelIoEx failure, expected ERROR_NOT_FOUND, got %d\n", GetLastError()); test_overlapped_failure(reader, &read_overlapped2, ERROR_OPERATION_ABORTED);

1 0

Francois Gouget : hnetcfg: Fix the spelling of a TRACE() message.
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: wine Branch: master Commit: fcc0f1fb645111352bea815deefa34aecf4248ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=fcc0f1fb645111352bea815d… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Feb 14 13:58:38 2022 +0100 hnetcfg: Fix the spelling of a TRACE() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hnetcfg/port.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hnetcfg/port.c b/dlls/hnetcfg/port.c index bda9455a2b5..61513f97746 100644 --- a/dlls/hnetcfg/port.c +++ b/dlls/hnetcfg/port.c @@ -1522,7 +1522,7 @@ static HRESULT WINAPI static_ports_Add( struct port_mapping mapping_data; HRESULT ret; - TRACE( "iface %p, external %ld, protocol %s, internal %ld, client %s, enabled %d, descritption %s, mapping %p.\n", + TRACE( "iface %p, external %ld, protocol %s, internal %ld, client %s, enabled %d, description %s, mapping %p.\n", iface, external, debugstr_w(protocol), internal, debugstr_w(client), enabled, debugstr_w(description), mapping );

1 0

Eric Pouech : dsound: Enable compilation with long types.
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: wine Branch: master Commit: 86bc819f07a67dc5ef2cb5bc9f8d609daa0f7b64 URL: https://source.winehq.org/git/wine.git/?a=commit;h=86bc819f07a67dc5ef2cb5bc… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 10 08:41:37 2022 +0100 dsound: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/Makefile.in | 1 - dlls/dsound/buffer.c | 86 ++++++++++++++++++++++---------------------- dlls/dsound/capture.c | 80 ++++++++++++++++++++--------------------- dlls/dsound/dsound.c | 34 +++++++++--------- dlls/dsound/dsound_main.c | 24 ++++++------- dlls/dsound/duplex.c | 12 +++---- dlls/dsound/mixer.c | 52 +++++++++++++-------------- dlls/dsound/primary.c | 90 +++++++++++++++++++++++------------------------ dlls/dsound/propset.c | 30 ++++++++-------- dlls/dsound/sound3d.c | 62 ++++++++++++++++---------------- 10 files changed, 235 insertions(+), 236 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=86bc819f07a67dc5ef2c…

1 0

Eric Pouech : dwrite: Enable compilation with long types.
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: wine Branch: master Commit: 46667959e744d4c8eaa725fe98b5b4884fe1de39 URL: https://source.winehq.org/git/wine.git/?a=commit;h=46667959e744d4c8eaa725fe… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 10 08:42:08 2022 +0100 dwrite: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/Makefile.in | 1 - dlls/dwrite/analyzer.c | 16 +++++----- dlls/dwrite/font.c | 76 ++++++++++++++++++++++++------------------------ dlls/dwrite/format.c | 8 ++--- dlls/dwrite/gdiinterop.c | 22 +++++++------- dlls/dwrite/layout.c | 40 ++++++++++++------------- dlls/dwrite/main.c | 20 ++++++------- dlls/dwrite/opentype.c | 6 ++-- 8 files changed, 94 insertions(+), 95 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=46667959e744d4c8eaa7…

1 0

Eric Pouech : gdiplus: Enable compilation with long types.
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: wine Branch: master Commit: 846fcc5bf6f5e007619e0aaaf610136959860b3f URL: https://source.winehq.org/git/wine.git/?a=commit;h=846fcc5bf6f5e007619e0aaa… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 10 08:43:13 2022 +0100 gdiplus: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/Makefile.in | 1 - dlls/gdiplus/brush.c | 22 +++++++++++----------- dlls/gdiplus/font.c | 16 ++++++++-------- dlls/gdiplus/gdiplus.c | 6 +++--- dlls/gdiplus/graphics.c | 6 +++--- dlls/gdiplus/image.c | 16 ++++++++-------- dlls/gdiplus/imageattributes.c | 4 ++-- dlls/gdiplus/metafile.c | 8 ++++---- dlls/gdiplus/pen.c | 4 ++-- dlls/gdiplus/region.c | 18 +++++++++--------- 10 files changed, 50 insertions(+), 51 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=846fcc5bf6f5e007619e…

1 0

Santino Mazza : bcrypt: Add BCRYPT_KEY_BLOB struct definition.
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: wine Branch: master Commit: 2132d38347fb7b24b8db4f21c4b50bada25caaa3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2132d38347fb7b24b8db4f21… Author: Santino Mazza <mazzasantino1206(a)gmail.com> Date: Sat Feb 12 18:49:45 2022 -0300 bcrypt: Add BCRYPT_KEY_BLOB struct definition. Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/bcrypt.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/bcrypt.h b/include/bcrypt.h index 15c26c1fb0a..fbfb5099c09 100644 --- a/include/bcrypt.h +++ b/include/bcrypt.h @@ -254,6 +254,11 @@ typedef struct _BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO ULONG dwFlags; } BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO, *PBCRYPT_AUTHENTICATED_CIPHER_MODE_INFO; +typedef struct _BCRYPT_KEY_BLOB +{ + ULONG Magic; +} BCRYPT_KEY_BLOB; + typedef struct _BCRYPT_ECCKEY_BLOB { ULONG dwMagic;

1 0

Francois Gouget : msi/tests: Fix the trailing linefeed in an ok() message.
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: wine Branch: master Commit: 194d1b72587756512c693df7c2fce505d591c905 URL: https://source.winehq.org/git/wine.git/?a=commit;h=194d1b72587756512c693df7… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Feb 14 12:41:11 2022 +0100 msi/tests: Fix the trailing linefeed in an ok() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/msi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 39cbaf56b79..fcdcd60a9f8 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -4553,7 +4553,7 @@ static void test_MsiGetProductInfo(void) ok(r == ERROR_UNKNOWN_PROPERTY, "Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r); ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf); - ok(sz == MAX_PATH, "%lun", sz); + ok(sz == MAX_PATH, "%lu\n", sz); res = RegCreateKeyExA(localkey, "InstallProperties", 0, NULL, 0, access, NULL, &propkey, NULL); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);

1 0

Nikolay Sivov : mfmediaengine/tests: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: wine Branch: master Commit: 29a9ba6e1863f403254de2ab35c8d5065ccdacf4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=29a9ba6e1863f403254de2ab… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 14 14:48:02 2022 +0300 mfmediaengine/tests: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/tests/Makefile.in | 1 - dlls/mfmediaengine/tests/mfmediaengine.c | 255 +++++++++++++++---------------- 2 files changed, 126 insertions(+), 130 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=29a9ba6e1863f403254d…

1 0