wine-commits March 2023

wine-commits@winehq.org

1 participants
910 discussions

Hans Leidekker : bcrypt: Force symmetric key reset if necessary.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: oldstable Commit: 1e7b849d8cf5e4aaae44aab3e2bef2442f4eb135 URL: https://gitlab.winehq.org/wine/wine/-/commit/1e7b849d8cf5e4aaae44aab3e2bef2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 31 09:42:11 2022 +0200 bcrypt: Force symmetric key reset if necessary. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52457 (cherry picked from commit 745df5915cf4c7411d69b4fd2ba5d05a333f3947) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 6319a26dd4d..4c1143bd04e 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -991,14 +991,6 @@ static BOOL key_is_symmetric( struct key *key ) return builtin_algorithms[key->alg_id].class == BCRYPT_CIPHER_INTERFACE; } -static BOOL is_zero_vector( const UCHAR *vector, ULONG len ) -{ - ULONG i; - if (!vector) return FALSE; - for (i = 0; i < len; i++) if (vector[i]) return FALSE; - return TRUE; -} - static BOOL is_equal_vector( const UCHAR *vector, ULONG len, const UCHAR *vector2, ULONG len2 ) { if (!vector && !vector2) return TRUE; @@ -1006,10 +998,9 @@ static BOOL is_equal_vector( const UCHAR *vector, ULONG len, const UCHAR *vector return !memcmp( vector, vector2, len ); } -static NTSTATUS key_symmetric_set_vector( struct key *key, UCHAR *vector, ULONG vector_len ) +static NTSTATUS key_symmetric_set_vector( struct key *key, UCHAR *vector, ULONG vector_len, BOOL force_reset ) { - BOOL needs_reset = (!is_zero_vector( vector, vector_len ) || - !is_equal_vector( key->u.s.vector, key->u.s.vector_len, vector, vector_len )); + BOOL needs_reset = force_reset || !is_equal_vector( key->u.s.vector, key->u.s.vector_len, vector, vector_len ); free( key->u.s.vector ); key->u.s.vector = NULL; @@ -1150,7 +1141,7 @@ static NTSTATUS key_symmetric_encrypt( struct key *key, UCHAR *input, ULONG inp if (auth_info->dwFlags & BCRYPT_AUTH_MODE_CHAIN_CALLS_FLAG) FIXME( "call chaining not implemented\n" ); - if ((status = key_symmetric_set_vector( key, auth_info->pbNonce, auth_info->cbNonce ))) + if ((status = key_symmetric_set_vector( key, auth_info->pbNonce, auth_info->cbNonce, TRUE ))) return status; *ret_len = input_len; @@ -1186,7 +1177,7 @@ static NTSTATUS key_symmetric_encrypt( struct key *key, UCHAR *input, ULONG inp if (!output) return STATUS_SUCCESS; if (output_len < *ret_len) return STATUS_BUFFER_TOO_SMALL; if (key->u.s.mode == MODE_ID_ECB && iv) return STATUS_INVALID_PARAMETER; - if ((status = key_symmetric_set_vector( key, iv, iv_len ))) return status; + if ((status = key_symmetric_set_vector( key, iv, iv_len, flags & BCRYPT_BLOCK_PADDING ))) return status; encrypt_params.key = key; encrypt_params.input = input; @@ -1197,7 +1188,7 @@ static NTSTATUS key_symmetric_encrypt( struct key *key, UCHAR *input, ULONG inp { if ((status = UNIX_CALL( key_symmetric_encrypt, &encrypt_params ))) return status; - if (key->u.s.mode == MODE_ID_ECB && (status = key_symmetric_set_vector( key, NULL, 0 ))) + if (key->u.s.mode == MODE_ID_ECB && (status = key_symmetric_set_vector( key, NULL, 0, TRUE ))) return status; bytes_left -= key->u.s.block_size; encrypt_params.input += key->u.s.block_size; @@ -1236,7 +1227,7 @@ static NTSTATUS key_symmetric_decrypt( struct key *key, UCHAR *input, ULONG inpu if (!auth_info->pbTag) return STATUS_INVALID_PARAMETER; if (auth_info->cbTag < 12 || auth_info->cbTag > 16) return STATUS_INVALID_PARAMETER; - if ((status = key_symmetric_set_vector( key, auth_info->pbNonce, auth_info->cbNonce ))) + if ((status = key_symmetric_set_vector( key, auth_info->pbNonce, auth_info->cbNonce, TRUE ))) return status; *ret_len = input_len; @@ -1278,7 +1269,7 @@ static NTSTATUS key_symmetric_decrypt( struct key *key, UCHAR *input, ULONG inpu else if (output_len < *ret_len) return STATUS_BUFFER_TOO_SMALL; if (key->u.s.mode == MODE_ID_ECB && iv) return STATUS_INVALID_PARAMETER; - if ((status = key_symmetric_set_vector( key, iv, iv_len ))) return status; + if ((status = key_symmetric_set_vector( key, iv, iv_len, flags & BCRYPT_BLOCK_PADDING ))) return status; decrypt_params.key = key; decrypt_params.input = input; @@ -1288,7 +1279,7 @@ static NTSTATUS key_symmetric_decrypt( struct key *key, UCHAR *input, ULONG inpu while (bytes_left >= key->u.s.block_size) { if ((status = UNIX_CALL( key_symmetric_decrypt, &decrypt_params ))) return status; - if (key->u.s.mode == MODE_ID_ECB && (status = key_symmetric_set_vector( key, NULL, 0 ))) + if (key->u.s.mode == MODE_ID_ECB && (status = key_symmetric_set_vector( key, NULL, 0, TRUE ))) return status; bytes_left -= key->u.s.block_size; decrypt_params.input += key->u.s.block_size;

1 0

