November 2021 - Wine-Commits

Mark Jansen : comctl32: Safely handle large wParam in SB_GETPARTS.
by Alexandre Julliard Nov. 12, 2021

Nov. 12, 2021

Module: wine Branch: master Commit: bb24e756253272a929b970ea8b76336cb8c14254 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb24e756253272a929b970ea… Author: Mark Jansen <mark.jansen(a)reactos.org> Date: Fri Nov 12 10:46:52 2021 -0500 comctl32: Safely handle large wParam in SB_GETPARTS. Signed-off-by: Mark Jansen <mark.jansen(a)reactos.org> Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/status.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c index 9078e4a70bc..ac93d7712c0 100644 --- a/dlls/comctl32/status.c +++ b/dlls/comctl32/status.c @@ -401,6 +401,8 @@ STATUSBAR_GetParts (const STATUS_INFO *infoPtr, INT num_parts, INT parts[]) TRACE("(%d)\n", num_parts); if (parts) { + if (num_parts > infoPtr->numParts) + num_parts = infoPtr->numParts; for (i = 0; i < num_parts; i++) { parts[i] = infoPtr->parts[i].x; }

1 0

Gabriel Ivăncescu : user32: Redraw children when the combo box is dropped down.
by Alexandre Julliard Nov. 12, 2021

Nov. 12, 2021

Module: wine Branch: master Commit: 0d4392077e1b41ae23535ec41a22c6732bc9f168 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d4392077e1b41ae23535ec4… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Nov 12 18:50:02 2021 +0200 user32: Redraw children when the combo box is dropped down. Some applications subclass the combo box and handle WM_ERASEBKGND themselves, without using WS_CLIPCHILDREN. This causes them to erase over the editbox child, so it requires a refresh as well. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=22260 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/combo.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index 1b53a2d6ad8..aeb7fa08e5f 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -1003,8 +1003,7 @@ static void CBDropDown( LPHEADCOMBO lphc ) if( !(lphc->wState & CBF_NOREDRAW) ) - RedrawWindow( lphc->self, NULL, 0, RDW_INVALIDATE | - RDW_ERASE | RDW_UPDATENOW | RDW_NOCHILDREN ); + RedrawWindow( lphc->self, NULL, 0, RDW_INVALIDATE | RDW_ERASE | RDW_UPDATENOW ); EnableWindow( lphc->hWndLBox, TRUE ); if (GetCapture() != lphc->self)

1 0

Thomas Faber : msvcrt/tests: Show that spawn does not require locking of fds.
by Alexandre Julliard Nov. 12, 2021

Nov. 12, 2021

Module: wine Branch: master Commit: be0684dad50ffbc93b3ded4fbfebf1d1e4690589 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be0684dad50ffbc93b3ded4f… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Thu Nov 11 17:42:58 2021 -0500 msvcrt/tests: Show that spawn does not require locking of fds. Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/file.c | 45 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 43 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 7a33ae24230..ceb2165891f 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -1565,6 +1565,18 @@ static void test_stdout_handle( STARTUPINFOA *startup, char *cmdline, HANDLE hst DeleteFileA( "fdopen.err" ); } +static unsigned WINAPI read_pipe_thread(void *argument) +{ + unsigned char buffer[2]; + int ret; + int *pipefds = argument; + + ret = _read(pipefds[0], buffer, sizeof(buffer)); + ok(ret == 1, "ret = %d\n", ret); + ok(buffer[0] == 'a', "%x\n", buffer[0]); + return 0; +} + static void test_file_inherit( const char* selfname ) { int fd; @@ -1574,6 +1586,9 @@ static void test_file_inherit( const char* selfname ) STARTUPINFOA startup; SECURITY_ATTRIBUTES sa; HANDLE handles[3]; + HANDLE thread_handle; + int pipefds[2]; + intptr_t ret; fd = open ("fdopen.tst", O_CREAT | O_RDWR | O_BINARY, _S_IREAD |_S_IWRITE); ok(fd != -1, "Couldn't create test file\n"); @@ -1582,7 +1597,8 @@ static void test_file_inherit( const char* selfname ) arg_v[2] = "inherit"; arg_v[3] = buffer; sprintf(buffer, "%d", fd); arg_v[4] = 0; - _spawnvp(_P_WAIT, selfname, arg_v); + ret = _spawnvp(_P_WAIT, selfname, arg_v); + ok(ret == 0, "_spawnvp returned %d, errno %d\n", ret, errno); ok(tell(fd) == 8, "bad position %lu expecting 8\n", tell(fd)); lseek(fd, 0, SEEK_SET); ok(read(fd, buffer, sizeof (buffer)) == 8 && memcmp(buffer, "Success", 8) == 0, "Couldn't read back the data\n"); @@ -1595,12 +1611,37 @@ static void test_file_inherit( const char* selfname ) arg_v[2] = "inherit_no"; arg_v[3] = buffer; sprintf(buffer, "%d", fd); arg_v[4] = 0; - _spawnvp(_P_WAIT, selfname, arg_v); + ret = _spawnvp(_P_WAIT, selfname, arg_v); + ok(ret == 0, "_spawnvp returned %d, errno %d\n", ret, errno); ok(tell(fd) == 0, "bad position %lu expecting 0\n", tell(fd)); ok(read(fd, buffer, sizeof (buffer)) == 0, "Found unexpected data (%s)\n", buffer); close (fd); ok(unlink("fdopen.tst") == 0, "Couldn't unlink\n"); + /* Show that spawn works while a read is active */ + ok(_pipe(pipefds, 1, O_BINARY) == 0, "_pipe() failed\n"); + thread_handle = (HANDLE)_beginthreadex(NULL, 0, read_pipe_thread, pipefds, 0, NULL); + Sleep(100); /* try to make sure the thread is reading */ + fd = open ("fdopen.tst", O_CREAT | O_RDWR | O_BINARY, _S_IREAD |_S_IWRITE); + ok(fd != -1, "Couldn't create test file\n"); + arg_v[1] = "tests/file.c"; + arg_v[2] = "inherit"; + arg_v[3] = buffer; sprintf(buffer, "%d", fd); + arg_v[4] = 0; + ret = _spawnvp(_P_WAIT, selfname, arg_v); + ok(ret == 0, "_spawnvp returned %Id, errno %d\n", ret, errno); + ret = tell(fd); + ok(ret == 8, "bad position %Iu expecting 8\n", ret); + lseek(fd, 0, SEEK_SET); + ok(read(fd, buffer, sizeof (buffer)) == 8 && memcmp(buffer, "Success", 8) == 0, "Couldn't read back the data\n"); + close (fd); + ok(unlink("fdopen.tst") == 0, "Couldn't unlink\n"); + _write(pipefds[1], "a", 1); + WaitForSingleObject(thread_handle, INFINITE); + CloseHandle(thread_handle); + close(pipefds[0]); + close(pipefds[1]); + /* make file handle inheritable */ sa.nLength = sizeof(sa); sa.lpSecurityDescriptor = NULL;

1 0

Rémi Bernon : services: Terminate all service processes on shutdown.
by Alexandre Julliard Nov. 12, 2021

Nov. 12, 2021

Module: wine Branch: master Commit: 7f749d58d9cbb0b3d54f2db75dbd88695b20901a URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f749d58d9cbb0b3d54f2db7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Nov 10 10:26:46 2021 +0100 services: Terminate all service processes on shutdown. Instead of waiting for wineserver to kill them on shutdown, after a 2s delay. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/services.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/services/services.c b/programs/services/services.c index 39cd9ee4ffa..d969cf81ab9 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -520,6 +520,7 @@ static void scmdatabase_wait_terminate(struct scmdatabase *db) { struct process_entry *process = grab_process(LIST_ENTRY(ptr, struct process_entry, entry)); + process_terminate(process); scmdatabase_unlock(db); WaitForSingleObject(process->process, INFINITE); scmdatabase_lock(db);

1 0

Rémi Bernon : dinput: Use a specific buffer for set envelope output report.
by Alexandre Julliard Nov. 12, 2021

Nov. 12, 2021

Module: wine Branch: master Commit: 6501968dd8d5147124ecc6b5eeb802b89f7de7e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6501968dd8d5147124ecc6b5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Nov 12 09:49:45 2021 +0100 dinput: Use a specific buffer for set envelope output report. Instead of a generic type_specific_buf[1], and factor code for all effects that use an envelope. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 134 ++++++++++++++++++++++----------------------- 1 file changed, 64 insertions(+), 70 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6501968dd8d5147124ec…

1 0

Ivo Ivanov : dinput: Remove some extremely verbose traces, and fix typos.
by Alexandre Julliard Nov. 12, 2021

Nov. 12, 2021

Module: wine Branch: master Commit: f2e3de00996670f560c9394def9ff56038b96099 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2e3de00996670f560c9394d… Author: Ivo Ivanov <logos128(a)gmail.com> Date: Fri Nov 12 09:49:39 2021 +0100 dinput: Remove some extremely verbose traces, and fix typos. Signed-off-by: Ivo Ivanov <logos128(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 2 +- dlls/dinput/joystick_hid.c | 34 ++-------------------------------- 2 files changed, 3 insertions(+), 33 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 898b1d10ed0..b423337c9ce 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1480,7 +1480,7 @@ static HRESULT WINAPI dinput_device_SendForceFeedbackCommand( IDirectInputDevice struct dinput_device *impl = impl_from_IDirectInputDevice8W( iface ); HRESULT hr; - TRACE( "iface %p, flags %x.\n", iface, command ); + TRACE( "iface %p, command %#x.\n", iface, command ); switch (command) { diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 5a3c46e2d9a..cb920adab06 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -52,25 +52,6 @@ DEFINE_GUID( GUID_DEVINTERFACE_WINEXINPUT,0x6c53d5fd,0x6480,0x440f,0xb6,0x18,0x4 DEFINE_GUID( hid_joystick_guid, 0x9e573edb, 0x7734, 0x11d2, 0x8d, 0x4a, 0x23, 0x90, 0x3f, 0xb6, 0xbd, 0xf7 ); DEFINE_DEVPROPKEY( DEVPROPKEY_HID_HANDLE, 0xbc62e415, 0xf4fe, 0x405c, 0x8e, 0xda, 0x63, 0x6f, 0xb5, 0x9f, 0x08, 0x98, 2 ); -static inline const char *debugstr_hid_value_caps( struct hid_value_caps *caps ) -{ - if (!caps) return "(null)"; - return wine_dbg_sprintf( "RId %d, Usg %02x:%02x-%02x Dat %02x-%02x, Str %d-%d, Des %d-%d, " - "Bits %02x Flags %#x, LCol %d LUsg %02x:%02x, BitSz %d, RCnt %d, Unit %x E%+d, Log %+d-%+d, Phy %+d-%+d", - caps->report_id, caps->usage_page, caps->usage_min, caps->usage_max, caps->data_index_min, caps->data_index_max, - caps->string_min, caps->string_max, caps->designator_min, caps->designator_max, caps->bit_field, caps->flags, - caps->link_collection, caps->link_usage_page, caps->link_usage, caps->bit_size, caps->report_count, - caps->units, caps->units_exp, caps->logical_min, caps->logical_max, caps->physical_min, caps->physical_max ); -} - -static inline const char *debugstr_hid_collection_node( struct hid_collection_node *node ) -{ - if (!node) return "(null)"; - return wine_dbg_sprintf( "Usg %02x:%02x, Parent %u, Next %u, NbChild %u, Child %u, Type %02x", - node->usage_page, node->usage, node->parent, node->next_sibling, - node->number_of_children, node->first_child, node->collection_type ); -} - struct extra_caps { LONG bit_size; @@ -418,15 +399,11 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *filter, if (caps->usage_page == HID_USAGE_PAGE_PID) { - TRACE( "Ignoring input caps %s, PID specific.\n", debugstr_hid_value_caps( caps ) ); value_ofs += (caps->usage_max - caps->usage_min + 1) * sizeof(LONG); object += caps->usage_max - caps->usage_min + 1; } else if (caps->usage_page >= HID_USAGE_PAGE_VENDOR_DEFINED_BEGIN) - { - TRACE( "Ignoring input value %s, vendor specific.\n", debugstr_hid_value_caps( caps ) ); value_ofs += (caps->usage_max - caps->usage_min + 1) * sizeof(LONG); - } else for (j = caps->usage_min; j <= caps->usage_max; ++j) { instance.dwOfs = value_ofs; @@ -498,15 +475,11 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *filter, if (caps->usage_page == HID_USAGE_PAGE_PID) { - TRACE( "Ignoring input caps %s, PID specific.\n", debugstr_hid_value_caps( caps ) ); button_ofs += caps->usage_max - caps->usage_min + 1; object += caps->usage_max - caps->usage_min + 1; } else if (caps->usage_page >= HID_USAGE_PAGE_VENDOR_DEFINED_BEGIN) - { - TRACE( "Ignoring input button %s, vendor specific.\n", debugstr_hid_value_caps( caps ) ); button_ofs += caps->usage_max - caps->usage_min + 1; - } else for (j = caps->usage_min; j <= caps->usage_max; ++j) { instance.dwOfs = button_ofs; @@ -538,7 +511,6 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *filter, if (caps->usage_page >= HID_USAGE_PAGE_VENDOR_DEFINED_BEGIN) { - TRACE( "Ignoring output caps %s, vendor specific.\n", debugstr_hid_value_caps( caps ) ); if (caps->flags & HID_VALUE_CAPS_IS_BUTTON) button_ofs += caps->usage_max - caps->usage_min + 1; else value_ofs += (caps->usage_max - caps->usage_min + 1) * sizeof(LONG); } @@ -593,9 +565,7 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *filter, node != node_end; ++node) { if (!node->usage_page) continue; - if (node->usage_page >= HID_USAGE_PAGE_VENDOR_DEFINED_BEGIN) - TRACE( "Ignoring collection %s, vendor specific.\n", debugstr_hid_collection_node( node ) ); - else + if (node->usage_page < HID_USAGE_PAGE_VENDOR_DEFINED_BEGIN) { instance.dwOfs = 0; instance.dwType = DIDFT_COLLECTION | DIDFT_MAKEINSTANCE( collection++ ) | DIDFT_NODATA; @@ -877,7 +847,7 @@ static HRESULT hid_joystick_get_effect_info( IDirectInputDevice8W *iface, DIEFFE usage, &button, &count, preparsed ); if (status != HIDP_STATUS_SUCCESS) { - WARN( "HidP_GetSpecificValueCaps %#x returned %#x\n", usage, status ); + WARN( "HidP_GetSpecificButtonCaps %#x returned %#x\n", usage, status ); return DIERR_DEVICENOTREG; } else if (!count)

1 0

Ivo Ivanov : dinput: Unacquire device when last public reference is released.
by Alexandre Julliard Nov. 12, 2021

Nov. 12, 2021

Module: wine Branch: master Commit: 99fc12f9a337876e3ba916cd20a5ee242acb6fe9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=99fc12f9a337876e3ba916cd… Author: Ivo Ivanov <logos128(a)gmail.com> Date: Fri Nov 12 09:49:38 2021 +0100 dinput: Unacquire device when last public reference is released. Avoid crashing in dinput_device_destroy, calling Unacquire while device resources may be already freed up. Signed-off-by: Ivo Ivanov <logos128(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 12670a46564..898b1d10ed0 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -740,8 +740,6 @@ void dinput_device_destroy( IDirectInputDevice8W *iface ) TRACE( "iface %p.\n", iface ); - IDirectInputDevice_Unacquire(iface); - free( This->data_queue ); /* Free data format */ @@ -768,6 +766,7 @@ static ULONG WINAPI dinput_device_Release( IDirectInputDevice8W *iface ) if (!ref) { + IDirectInputDevice_Unacquire( iface ); if (impl->vtbl->release) impl->vtbl->release( iface ); else dinput_device_destroy( iface ); }

1 0

Paul Gofman : bcrypt: Validate secret size in BCryptGenerateSymmetricKey().
by Alexandre Julliard Nov. 12, 2021

Nov. 12, 2021

Module: wine Branch: master Commit: 028837158a77bbe4c77e9e0ac0d439d25af53296 URL: https://source.winehq.org/git/wine.git/?a=commit;h=028837158a77bbe4c77e9e0a… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Nov 12 17:09:46 2021 +0300 bcrypt: Validate secret size in BCryptGenerateSymmetricKey(). Fixes online connection error in Forza Horizon 5. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 22 +++++++++++++++++++++- dlls/bcrypt/tests/bcrypt.c | 19 +++++++++++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 9e0d06e9cc7..542bd0756a0 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -1521,9 +1521,10 @@ NTSTATUS WINAPI BCryptGenerateSymmetricKey( BCRYPT_ALG_HANDLE algorithm, BCRYPT_ UCHAR *object, ULONG object_len, UCHAR *secret, ULONG secret_len, ULONG flags ) { + BCRYPT_KEY_LENGTHS_STRUCT key_lengths; struct algorithm *alg = algorithm; + ULONG block_size, size; struct key *key; - ULONG block_size; TRACE( "%p, %p, %p, %u, %p, %u, %08x\n", algorithm, handle, object, object_len, secret, secret_len, flags ); @@ -1538,6 +1539,25 @@ NTSTATUS WINAPI BCryptGenerateSymmetricKey( BCRYPT_ALG_HANDLE algorithm, BCRYPT_ if (!(block_size = get_block_size( alg ))) return STATUS_INVALID_PARAMETER; + if (!get_alg_property( alg, BCRYPT_KEY_LENGTHS, (UCHAR*)&key_lengths, sizeof(key_lengths), &size )) + { + if (secret_len > (size = key_lengths.dwMaxLength / 8)) + { + WARN( "secret_len %u exceeds key max length %u, setting to maximum.\n", secret_len, size ); + secret_len = size; + } + else if (secret_len < (size = key_lengths.dwMinLength / 8)) + { + WARN( "secret_len %u is less than minimum key length %u.\n", secret_len, size ); + return STATUS_INVALID_PARAMETER; + } + else if (key_lengths.dwIncrement && (secret_len * 8 - key_lengths.dwMinLength) % key_lengths.dwIncrement) + { + WARN( "secret_len %u is not a valid key length.\n", secret_len ); + return STATUS_INVALID_PARAMETER; + } + } + if (!(key = heap_alloc_zero( sizeof(*key) ))) return STATUS_NO_MEMORY; InitializeCriticalSection( &key->u.s.cs ); key->hdr.magic = MAGIC_KEY; diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index fb5ac03b039..4dd0f4195aa 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -731,6 +731,17 @@ static void test_BCryptGenerateSymmetricKey(void) key = NULL; buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); + + key = (BCRYPT_KEY_HANDLE)0xdeadbeef; + ret = pBCryptGenerateSymmetricKey(aes, &key, buf, len, secret, 1, 0); + ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); + ok(key == (HANDLE)0xdeadbeef, "got unexpected key %p.\n", key); + + key = (BCRYPT_KEY_HANDLE)0xdeadbeef; + ret = pBCryptGenerateSymmetricKey(aes, &key, buf, len, secret, sizeof(secret) + 1, 0); + ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); + ok(key == (HANDLE)0xdeadbeef, "got unexpected key %p.\n", key); + ret = pBCryptGenerateSymmetricKey(aes, &key, buf, len, secret, sizeof(secret), 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); ok(key != NULL, "key not set\n"); @@ -1101,8 +1112,16 @@ static void test_BCryptEncrypt(void) /* 256 bit key */ buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); + ret = pBCryptGenerateSymmetricKey(aes, &key, buf, len, secret256, sizeof(secret256), 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ret = pBCryptDestroyKey(key); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + + /* Key generations succeeds if the key size exceeds maximum and uses maximum key length + * from secret. */ + ret = pBCryptGenerateSymmetricKey(aes, &key, buf, len, secret256, sizeof(secret256) + 1, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); size = 0; memcpy(ivbuf, iv, sizeof(iv));

1 0

Alexandre Julliard : include: Stop building tlb files in the include directory.
by Alexandre Julliard Nov. 12, 2021

Nov. 12, 2021

Module: wine Branch: master Commit: 2a77543c5372de75bf09e96d39808409bd8d837a URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a77543c5372de75bf09e96d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 12 15:17:52 2021 +0100 include: Stop building tlb files in the include directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/stdole2.tlb/Makefile.in | 2 +- dlls/stdole2.tlb/std_ole_v2.idl | 23 ----------------------- {include => dlls/stdole2.tlb}/stdole2.idl | 3 +-- include/Makefile.in | 1 - include/oleacc.idl | 6 ------ 5 files changed, 2 insertions(+), 33 deletions(-) diff --git a/dlls/stdole2.tlb/Makefile.in b/dlls/stdole2.tlb/Makefile.in index 60163996d4c..1a254979a54 100644 --- a/dlls/stdole2.tlb/Makefile.in +++ b/dlls/stdole2.tlb/Makefile.in @@ -1,4 +1,4 @@ MODULE = stdole2.tlb RC_SRCS = rsrc.rc -IDL_SRCS = std_ole_v2.idl +IDL_SRCS = stdole2.idl diff --git a/dlls/stdole2.tlb/std_ole_v2.idl b/dlls/stdole2.tlb/std_ole_v2.idl deleted file mode 100644 index 649d1822889..00000000000 --- a/dlls/stdole2.tlb/std_ole_v2.idl +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (C) 2003 Robert Shearman - * 2005 Huw Davies - * - * 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 - * - */ - -#pragma makedep regtypelib - -#include "stdole2.idl" diff --git a/include/stdole2.idl b/dlls/stdole2.tlb/stdole2.idl similarity index 99% rename from include/stdole2.idl rename to dlls/stdole2.tlb/stdole2.idl index b65907072db..178d9b71690 100644 --- a/include/stdole2.idl +++ b/dlls/stdole2.tlb/stdole2.idl @@ -19,8 +19,7 @@ */ #if 0 -#pragma makedep install -#pragma makedep typelib +#pragma makedep regtypelib #endif #include <olectl.h> diff --git a/include/Makefile.in b/include/Makefile.in index 114440f8b39..df049fd284f 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -683,7 +683,6 @@ SOURCES = \ srcrst.idl \ srrestoreptapi.h \ sspi.h \ - stdole2.idl \ stgprop.h \ sti.h \ storage.h \ diff --git a/include/oleacc.idl b/include/oleacc.idl index 7cf0fa82db4..fd9c0786d1b 100644 --- a/include/oleacc.idl +++ b/include/oleacc.idl @@ -16,12 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#if 0 -#pragma makedep install -#pragma makedep typelib -#pragma makedep header -#endif - import "oaidl.idl"; #ifndef __WIDL__

1 0

Alexandre Julliard : makefiles: Make importlib dependencies point to their respective dll.
by Alexandre Julliard Nov. 12, 2021

Nov. 12, 2021

Module: wine Branch: master Commit: ef8b871e12a5c03fb678d4286a88e708c00326d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef8b871e12a5c03fb678d428… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 12 15:14:12 2021 +0100 makefiles: Make importlib dependencies point to their respective dll. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 58 ++++++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 41 insertions(+), 17 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index f9fbf7f8d8e..9a9e443456e 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -81,6 +81,7 @@ struct incl_file unsigned int files_size; /* total allocated size */ struct incl_file **files; struct strarray dependencies; /* file dependencies */ + struct strarray importlibdeps; /* importlib dependencies */ }; #define FLAG_GENERATED 0x000001 /* generated file */ @@ -1281,6 +1282,24 @@ static struct file *open_src_file( const struct makefile *make, struct incl_file } +/******************************************************************* + * find_importlib_module + */ +static struct makefile *find_importlib_module( const char *name ) +{ + unsigned int i, len; + + for (i = 0; i < subdirs.count; i++) + { + if (strncmp( submakes[i]->obj_dir, "dlls/", 5 )) continue; + len = strlen(submakes[i]->obj_dir); + if (strncmp( submakes[i]->obj_dir + 5, name, len - 5 )) continue; + if (!name[len - 5] || !strcmp( name + len - 5, ".dll" )) return submakes[i]; + } + return NULL; +} + + /******************************************************************* * open_include_file */ @@ -1333,6 +1352,14 @@ static struct file *open_include_file( const struct makefile *make, struct incl_ /* now try in source dir */ if ((file = open_local_file( make, pFile->name, &pFile->filename ))) return file; + /* check for global importlib (module dependency) */ + + if (pFile->type == INCL_IMPORTLIB && find_importlib_module( pFile->name )) + { + pFile->filename = pFile->name; + return NULL; + } + /* check for corresponding idl file in global includes */ if (strendswith( pFile->name, ".h" ) && @@ -1363,16 +1390,6 @@ static struct file *open_include_file( const struct makefile *make, struct incl_ return file; } - /* check for corresponding .tlb file in global includes */ - - if (strendswith( pFile->name, ".tlb" ) && - (file = open_global_header( make, replace_extension( pFile->name, ".tlb", ".idl" ), &filename ))) - { - pFile->sourcename = filename; - pFile->filename = strmake( "include/%s", pFile->name ); - return file; - } - /* check in global includes source dir */ if ((file = open_global_header( make, pFile->name, &pFile->filename ))) return file; @@ -1907,11 +1924,14 @@ static void get_dependencies( struct incl_file *file, struct incl_file *source ) if (file != source) { if (file->owner == source) return; /* already processed */ - if (file->type == INCL_IMPORTLIB && - !(source->file->flags & (FLAG_IDL_TYPELIB | FLAG_IDL_REGTYPELIB))) - return; /* library is imported only when building a typelib */ + if (file->type == INCL_IMPORTLIB) + { + if (!(source->file->flags & (FLAG_IDL_TYPELIB | FLAG_IDL_REGTYPELIB))) + return; /* library is imported only when building a typelib */ + strarray_add( &source->importlibdeps, file->filename ); + } + else strarray_add( &source->dependencies, file->filename ); file->owner = source; - strarray_add( &source->dependencies, file->filename ); /* sanity checks */ if (!strcmp( file->filename, "include/config.h" ) && @@ -2776,9 +2796,6 @@ static void output_source_idl( struct makefile *make, struct incl_file *source, if (source->file->flags & FLAG_IDL_HEADER) add_install_rule( make, source->name, strmake( "%s.h", obj ), strmake( "d$(includedir)/wine/%s.h", get_include_install_path( obj ) )); - if (source->file->flags & FLAG_IDL_TYPELIB) - add_install_rule( make, source->name, strmake( "%s.tlb", obj ), - strmake( "d$(includedir)/wine/%s.tlb", get_include_install_path( obj ) )); } if (!targets.count) return; @@ -2796,6 +2813,13 @@ static void output_source_idl( struct makefile *make, struct incl_file *source, output_filenames_obj_dir( make, targets ); output( ": %s", source->filename ); output_filenames( source->dependencies ); + for (i = 0; i < source->importlibdeps.count; i++) + { + struct makefile *submake = find_importlib_module( source->importlibdeps.str[i] ); + const char *module = submake->module; + if (*dll_ext && !submake->is_cross) module = strmake( "%s.fake", module ); + output_filename( obj_dir_path( submake, module )); + } output( "\n" ); }

1 0