Zhiyi Zhang : comctl32: Check reference data pointer before using it.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: oldstable Commit: c1d1b74646d0d61487152b23529958ba6cfdd528 URL: https://gitlab.winehq.org/wine/wine/-/commit/c1d1b74646d0d61487152b23529958… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Aug 16 11:25:46 2022 +0800 comctl32: Check reference data pointer before using it. Fix the crash when opening notepad++ v8.4.4 preference dialog before e52e42b. (cherry picked from commit 9b9fef2e112ff2ce0e1ce2da3aaacd2ffefa6d87) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/commctrl.c | 3 ++- dlls/comctl32/tests/subclass.c | 4 ---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index b457bdcb8be..09061cc4c5e 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -1175,7 +1175,8 @@ BOOL WINAPI GetWindowSubclass (HWND hWnd, SUBCLASSPROC pfnSubclass, while (proc) { if ((proc->id == uID) && (proc->subproc == pfnSubclass)) { - *pdwRef = proc->ref; + if (pdwRef) + *pdwRef = proc->ref; return TRUE; } proc = proc->next; diff --git a/dlls/comctl32/tests/subclass.c b/dlls/comctl32/tests/subclass.c index 9a3bece4a40..683323a0774 100644 --- a/dlls/comctl32/tests/subclass.c +++ b/dlls/comctl32/tests/subclass.c @@ -371,12 +371,8 @@ static void test_GetWindowSubclass(void) todo_wine ok(data == 0, "Got unexpected data %#Ix.\n", data); - /* Crash on Wine */ - if (strcmp(winetest_platform, "wine")) - { ret = pGetWindowSubclass(hwnd, wnd_proc_sub, 2, NULL); ok(ret, "GetWindowSubclass failed.\n"); - } data = 0xdeadbeef; ret = pGetWindowSubclass(hwnd, wnd_proc_sub, 2, &data);

1 0

Zhiyi Zhang : comctl32/tests: Add GetWindowSubclass() tests.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: oldstable Commit: dde942e4d317a9c58076c7ce6e466b5272eaab02 URL: https://gitlab.winehq.org/wine/wine/-/commit/dde942e4d317a9c58076c7ce6e466b… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Aug 16 11:22:55 2022 +0800 comctl32/tests: Add GetWindowSubclass() tests. (cherry picked from commit f7443102009fb67a0dc7a5bca60f6cc46209bb30) Conflicts: dlls/comctl32/tests/subclass.c Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/tests/subclass.c | 52 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 51 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/subclass.c b/dlls/comctl32/tests/subclass.c index b2b47319b16..9a3bece4a40 100644 --- a/dlls/comctl32/tests/subclass.c +++ b/dlls/comctl32/tests/subclass.c @@ -29,6 +29,7 @@ #include "wine/heap.h" #include "wine/test.h" +static BOOL (WINAPI *pGetWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR, DWORD_PTR *); static BOOL (WINAPI *pSetWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR, DWORD_PTR); static BOOL (WINAPI *pRemoveWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR); static LRESULT (WINAPI *pDefSubclassProc)(HWND, UINT, WPARAM, LPARAM); @@ -311,11 +312,12 @@ static BOOL init_function_pointers(void) */ #define MAKEFUNC_ORD(f, ord) (p##f = (void*)GetProcAddress(hmod, (LPSTR)(ord))) MAKEFUNC_ORD(SetWindowSubclass, 410); + MAKEFUNC_ORD(GetWindowSubclass, 411); MAKEFUNC_ORD(RemoveWindowSubclass, 412); MAKEFUNC_ORD(DefSubclassProc, 413); #undef MAKEFUNC_ORD - if(!pSetWindowSubclass || !pRemoveWindowSubclass || !pDefSubclassProc) + if(!pSetWindowSubclass || !pGetWindowSubclass || !pRemoveWindowSubclass || !pDefSubclassProc) { win_skip("SetWindowSubclass and friends are not available\n"); return FALSE; @@ -338,6 +340,53 @@ static BOOL init_function_pointers(void) return TRUE; } +static void test_GetWindowSubclass(void) +{ + DWORD_PTR data; + HWND hwnd; + BOOL ret; + + hwnd = CreateWindowA("TestSubclass", "Test subclass", WS_OVERLAPPEDWINDOW, 100, 100, 200, 200, + 0, 0, 0, NULL); + ok(hwnd != NULL, "CreateWindowA failed, error %d.\n", GetLastError()); + + ret = pSetWindowSubclass(hwnd, wnd_proc_sub, 2, 7); + ok(ret, "SetWindowSubclass failed.\n"); + + data = 0xdeadbeef; + ret = pGetWindowSubclass(NULL, wnd_proc_sub, 2, &data); + ok(!ret, "GetWindowSubclass succeeded.\n"); + todo_wine + ok(data == 0, "Got unexpected data %#Ix.\n", data); + + data = 0xdeadbeef; + ret = pGetWindowSubclass(hwnd, NULL, 2, &data); + ok(!ret, "GetWindowSubclass succeeded.\n"); + todo_wine + ok(data == 0, "Got unexpected data %#Ix.\n", data); + + data = 0xdeadbeef; + ret = pGetWindowSubclass(hwnd, wnd_proc_sub, 0, &data); + ok(!ret, "GetWindowSubclass succeeded.\n"); + todo_wine + ok(data == 0, "Got unexpected data %#Ix.\n", data); + + /* Crash on Wine */ + if (strcmp(winetest_platform, "wine")) + { + ret = pGetWindowSubclass(hwnd, wnd_proc_sub, 2, NULL); + ok(ret, "GetWindowSubclass failed.\n"); + } + + data = 0xdeadbeef; + ret = pGetWindowSubclass(hwnd, wnd_proc_sub, 2, &data); + ok(ret, "GetWindowSubclass failed.\n"); + ok(data == 7, "Got unexpected data %#Ix.\n", data); + + pRemoveWindowSubclass(hwnd, wnd_proc_sub, 2); + DestroyWindow(hwnd); +} + START_TEST(subclass) { if(!init_function_pointers()) return; @@ -345,4 +394,5 @@ START_TEST(subclass) if(!register_window_classes()) return; test_subclass(); + test_GetWindowSubclass(); }

1 0

Robert Wilhelm : scrrun: Correct string length returned from GetTempName.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: oldstable Commit: 77240624fa5098e1c21b07901065a5368b0675a7 URL: https://gitlab.winehq.org/wine/wine/-/commit/77240624fa5098e1c21b07901065a5… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Fri Aug 19 10:54:25 2022 +0200 scrrun: Correct string length returned from GetTempName. You have to pass string length without terminal null to SysAllocStringLen. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53569 (cherry picked from commit 1f4c48a0007341589bb7c17b95268669c988bfbc) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/scrrun/filesystem.c | 2 +- dlls/scrrun/tests/filesystem.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 290a643c29a..28636800131 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -3324,7 +3324,7 @@ static HRESULT WINAPI filesys_GetTempName(IFileSystem3 *iface, BSTR *result) if (!result) return E_POINTER; - if (!(*result = SysAllocStringLen(NULL, 13))) + if (!(*result = SysAllocStringLen(NULL, 12))) return E_OUTOFMEMORY; if(!RtlGenRandom(&random, sizeof(random))) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index f8095747af9..d6907abb103 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -483,7 +483,7 @@ static void test_GetTempName(void) hr = IFileSystem3_GetTempName(fs3, &result); ok(hr == S_OK, "GetTempName returned %x, expected S_OK\n", hr); ok(!!wcsstr( result,L".tmp"), "GetTempName returned %s, expected .tmp suffix\n", debugstr_w(result)); - todo_wine ok(SysStringLen(result) == lstrlenW(result),"GetTempName returned %s, has incorrect string len.\n", debugstr_w(result)); + ok(SysStringLen(result) == lstrlenW(result),"GetTempName returned %s, has incorrect string len.\n", debugstr_w(result)); SysFreeString(result); }

1 0

Robert Wilhelm : scrrun: Add test for correct string length returned from GetTempName.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: oldstable Commit: 87a77ff6b926d5f842aa12e610e505109facffee URL: https://gitlab.winehq.org/wine/wine/-/commit/87a77ff6b926d5f842aa12e610e505… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Fri Aug 19 10:50:57 2022 +0200 scrrun: Add test for correct string length returned from GetTempName. (cherry picked from commit 412e1de2b4ec79a20ee8d5800f5995e03f12efd3) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/scrrun/tests/filesystem.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 0d2cc39bad9..f8095747af9 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -483,6 +483,7 @@ static void test_GetTempName(void) hr = IFileSystem3_GetTempName(fs3, &result); ok(hr == S_OK, "GetTempName returned %x, expected S_OK\n", hr); ok(!!wcsstr( result,L".tmp"), "GetTempName returned %s, expected .tmp suffix\n", debugstr_w(result)); + todo_wine ok(SysStringLen(result) == lstrlenW(result),"GetTempName returned %s, has incorrect string len.\n", debugstr_w(result)); SysFreeString(result); }

1 0

Alistair Leslie-Hughes : dsdmo: Add Compressor FX Support.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: oldstable Commit: 19cae551cddd5db372edff633db000c93e6c09d5 URL: https://gitlab.winehq.org/wine/wine/-/commit/19cae551cddd5db372edff633db000… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Aug 13 15:03:46 2022 +1000 dsdmo: Add Compressor FX Support. (cherry picked from commit 39889f19c3db917703a8b42167ee4084dfa091d7) Conflicts: dlls/dsdmo/tests/dsdmo.c Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dsdmo/dsdmo.idl | 8 ++++ dlls/dsdmo/main.c | 97 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/dsdmo/tests/dsdmo.c | 8 ++-- 3 files changed, 109 insertions(+), 4 deletions(-) diff --git a/dlls/dsdmo/dsdmo.idl b/dlls/dsdmo/dsdmo.idl index c8130f8a1ce..3922b4d6778 100644 --- a/dlls/dsdmo/dsdmo.idl +++ b/dlls/dsdmo/dsdmo.idl @@ -49,3 +49,11 @@ coclass DirectSoundWavesReverbDMO {} vi_progid("Microsoft.DirectSoundEchoDMO") ] coclass DirectSoundEchoDMO {} + +[ + uuid(ef011f79-4000-406d-87af-bffb3fc39d57), + threading(both), + progid("Microsoft.DirectSoundCompressorDMO.1"), + vi_progid("Microsoft.DirectSoundCompressorDMO") +] +coclass DirectSoundCompressorDMO {} diff --git a/dlls/dsdmo/main.c b/dlls/dsdmo/main.c index bc5580df9bc..2f20c53d515 100644 --- a/dlls/dsdmo/main.c +++ b/dlls/dsdmo/main.c @@ -893,6 +893,102 @@ static HRESULT echo_create(IUnknown *outer, IUnknown **out) return S_OK; } +struct dmo_compressorfx +{ + struct effect effect; + IDirectSoundFXCompressor IDirectSoundFXCompressor_iface; +}; + +static inline struct dmo_compressorfx *impl_from_IDirectSoundFXCompressor(IDirectSoundFXCompressor *iface) +{ + return CONTAINING_RECORD(iface, struct dmo_compressorfx, IDirectSoundFXCompressor_iface); +} + +static HRESULT WINAPI compressorfx_QueryInterface(IDirectSoundFXCompressor *iface, REFIID iid, void **out) +{ + struct dmo_compressorfx *effect = impl_from_IDirectSoundFXCompressor(iface); + return IUnknown_QueryInterface(effect->effect.outer_unk, iid, out); +} + +static ULONG WINAPI compressorfx_AddRef(IDirectSoundFXCompressor *iface) +{ + struct dmo_compressorfx *effect = impl_from_IDirectSoundFXCompressor(iface); + return IUnknown_AddRef(effect->effect.outer_unk); +} + +static ULONG WINAPI compressorfx_Release(IDirectSoundFXCompressor *iface) +{ + struct dmo_compressorfx *effect = impl_from_IDirectSoundFXCompressor(iface); + return IUnknown_Release(effect->effect.outer_unk); +} + +static HRESULT WINAPI compressorfx_SetAllParameters(IDirectSoundFXCompressor *iface, const DSFXCompressor *compressor) +{ + struct dmo_compressorfx *This = impl_from_IDirectSoundFXCompressor(iface); + FIXME("(%p) %p\n", This, compressor); + + return E_NOTIMPL; +} + +static HRESULT WINAPI compressorfx_GetAllParameters(IDirectSoundFXCompressor *iface, DSFXCompressor *compressor) +{ + struct dmo_compressorfx *This = impl_from_IDirectSoundFXCompressor(iface); + FIXME("(%p) %p\n", This, compressor); + + return E_NOTIMPL; +} + +static const struct IDirectSoundFXCompressorVtbl compressor_vtbl = +{ + compressorfx_QueryInterface, + compressorfx_AddRef, + compressorfx_Release, + compressorfx_SetAllParameters, + compressorfx_GetAllParameters +}; + +static struct dmo_compressorfx *impl_compressor_from_effect(struct effect *iface) +{ + return CONTAINING_RECORD(iface, struct dmo_compressorfx, effect); +} + +static void *compressor_query_interface(struct effect *iface, REFIID iid) +{ + struct dmo_compressorfx *effect = impl_compressor_from_effect(iface); + + if (IsEqualGUID(iid, &IID_IDirectSoundFXCompressor)) + return &effect->IDirectSoundFXCompressor_iface; + return NULL; +} + +static void compressor_destroy(struct effect *iface) +{ + struct dmo_compressorfx *effect = impl_compressor_from_effect(iface); + + free(effect); +} + +static const struct effect_ops compressor_ops = +{ + .destroy = compressor_destroy, + .query_interface = compressor_query_interface, +}; + +static HRESULT compressor_create(IUnknown *outer, IUnknown **out) +{ + struct dmo_compressorfx *object; + + if (!(object = calloc(1, sizeof(*object)))) + return E_OUTOFMEMORY; + + effect_init(&object->effect, outer, &compressor_ops); + object->IDirectSoundFXCompressor_iface.lpVtbl = &compressor_vtbl; + + TRACE("Created compressor effect %p.\n", object); + *out = &object->effect.IUnknown_inner; + return S_OK; +} + struct class_factory { IClassFactory IClassFactory_iface; @@ -978,6 +1074,7 @@ class_factories[] = {&GUID_DSFX_STANDARD_PARAMEQ, {{&class_factory_vtbl}, eq_create}}, {&GUID_DSFX_WAVES_REVERB, {{&class_factory_vtbl}, waves_reverb_create}}, {&GUID_DSFX_STANDARD_ECHO, {{&class_factory_vtbl}, echo_create}}, + {&GUID_DSFX_STANDARD_COMPRESSOR, {{&class_factory_vtbl}, compressor_create}}, }; HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID iid, void **out) diff --git a/dlls/dsdmo/tests/dsdmo.c b/dlls/dsdmo/tests/dsdmo.c index db22d5bdecb..58089a9d2ef 100644 --- a/dlls/dsdmo/tests/dsdmo.c +++ b/dlls/dsdmo/tests/dsdmo.c @@ -327,12 +327,12 @@ static void test_compressor_parameters(void) hr = CoCreateInstance(&GUID_DSFX_STANDARD_COMPRESSOR, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectSoundFXCompressor, (void **)&compressor); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IDirectSoundFXCompressor_GetAllParameters(compressor, &params); todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); if (hr != S_OK) return; - - hr = IDirectSoundFXCompressor_GetAllParameters(compressor, &params); - ok(hr == S_OK, "Got hr %#x.\n", hr); ok(params.fGain == 0.0f, "Got gain %.8e dB.\n", params.fGain); ok(params.fAttack == 10.0f, "Got attack time %.8e ms.\n", params.fAttack); ok(params.fThreshold == -20.0f, "Got threshold %.8e dB.\n", params.fThreshold); @@ -537,7 +537,7 @@ START_TEST(dsdmo) tests[] = { {&GUID_DSFX_STANDARD_CHORUS, &IID_IDirectSoundFXChorus, TRUE}, - {&GUID_DSFX_STANDARD_COMPRESSOR, &IID_IDirectSoundFXCompressor, TRUE}, + {&GUID_DSFX_STANDARD_COMPRESSOR, &IID_IDirectSoundFXCompressor}, {&GUID_DSFX_STANDARD_DISTORTION, &IID_IDirectSoundFXDistortion, TRUE}, {&GUID_DSFX_STANDARD_ECHO, &IID_IDirectSoundFXEcho}, {&GUID_DSFX_STANDARD_FLANGER, &IID_IDirectSoundFXFlanger, TRUE},

1 0

Alistair Leslie-Hughes : dsdmo: Add Echo FX Support.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: oldstable Commit: ad33cafe74685ee83ff16ace5da46041da66c3ea URL: https://gitlab.winehq.org/wine/wine/-/commit/ad33cafe74685ee83ff16ace5da460… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Aug 13 11:57:20 2022 +1000 dsdmo: Add Echo FX Support. (cherry picked from commit 6d8279f0ee34a1cbb9463c4f952144d31d082633) Conflicts: dlls/dsdmo/tests/dsdmo.c Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dsdmo/dsdmo.idl | 8 ++++ dlls/dsdmo/main.c | 97 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/dsdmo/tests/dsdmo.c | 8 ++-- 3 files changed, 110 insertions(+), 3 deletions(-) diff --git a/dlls/dsdmo/dsdmo.idl b/dlls/dsdmo/dsdmo.idl index 7f172084828..c8130f8a1ce 100644 --- a/dlls/dsdmo/dsdmo.idl +++ b/dlls/dsdmo/dsdmo.idl @@ -41,3 +41,11 @@ coclass DirectSoundParamEqDMO {} uuid(87fc0268-9a55-4360-95aa-004a1d9de26c) ] coclass DirectSoundWavesReverbDMO {} + +[ + uuid(ef3e932c-d40b-4f51-8ccf-3f98f1b29d5d), + threading(both), + progid("Microsoft.DirectSoundEchoDMO.1"), + vi_progid("Microsoft.DirectSoundEchoDMO") +] +coclass DirectSoundEchoDMO {} diff --git a/dlls/dsdmo/main.c b/dlls/dsdmo/main.c index fa39c28abd7..bc5580df9bc 100644 --- a/dlls/dsdmo/main.c +++ b/dlls/dsdmo/main.c @@ -797,6 +797,102 @@ static HRESULT waves_reverb_create(IUnknown *outer, IUnknown **out) return S_OK; } +struct dmo_echofx +{ + struct effect effect; + IDirectSoundFXEcho IDirectSoundFXEcho_iface; +}; + +static inline struct dmo_echofx *impl_from_IDirectSoundFXEcho(IDirectSoundFXEcho *iface) +{ + return CONTAINING_RECORD(iface, struct dmo_echofx, IDirectSoundFXEcho_iface); +} + +static HRESULT WINAPI echofx_QueryInterface(IDirectSoundFXEcho *iface, REFIID iid, void **out) +{ + struct dmo_echofx *effect = impl_from_IDirectSoundFXEcho(iface); + return IUnknown_QueryInterface(effect->effect.outer_unk, iid, out); +} + +static ULONG WINAPI echofx_AddRef(IDirectSoundFXEcho *iface) +{ + struct dmo_echofx *effect = impl_from_IDirectSoundFXEcho(iface); + return IUnknown_AddRef(effect->effect.outer_unk); +} + +static ULONG WINAPI echofx_Release(IDirectSoundFXEcho *iface) +{ + struct dmo_echofx *effect = impl_from_IDirectSoundFXEcho(iface); + return IUnknown_Release(effect->effect.outer_unk); +} + +static HRESULT WINAPI echofx_SetAllParameters(IDirectSoundFXEcho *iface, const DSFXEcho *echo) +{ + struct dmo_echofx *effect = impl_from_IDirectSoundFXEcho(iface); + FIXME("(%p) %p\n", effect, echo); + + return E_NOTIMPL; +} + +static HRESULT WINAPI echofx_GetAllParameters(IDirectSoundFXEcho *iface, DSFXEcho *echo) +{ + struct dmo_echofx *effect = impl_from_IDirectSoundFXEcho(iface); + FIXME("(%p) %p\n", effect, echo); + + return E_NOTIMPL; +} + +static const struct IDirectSoundFXEchoVtbl echofx_vtbl = +{ + echofx_QueryInterface, + echofx_AddRef, + echofx_Release, + echofx_SetAllParameters, + echofx_GetAllParameters +}; + +static struct dmo_echofx *impl_echo_from_effect(struct effect *iface) +{ + return CONTAINING_RECORD(iface, struct dmo_echofx, effect); +} + +static void *echo_query_interface(struct effect *iface, REFIID iid) +{ + struct dmo_echofx *effect = impl_echo_from_effect(iface); + + if (IsEqualGUID(iid, &IID_IDirectSoundFXEcho)) + return &effect->IDirectSoundFXEcho_iface; + return NULL; +} + +static void echo_destroy(struct effect *iface) +{ + struct dmo_echofx *effect = impl_echo_from_effect(iface); + + free(effect); +} + +static const struct effect_ops echo_ops = +{ + .destroy = echo_destroy, + .query_interface = echo_query_interface, +}; + +static HRESULT echo_create(IUnknown *outer, IUnknown **out) +{ + struct dmo_echofx *object; + + if (!(object = calloc(1, sizeof(*object)))) + return E_OUTOFMEMORY; + + effect_init(&object->effect, outer, &echo_ops); + object->IDirectSoundFXEcho_iface.lpVtbl = &echofx_vtbl; + + TRACE("Created echo effect %p.\n", object); + *out = &object->effect.IUnknown_inner; + return S_OK; +} + struct class_factory { IClassFactory IClassFactory_iface; @@ -881,6 +977,7 @@ class_factories[] = {&GUID_DSFX_STANDARD_I3DL2REVERB, {{&class_factory_vtbl}, reverb_create}}, {&GUID_DSFX_STANDARD_PARAMEQ, {{&class_factory_vtbl}, eq_create}}, {&GUID_DSFX_WAVES_REVERB, {{&class_factory_vtbl}, waves_reverb_create}}, + {&GUID_DSFX_STANDARD_ECHO, {{&class_factory_vtbl}, echo_create}}, }; HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID iid, void **out) diff --git a/dlls/dsdmo/tests/dsdmo.c b/dlls/dsdmo/tests/dsdmo.c index 1ecafeb7ceb..db22d5bdecb 100644 --- a/dlls/dsdmo/tests/dsdmo.c +++ b/dlls/dsdmo/tests/dsdmo.c @@ -377,12 +377,14 @@ static void test_echo_parameters(void) hr = CoCreateInstance(&GUID_DSFX_STANDARD_ECHO, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectSoundFXEcho, (void **)&echo); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); if (hr != S_OK) return; hr = IDirectSoundFXEcho_GetAllParameters(echo, &params); - ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + if (hr != S_OK) + return; ok(params.fWetDryMix == 50.0f, "Got %.8e%% wetness.\n", params.fWetDryMix); ok(params.fFeedback == 50.0f, "Got %.8e%% feedback.\n", params.fFeedback); ok(params.fLeftDelay == 500.0f, "Got left delay %.8e ms.\n", params.fLeftDelay); @@ -537,7 +539,7 @@ START_TEST(dsdmo) {&GUID_DSFX_STANDARD_CHORUS, &IID_IDirectSoundFXChorus, TRUE}, {&GUID_DSFX_STANDARD_COMPRESSOR, &IID_IDirectSoundFXCompressor, TRUE}, {&GUID_DSFX_STANDARD_DISTORTION, &IID_IDirectSoundFXDistortion, TRUE}, - {&GUID_DSFX_STANDARD_ECHO, &IID_IDirectSoundFXEcho, TRUE}, + {&GUID_DSFX_STANDARD_ECHO, &IID_IDirectSoundFXEcho}, {&GUID_DSFX_STANDARD_FLANGER, &IID_IDirectSoundFXFlanger, TRUE}, {&GUID_DSFX_STANDARD_GARGLE, &IID_IDirectSoundFXGargle, TRUE}, {&GUID_DSFX_STANDARD_I3DL2REVERB, &IID_IDirectSoundFXI3DL2Reverb},

1 0

Robert Wilhelm : scrrun: Added DateCreated property for IFile.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: oldstable Commit: 9574248ea5e406e9aba9dcd8a2ae0ca52deae736 URL: https://gitlab.winehq.org/wine/wine/-/commit/9574248ea5e406e9aba9dcd8a2ae0c… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Mon Aug 22 08:36:10 2022 +0200 scrrun: Added DateCreated property for IFile. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42857 (cherry picked from commit 8eb7843d206d014acf93239d6782a199228472e7) Conflicts: dlls/scrrun/tests/filesystem.c Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/scrrun/filesystem.c | 12 +++++++++--- dlls/scrrun/tests/filesystem.c | 8 ++++++++ 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 5d7d42850ab..290a643c29a 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -2820,11 +2820,17 @@ static HRESULT get_date_from_filetime(const FILETIME *ft, DATE *date) return S_OK; } -static HRESULT WINAPI file_get_DateCreated(IFile *iface, DATE *pdate) +static HRESULT WINAPI file_get_DateCreated(IFile *iface, DATE *date) { struct file *This = impl_from_IFile(iface); - FIXME("(%p)->(%p)\n", This, pdate); - return E_NOTIMPL; + WIN32_FILE_ATTRIBUTE_DATA attrs; + + TRACE("(%p)->(%p)\n", This, date); + + if (GetFileAttributesExW(This->path, GetFileExInfoStandard, &attrs)) + return get_date_from_filetime(&attrs.ftCreationTime, date); + + return E_FAIL; } static HRESULT WINAPI file_get_DateLastModified(IFile *iface, DATE *date) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index da1ca316382..0d2cc39bad9 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -632,6 +632,14 @@ static void test_GetFile(void) hr = IFileSystem3_GetFile(fs3, path, &file); ok(hr == S_OK, "GetFile returned %x, expected S_OK\n", hr); + hr = IFile_get_DateCreated(file, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + date = 0.0; + hr = IFile_get_DateCreated(file, &date); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(date > 0.0, "got %f\n", date); + hr = IFile_get_DateLastModified(file, NULL); ok(hr == E_POINTER, "got 0x%08x\n", hr);

1 0

Angelo Haller : comctl32/tests: Add more ownerdata listview tests.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: oldstable Commit: 60d30664cffb3760d97035c154b9dd4d3cad053e URL: https://gitlab.winehq.org/wine/wine/-/commit/60d30664cffb3760d97035c154b9dd… Author: Angelo Haller <angelo(a)szanni.org> Date: Tue Jun 28 16:16:06 2022 -0500 comctl32/tests: Add more ownerdata listview tests. Signed-off-by: Angelo Haller <angelo(a)szanni.org> (cherry picked from commit ef79843c94e8735a1899cfb7064ce8ed6b343e19) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/tests/listview.c | 184 ++++++++++++++++++++++++++++++++--------- 1 file changed, 143 insertions(+), 41 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 13069410ac1..99c13eeaacf 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -245,11 +245,77 @@ static const struct message ownerdata_deselect_all_parent_seq[] = { { 0 } }; -static const struct message ownerdata_multiselect_odstatechanged_seq[] = { - { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGED }, +static const struct message ownerdata_multiselect_select_0_to_1_odstatechanged_seq[] = { + { WM_NOTIFY, sent|id|wparam, -1, 0, LVN_ITEMCHANGED }, { WM_NOTIFY, sent|id, 0, 0, LVN_ODSTATECHANGED }, - { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGED }, - { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGED }, + { WM_NOTIFY, sent|id|wparam, 0, 0, LVN_ITEMCHANGED }, + { WM_NOTIFY, sent|id|wparam, 1, 0, LVN_ITEMCHANGED }, + { 0 } +}; + +static const struct message ownerdata_multiselect_select_0_odstatechanged_seq[] = { + { WM_NOTIFY, sent|id|wparam, -1, 0, LVN_ITEMCHANGED }, + { WM_NOTIFY, sent|id|wparam, 1, 0, LVN_ITEMCHANGED }, + { WM_NOTIFY, sent|id|wparam, 0, 0, LVN_ITEMCHANGED }, + { 0 } +}; + +static const struct message ownerdata_multiselect_select_0_modkey_odstatechanged_seq[] = { + { WM_NOTIFY, sent|id|wparam, -1, 0, LVN_ITEMCHANGED }, + { WM_NOTIFY, sent|id|wparam, 0, 0, LVN_ITEMCHANGED }, + { WM_NOTIFY, sent|id|wparam, 1, 0, LVN_ITEMCHANGED }, + { WM_NOTIFY, sent|id|wparam, 0, 0, LVN_ITEMCHANGED }, + { 0 } +}; + +static const struct message ownerdata_multiselect_move_0_to_1_odstatechanged_seq[] = { + { WM_NOTIFY, sent|id|wparam, 0, 0, LVN_ITEMCHANGED }, + { WM_NOTIFY, sent|id|wparam, 1, 0, LVN_ITEMCHANGED }, + { 0 } +}; + +static const struct message ownerdata_multiselect_select_0_to_2_odstatechanged_seq[] = { + { WM_NOTIFY, sent|id|wparam, -1, 0, LVN_ITEMCHANGED }, + { WM_NOTIFY, sent|id, 0, 0, LVN_ODSTATECHANGED }, + { WM_NOTIFY, sent|id|wparam, 1, 0, LVN_ITEMCHANGED }, + { WM_NOTIFY, sent|id|wparam, 2, 0, LVN_ITEMCHANGED }, + { 0 } +}; + +static const struct message ownerdata_multiselect_select_3_odstatechanged_seq[] = { + { WM_NOTIFY, sent|id|wparam, -1, 0, LVN_ITEMCHANGED }, + { WM_NOTIFY, sent|id|wparam, 2, 0, LVN_ITEMCHANGED }, + { WM_NOTIFY, sent|id|wparam, 3, 0, LVN_ITEMCHANGED }, + { 0 } +}; + +static const struct message ownerdata_multiselect_select_3_modkey_odstatechanged_seq[] = { + { WM_NOTIFY, sent|id|wparam, -1, 0, LVN_ITEMCHANGED }, + { WM_NOTIFY, sent|id|wparam, 3, 0, LVN_ITEMCHANGED }, + { WM_NOTIFY, sent|id|wparam, 2, 0, LVN_ITEMCHANGED }, + { WM_NOTIFY, sent|id|wparam, 3, 0, LVN_ITEMCHANGED }, + { 0 } +}; + +static const struct message ownerdata_multiselect_select_3_to_2_odstatechanged_seq[] = { + { WM_NOTIFY, sent|id|wparam, -1, 0, LVN_ITEMCHANGED }, + { WM_NOTIFY, sent|id, 0, 0, LVN_ODSTATECHANGED }, + { WM_NOTIFY, sent|id|wparam, 3, 0, LVN_ITEMCHANGED }, + { WM_NOTIFY, sent|id|wparam, 2, 0, LVN_ITEMCHANGED }, + { 0 } +}; + +static const struct message ownerdata_multiselect_move_3_to_2_odstatechanged_seq[] = { + { WM_NOTIFY, sent|id|wparam, 3, 0, LVN_ITEMCHANGED }, + { WM_NOTIFY, sent|id|wparam, 2, 0, LVN_ITEMCHANGED }, + { 0 } +}; + +static const struct message ownerdata_multiselect_select_3_to_1_odstatechanged_seq[] = { + { WM_NOTIFY, sent|id|wparam, -1, 0, LVN_ITEMCHANGED }, + { WM_NOTIFY, sent|id, 0, 0, LVN_ODSTATECHANGED }, + { WM_NOTIFY, sent|id|wparam, 2, 0, LVN_ITEMCHANGED }, + { WM_NOTIFY, sent|id|wparam, 1, 0, LVN_ITEMCHANGED }, { 0 } }; @@ -3547,6 +3613,52 @@ static void test_ownerdata_multiselect(void) HWND hwnd; DWORD res; LVITEMA item; + unsigned int i; + char buf[256]; + + static const struct + { + BOOL hold_shift; + BOOL hold_control; + UINT press_key; + UINT selected_count; + const char *context; + const struct message *expected; + BOOL todo; + } + key_tests[] = + { + /* First down then up */ + { TRUE, FALSE, VK_DOWN, 2, "select multiple via SHIFT+DOWN", + ownerdata_multiselect_select_0_to_1_odstatechanged_seq, FALSE }, + { TRUE, FALSE, VK_UP, 1, "select one item via SHIFT+UP", + ownerdata_multiselect_select_0_modkey_odstatechanged_seq, TRUE }, + { TRUE, TRUE, VK_DOWN, 2, "select multiple via SHIFT+CONTROL+DOWN", + ownerdata_multiselect_select_0_to_1_odstatechanged_seq, FALSE }, + { TRUE, TRUE, VK_UP, 1, "select one item via SHIFT+CONTROL+UP", + ownerdata_multiselect_select_0_modkey_odstatechanged_seq, TRUE }, + { FALSE, TRUE, VK_DOWN, 1, "keep selection but move cursor via CONTROL+DOWN", + ownerdata_multiselect_move_0_to_1_odstatechanged_seq, FALSE }, + { TRUE, TRUE, VK_DOWN, 3, "select multiple after skip via SHIFT+CONTROL+DOWN", + ownerdata_multiselect_select_0_to_2_odstatechanged_seq, FALSE }, + { FALSE, FALSE, VK_DOWN, 1, "deselect all, select item 3 via DOWN", + ownerdata_multiselect_select_3_odstatechanged_seq, FALSE }, + /* First up then down */ + { TRUE, FALSE, VK_UP, 2, "select multiple via SHIFT+UP", + ownerdata_multiselect_select_3_to_2_odstatechanged_seq, FALSE }, + { TRUE, FALSE, VK_DOWN, 1, "select one item via SHIFT+DOWN", + ownerdata_multiselect_select_3_modkey_odstatechanged_seq, TRUE }, + { TRUE, TRUE, VK_UP, 2, "select multiple via SHIFT+CONTROL+UP", + ownerdata_multiselect_select_3_to_2_odstatechanged_seq, FALSE }, + { TRUE, TRUE, VK_DOWN, 1, "select one item via SHIFT+CONTROL+DOWN", + ownerdata_multiselect_select_3_modkey_odstatechanged_seq, TRUE }, + { FALSE, TRUE, VK_UP, 1, "keep selection but move cursor via CONTROL+UP", + ownerdata_multiselect_move_3_to_2_odstatechanged_seq, FALSE }, + { TRUE, TRUE, VK_UP, 3, "select multiple after skip via SHIFT+CONTROL+UP", + ownerdata_multiselect_select_3_to_1_odstatechanged_seq, FALSE }, + { FALSE, FALSE, VK_UP, 1, "deselect all, select item 0 via UP", + ownerdata_multiselect_select_0_odstatechanged_seq, FALSE }, + }; hwnd = create_listview_control(LVS_OWNERDATA | LVS_REPORT); ok(hwnd != NULL, "failed to create a listview window\n"); @@ -3555,6 +3667,7 @@ static void test_ownerdata_multiselect(void) res = SendMessageA(hwnd, LVM_GETSELECTEDCOUNT, 0, 0); expect(0, res); + /* Select and focus the first row */ memset(&item, 0, sizeof(item)); item.state = LVIS_SELECTED | LVIS_FOCUSED; item.stateMask = LVIS_SELECTED | LVIS_FOCUSED; @@ -3562,46 +3675,35 @@ static void test_ownerdata_multiselect(void) expect(TRUE, res); res = SendMessageA(hwnd, LVM_GETSELECTEDCOUNT, 0, 0); expect(1, res); - res = SendMessageA(hwnd, LVM_SETSELECTIONMARK, 0, 0); expect(0, res); - hold_key(VK_SHIFT); - - flush_sequences(sequences, NUM_MSG_SEQUENCES); - - res = SendMessageA(hwnd, WM_KEYDOWN, VK_DOWN, 0); - expect(0, res); - - ok_sequence(sequences, PARENT_ODSTATECHANGED_SEQ_INDEX, - ownerdata_multiselect_odstatechanged_seq, - "ownerdata select multiple notification", FALSE); - - res = SendMessageA(hwnd, WM_KEYUP, VK_DOWN, 0); - expect(0, res); - - res = SendMessageA(hwnd, LVM_GETSELECTEDCOUNT, 0, 0); - expect(2, res); - - hold_key(VK_CONTROL); - - flush_sequences(sequences, NUM_MSG_SEQUENCES); - - res = SendMessageA(hwnd, WM_KEYDOWN, VK_DOWN, 0); - expect(0, res); - - ok_sequence(sequences, PARENT_ODSTATECHANGED_SEQ_INDEX, - ownerdata_multiselect_odstatechanged_seq, - "ownerdata select multiple notification", FALSE); - - res = SendMessageA(hwnd, WM_KEYUP, VK_DOWN, 0); - expect(0, res); - - release_key(VK_CONTROL); - release_key(VK_SHIFT); - - res = SendMessageA(hwnd, LVM_GETSELECTEDCOUNT, 0, 0); - expect(3, res); + /* Select/deselect rows using UP/DOWN and SHIFT/CONTROL keys */ + for (i = 0; i < ARRAY_SIZE(key_tests); i++) + { + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + if (key_tests[i].hold_shift) + hold_key(VK_SHIFT); + if (key_tests[i].hold_control) + hold_key(VK_CONTROL); + + res = SendMessageA(hwnd, WM_KEYDOWN, key_tests[i].press_key, 0); + expect(0, res); + sprintf(buf, "ownerdata multiselect: %s", key_tests[i].context); + ok_sequence(sequences, PARENT_ODSTATECHANGED_SEQ_INDEX, key_tests[i].expected, + buf, key_tests[i].todo); + res = SendMessageA(hwnd, WM_KEYUP, key_tests[i].press_key, 0); + expect(0, res); + + res = SendMessageA(hwnd, LVM_GETSELECTEDCOUNT, 0, 0); + expect(key_tests[i].selected_count, res); + + if (key_tests[i].hold_shift) + release_key(VK_SHIFT); + if (key_tests[i].hold_control) + release_key(VK_CONTROL); + } DestroyWindow(hwnd); }

1 0

Angelo Haller : comctl32/listview: Don't send LVN_ODSTATECHANGED for empty ranges.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: oldstable Commit: 34c2fffb9f04a5d396e8d876e80d0cc0721f1304 URL: https://gitlab.winehq.org/wine/wine/-/commit/34c2fffb9f04a5d396e8d876e80d0c… Author: Angelo Haller <angelo(a)szanni.org> Date: Tue Jun 28 16:16:11 2022 -0500 comctl32/listview: Don't send LVN_ODSTATECHANGED for empty ranges. Signed-off-by: Angelo Haller <angelo(a)szanni.org> (cherry picked from commit 4d4513bbad6491b7e6cf7cb84fe8fcf2afd20cfe) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/listview.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index a20ce36a989..115d75c57a0 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -8903,6 +8903,7 @@ static VOID LISTVIEW_SetOwnerDataState(LISTVIEW_INFO *infoPtr, INT nFirst, INT n { NMLVODSTATECHANGE nmlv; + if (nFirst == nLast) return; if (!item) return; ZeroMemory(&nmlv, sizeof(nmlv));

1 0

← Newer
1
...
23
24
25
26
27
28
29
...
91
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2023