May 2017 - Wine-Commits - list.winehq.org

Akihiro Sagawa : rsaenh/tests: Add CryptImportKey tests with a public key.
by Alexandre Julliard May 1, 2017

May 1, 2017

Module: wine Branch: master Commit: b6ca68259f1d43d92c41e81fa88edfd736b9df6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6ca68259f1d43d92c41e81fa… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Apr 30 22:30:40 2017 +0900 rsaenh/tests: Add CryptImportKey tests with a public key. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rsaenh/tests/rsaenh.c | 80 ++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 71 insertions(+), 9 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 4286db0..839527b 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -110,23 +110,21 @@ static void printBytes(const char *heading, const BYTE *pb, size_t cb) static BOOL (WINAPI *pCryptDuplicateHash) (HCRYPTHASH, DWORD*, DWORD, HCRYPTHASH*); -/* static void trace_hex(BYTE *pbData, DWORD dwLen) { char szTemp[256]; DWORD i, j; for (i = 0; i < dwLen-7; i+=8) { - sprintf(szTemp, "0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x,\n", - pbData[i], pbData[i+1], pbData[i+2], pbData[i+3], pbData[i+4], pbData[i+5], - pbData[i+6], pbData[i+7]); - trace(szTemp); + trace("0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x,\n", + pbData[i], pbData[i+1], pbData[i+2], pbData[i+3], pbData[i+4], pbData[i+5], + pbData[i+6], pbData[i+7]); } for (j=0; i<dwLen; j++,i++) { - sprintf(szTemp+6*j, "0x%02x,\n", pbData[i]); + sprintf(szTemp+6*j, "0x%02x, ", pbData[i]); } - trace(szTemp); + if (j) + trace("%s\n", szTemp); } -*/ static BOOL init_base_environment(const char *provider, DWORD dwKeyFlags) { @@ -2377,7 +2375,7 @@ static void test_import_export(void) HCRYPTKEY hPublicKey, hPrivKey; BOOL result; ALG_ID algID; - BYTE emptyKey[2048], *exported_key; + BYTE emptyKey[2048], *exported_key, *exported_key2; static BYTE abPlainPublicKey[84] = { 0x06, 0x02, 0x00, 0x00, 0x00, 0xa4, 0x00, 0x00, 0x52, 0x53, 0x41, 0x31, 0x00, 0x02, 0x00, 0x00, @@ -2571,6 +2569,7 @@ static void test_import_export(void) CryptDestroyKey(hPublicKey); + /* imports into AT_SIGNATURE key container */ result = CryptImportKey(hProv, priv_key_with_high_bit, sizeof(priv_key_with_high_bit), 0, CRYPT_EXPORTABLE, &hPrivKey); ok(result, "CryptImportKey failed: %08x\n", GetLastError()); @@ -2590,6 +2589,69 @@ static void test_import_export(void) HeapFree(GetProcessHeap(), 0, exported_key); CryptDestroyKey(hPrivKey); + + /* imports into AT_KEYEXCHANGE key container */ + result = CryptImportKey(hProv, abPlainPrivateKey, + sizeof(abPlainPrivateKey), 0, 0, &hPrivKey); + ok(result, "CryptImportKey failed: %08x\n", GetLastError()); + + result = CryptExportKey(hPrivKey, 0, PUBLICKEYBLOB, 0, NULL, &dwDataLen); + ok(result, "CryptExportKey failed: %08x\n", GetLastError()); + exported_key = HeapAlloc(GetProcessHeap(), 0, dwDataLen); + result = CryptExportKey(hPrivKey, 0, PUBLICKEYBLOB, 0, exported_key, + &dwDataLen); + ok(result, "CryptExportKey failed: %08x\n", GetLastError()); + CryptDestroyKey(hPrivKey); + + /* getting the public key from AT_KEYEXCHANGE, and compare it */ + result = CryptGetUserKey(hProv, AT_KEYEXCHANGE, &hPrivKey); + ok(result, "CryptGetUserKey failed: %08x\n", GetLastError()); + result = CryptExportKey(hPrivKey, 0, PUBLICKEYBLOB, 0, NULL, &dwDataLen); + ok(result, "CryptExportKey failed: %08x\n", GetLastError()); + exported_key2 = HeapAlloc(GetProcessHeap(), 0, dwDataLen); + result = CryptExportKey(hPrivKey, 0, PUBLICKEYBLOB, 0, exported_key2, + &dwDataLen); + ok(result, "CryptExportKey failed: %08x\n", GetLastError()); + CryptDestroyKey(hPrivKey); + + result = !memcmp(exported_key, exported_key2, dwDataLen); + ok(result, "unexpected value\n"); + if (!result && winetest_debug > 1) { + trace("Expected public key (%u):\n", dwDataLen); + trace_hex(exported_key, dwDataLen); + trace("AT_KEYEXCHANGE public key (%u):\n", dwDataLen); + trace_hex(exported_key2, dwDataLen); + } + HeapFree(GetProcessHeap(), 0, exported_key2); + + /* importing a public key doesn't update key container at all */ + result = CryptImportKey(hProv, abPlainPublicKey, + sizeof(abPlainPublicKey), 0, 0, &hPublicKey); + ok(result, "failed to import the public key\n"); + CryptDestroyKey(hPublicKey); + + /* getting the public key again, and compare it */ + result = CryptGetUserKey(hProv, AT_KEYEXCHANGE, &hPrivKey); + ok(result, "CryptGetUserKey failed: %08x\n", GetLastError()); + result = CryptExportKey(hPrivKey, 0, PUBLICKEYBLOB, 0, NULL, &dwDataLen); + ok(result, "CryptExportKey failed: %08x\n", GetLastError()); + exported_key2 = HeapAlloc(GetProcessHeap(), 0, dwDataLen); + result = CryptExportKey(hPrivKey, 0, PUBLICKEYBLOB, 0, exported_key2, + &dwDataLen); + ok(result, "CryptExportKey failed: %08x\n", GetLastError()); + CryptDestroyKey(hPrivKey); + + result = !memcmp(exported_key, exported_key2, dwDataLen); + todo_wine ok(result, "unexpected value\n"); + if (!result && winetest_debug > 1) { + trace("Expected public key (%u):\n", dwDataLen); + trace_hex(exported_key, dwDataLen); + trace("AT_KEYEXCHANGE public key (%u):\n", dwDataLen); + trace_hex(exported_key2, dwDataLen); + } + + HeapFree(GetProcessHeap(), 0, exported_key); + HeapFree(GetProcessHeap(), 0, exported_key2); } static void test_import_hmac(void)

1 0

Zebediah Figura : kernel32: Use the full path as an argument to winevdm.exe.
by Alexandre Julliard May 1, 2017

May 1, 2017

Module: wine Branch: master Commit: 5155afd882d09c840d27a5f13681d3b09f564b1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5155afd882d09c840d27a5f13… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 27 15:14:37 2017 -0500 kernel32: Use the full path as an argument to winevdm.exe. When starting a 16-bit process using CreateProcess() which resides in a subdirectory, the directory is changed but winevdm.exe still attempts to look for the whole path. Thus attempting to start "install\setup.exe" will cause winevdm.exe to look for "install\install\setup.exe", which fails. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 5b8a3d3..4810965 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -2186,15 +2186,21 @@ static BOOL create_vdm_process( LPCWSTR filename, LPWSTR cmd_line, LPWSTR env, L static const WCHAR argsW[] = {'%','s',' ','-','-','a','p','p','-','n','a','m','e',' ','"','%','s','"',' ','%','s',0}; BOOL ret; - LPWSTR new_cmd_line = HeapAlloc( GetProcessHeap(), 0, - (strlenW(filename) + strlenW(cmd_line) + 30) * sizeof(WCHAR) ); + WCHAR buffer[MAX_PATH]; + LPWSTR new_cmd_line; + + if (!(ret = GetFullPathNameW(filename, MAX_PATH, buffer, NULL))) + return FALSE; + + new_cmd_line = HeapAlloc(GetProcessHeap(), 0, + (strlenW(buffer) + strlenW(cmd_line) + 30) * sizeof(WCHAR)); if (!new_cmd_line) { SetLastError( ERROR_OUTOFMEMORY ); return FALSE; } - sprintfW( new_cmd_line, argsW, winevdmW, filename, cmd_line ); + sprintfW(new_cmd_line, argsW, winevdmW, buffer, cmd_line); ret = create_process( 0, winevdmW, new_cmd_line, env, cur_dir, psa, tsa, inherit, flags, startup, info, unixdir, binary_info, exec_only ); HeapFree( GetProcessHeap(), 0, new_cmd_line );

1 0

Nikolay Sivov : dpnet/tests: Added missing break (Coverity).
by Alexandre Julliard May 1, 2017

May 1, 2017

Module: wine Branch: master Commit: 9e186fcf09b3e873a661c20fd75ece84d61e6bf6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e186fcf09b3e873a661c20fd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Apr 30 22:35:45 2017 +0300 dpnet/tests: Added missing break (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpnet/tests/thread.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dpnet/tests/thread.c b/dlls/dpnet/tests/thread.c index 78515f8..d7295ac 100644 --- a/dlls/dpnet/tests/thread.c +++ b/dlls/dpnet/tests/thread.c @@ -44,6 +44,7 @@ static HRESULT WINAPI DirectPlayThreadHandler(void *context, DWORD message_id, v cnt_complete++; if(cnt_complete >= 2) SetEvent(enumevent); + break; default: trace("DirectPlayThreadHandler: 0x%08x\n", message_id); }

1 0

Michael Müller : ntdll/tests: Add tests for LdrEnumerateLoadedModules.
by Alexandre Julliard May 1, 2017

May 1, 2017

Module: wine Branch: master Commit: e5ad8ae12348e174bf57a8c7c1bb5e8f77fed73b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5ad8ae12348e174bf57a8c7c… Author: Michael Müller <michael(a)fds-team.de> Date: Fri Apr 28 17:59:22 2017 +0200 ntdll/tests: Add tests for LdrEnumerateLoadedModules. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/rtl.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index b18cccf..92b7213 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -98,6 +98,7 @@ static NTSTATUS (WINAPI *pRtlCompressBuffer)(USHORT, const UCHAR*, ULONG, PUCHA static BOOL (WINAPI *pRtlIsCriticalSectionLocked)(CRITICAL_SECTION *); static BOOL (WINAPI *pRtlIsCriticalSectionLockedByThread)(CRITICAL_SECTION *); static NTSTATUS (WINAPI *pRtlInitializeCriticalSectionEx)(CRITICAL_SECTION *, ULONG, ULONG); +static NTSTATUS (WINAPI *pLdrEnumerateLoadedModules)(void *, void *, void *); static HMODULE hkernel32 = 0; static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); @@ -151,6 +152,7 @@ static void InitFunctionPtrs(void) pRtlIsCriticalSectionLocked = (void *)GetProcAddress(hntdll, "RtlIsCriticalSectionLocked"); pRtlIsCriticalSectionLockedByThread = (void *)GetProcAddress(hntdll, "RtlIsCriticalSectionLockedByThread"); pRtlInitializeCriticalSectionEx = (void *)GetProcAddress(hntdll, "RtlInitializeCriticalSectionEx"); + pLdrEnumerateLoadedModules = (void *)GetProcAddress(hntdll, "LdrEnumerateLoadedModules"); } hkernel32 = LoadLibraryA("kernel32.dll"); ok(hkernel32 != 0, "LoadLibrary failed\n"); @@ -2153,6 +2155,60 @@ static void test_RtlLeaveCriticalSection(void) ok(!status, "RtlDeleteCriticalSection failed: %x\n", status); } +struct ldr_enum_context +{ + BOOL abort; + BOOL found; + int count; +}; + +static void WINAPI ldr_enum_callback(LDR_MODULE *module, void *context, BOOLEAN *stop) +{ + static const WCHAR ntdllW[] = {'n','t','d','l','l','.','d','l','l',0}; + struct ldr_enum_context *ctx = context; + + if (!lstrcmpiW(module->BaseDllName.Buffer, ntdllW)) + ctx->found = TRUE; + + ctx->count++; + *stop = ctx->abort; +} + +static void test_LdrEnumerateLoadedModules(void) +{ + struct ldr_enum_context ctx; + NTSTATUS status; + + if (!pLdrEnumerateLoadedModules) + { + skip("LdrEnumerateLoadedModules not available\n"); + return; + } + + ctx.abort = FALSE; + ctx.found = FALSE; + ctx.count = 0; + status = pLdrEnumerateLoadedModules(NULL, ldr_enum_callback, &ctx); + ok(status == STATUS_SUCCESS, "LdrEnumerateLoadedModules failed with %08x\n", status); + ok(ctx.count > 1, "Expected more than one module, got %d\n", ctx.count); + ok(ctx.found, "Could not find ntdll in list of modules\n"); + + ctx.abort = TRUE; + ctx.count = 0; + status = pLdrEnumerateLoadedModules(NULL, ldr_enum_callback, &ctx); + ok(status == STATUS_SUCCESS, "LdrEnumerateLoadedModules failed with %08x\n", status); + ok(ctx.count == 1, "Expected exactly one module, got %d\n", ctx.count); + + status = pLdrEnumerateLoadedModules((void *)0x1, ldr_enum_callback, (void *)0xdeadbeef); + ok(status == STATUS_INVALID_PARAMETER, "expected STATUS_INVALID_PARAMETER, got 0x%08x\n", status); + + status = pLdrEnumerateLoadedModules((void *)0xdeadbeef, ldr_enum_callback, (void *)0xdeadbeef); + ok(status == STATUS_INVALID_PARAMETER, "expected STATUS_INVALID_PARAMETER, got 0x%08x\n", status); + + status = pLdrEnumerateLoadedModules(NULL, NULL, (void *)0xdeadbeef); + ok(status == STATUS_INVALID_PARAMETER, "expected STATUS_INVALID_PARAMETER, got 0x%08x\n", status); +} + START_TEST(rtl) { InitFunctionPtrs(); @@ -2185,4 +2241,5 @@ START_TEST(rtl) test_RtlIsCriticalSectionLocked(); test_RtlInitializeCriticalSectionEx(); test_RtlLeaveCriticalSection(); + test_LdrEnumerateLoadedModules(); }

1 0

Nikolay Sivov : shell32/shellview: Handle NULL folder pointer in SHCreateShellFolderViewEx().
by Alexandre Julliard May 1, 2017

May 1, 2017

Module: wine Branch: master Commit: a528ddd745f2c2029d60e8fe655fe7bb566776f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a528ddd745f2c2029d60e8fe6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Apr 30 22:01:56 2017 +0300 shell32/shellview: Handle NULL folder pointer in SHCreateShellFolderViewEx(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shlview.c | 3 +++ dlls/shell32/tests/shlview.c | 10 ++++++++++ 2 files changed, 13 insertions(+) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 2c8b6bd..f815011 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -3806,6 +3806,9 @@ HRESULT WINAPI SHCreateShellFolderViewEx(CSFV *desc, IShellView **shellview) TRACE("sf=%p pidl=%p cb=%p mode=0x%08x parm=%p\n", desc->pshf, desc->pidl, desc->pfnCallback, desc->fvm, desc->psvOuter); + if (!desc->pshf) + return E_UNEXPECTED; + *shellview = IShellView_Constructor(desc->pshf); if (!*shellview) return E_OUTOFMEMORY; diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c index f5adae5..8603ddb 100644 --- a/dlls/shell32/tests/shlview.c +++ b/dlls/shell32/tests/shlview.c @@ -1433,6 +1433,16 @@ static void test_SHCreateShellFolderViewEx(void) ok(refCount == 0, "refCount = %u\n", refCount); } +if (0) +{ + /* Crashes on null shellfolder, on XP/2k3 */ + memset(&csfv, 0, sizeof(csfv)); + csfv.pshf = NULL; + psv = (void *)0xdeadbeef; + hr = SHCreateShellFolderViewEx(&csfv, &psv); + ok(hr == E_UNEXPECTED, "Got 0x%08x\n", hr); + ok(psv == NULL, "psv = %p\n", psv); +} memset(&csfv, 0, sizeof(csfv)); csfv.cbSize = sizeof(csfv); csfv.pshf = desktop;

1 0

Nikolay Sivov : shell32/tests: Don't trace all messages sent to listview.
by Alexandre Julliard May 1, 2017

May 1, 2017

Module: wine Branch: master Commit: 8ce45458fb77b437e655c4c94e4e4524723939d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ce45458fb77b437e655c4c94… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Apr 30 22:01:54 2017 +0300 shell32/tests: Don't trace all messages sent to listview. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlview.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c index c15d2d6..f5adae5 100644 --- a/dlls/shell32/tests/shlview.c +++ b/dlls/shell32/tests/shlview.c @@ -53,10 +53,8 @@ static LRESULT WINAPI listview_subclass_proc(HWND hwnd, UINT message, WPARAM wPa { WNDPROC oldproc = (WNDPROC)GetWindowLongPtrA(hwnd, GWLP_USERDATA); static LONG defwndproc_counter = 0; + struct message msg = { 0 }; LRESULT ret; - struct message msg; - - trace("listview: %p, %04x, %08lx, %08lx\n", hwnd, message, wParam, lParam); msg.message = message; msg.flags = sent|wparam|lparam;

1 0

Nikolay Sivov : dwrite/tests: Fully initialize call sequence test data ( Coverity).
by Alexandre Julliard May 1, 2017

May 1, 2017

Module: wine Branch: master Commit: 901914519f72db89f64935f751ec4fe7f12e83c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=901914519f72db89f64935f75… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Apr 30 21:21:17 2017 +0300 dwrite/tests: Fully initialize call sequence test data (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/layout.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index f48fc42..843ab0d 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -617,7 +617,7 @@ static HRESULT WINAPI testrenderer_DrawUnderline(IDWriteTextRenderer *iface, IUnknown *effect) { struct renderer_context *ctxt = (struct renderer_context*)context; - struct drawcall_entry entry; + struct drawcall_entry entry = { 0 }; if (ctxt) TEST_MEASURING_MODE(ctxt, underline->measuringMode); @@ -656,7 +656,7 @@ static HRESULT WINAPI testrenderer_DrawStrikethrough(IDWriteTextRenderer *iface, IUnknown *effect) { struct renderer_context *ctxt = (struct renderer_context*)context; - struct drawcall_entry entry; + struct drawcall_entry entry = { 0 }; if (ctxt) TEST_MEASURING_MODE(ctxt, strikethrough->measuringMode); @@ -677,7 +677,7 @@ static HRESULT WINAPI testrenderer_DrawInlineObject(IDWriteTextRenderer *iface, BOOL is_rtl, IUnknown *effect) { - struct drawcall_entry entry; + struct drawcall_entry entry = { 0 }; entry.kind = DRAW_INLINE; if (effect) entry.kind |= DRAW_EFFECT;

1 0

Nikolay Sivov : comctl32/tests: Fully initialize message test data ( Coverity).
by Alexandre Julliard May 1, 2017

May 1, 2017

Module: wine Branch: master Commit: e9c1f8112df0f2ecf428a753696addf6cdb746db URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9c1f8112df0f2ecf428a7536… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Apr 30 21:20:28 2017 +0300 comctl32/tests: Fully initialize message test data (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/comboex.c | 2 +- dlls/comctl32/tests/header.c | 5 ++--- dlls/comctl32/tests/treeview.c | 4 +--- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/tests/comboex.c b/dlls/comctl32/tests/comboex.c index faa32a3..fede917 100644 --- a/dlls/comctl32/tests/comboex.c +++ b/dlls/comctl32/tests/comboex.c @@ -85,8 +85,8 @@ static LRESULT WINAPI editbox_subclass_proc(HWND hwnd, UINT message, WPARAM wPar { WNDPROC oldproc = (WNDPROC)GetWindowLongPtrA(hwnd, GWLP_USERDATA); static LONG defwndproc_counter = 0; + struct message msg = { 0 }; LRESULT ret; - struct message msg; msg.message = message; msg.flags = sent|wparam|lparam; diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c index 3ae83f8..defd635 100644 --- a/dlls/comctl32/tests/header.c +++ b/dlls/comctl32/tests/header.c @@ -383,7 +383,7 @@ static char pszOutOfRangeItem[] = "Out Of Range Item"; static char *str_items[] = {pszFirstItem, pszSecondItem, pszThirdItem, pszFourthItem, pszReplaceItem, pszOutOfRangeItem}; - + static char pszUniTestA[] = "TST"; static WCHAR pszUniTestW[] = {'T','S','T',0}; @@ -403,15 +403,14 @@ static LRESULT WINAPI header_subclass_proc(HWND hwnd, UINT message, WPARAM wPara { WNDPROC oldproc = (WNDPROC)GetWindowLongPtrA(hwnd, GWLP_USERDATA); static LONG defwndproc_counter = 0; + struct message msg = { 0 }; LRESULT ret; - struct message msg; msg.message = message; msg.flags = sent|wparam|lparam; if (defwndproc_counter) msg.flags |= defwinproc; msg.wParam = wParam; msg.lParam = lParam; - msg.id = 0; add_message(sequences, HEADER_SEQ_INDEX, &msg); defwndproc_counter++; diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 19a5ac0..43de61c 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -1098,7 +1098,7 @@ static void test_get_set_unicodeformat(void) static LRESULT CALLBACK parent_wnd_proc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { static LONG defwndproc_counter = 0; - struct message msg; + struct message msg = { 0 }; LRESULT ret; RECT rect; HTREEITEM visibleItem; @@ -1110,8 +1110,6 @@ static LRESULT CALLBACK parent_wnd_proc(HWND hWnd, UINT message, WPARAM wParam, msg.lParam = lParam; if (message == WM_NOTIFY && lParam) msg.id = ((NMHDR*)lParam)->code; - else - msg.id = 0; /* log system messages, except for painting */ if (message < WM_USER &&

1 0

Hugh McMaster : regedit: Pass RegQueryValueEx() the actual buffer size ( Coverity).
by Alexandre Julliard May 1, 2017

May 1, 2017

Module: wine Branch: master Commit: 8b5291bca61322ddc74b2df04804fe3253efe71d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b5291bca61322ddc74b2df04… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon May 1 09:30:31 2017 +0000 regedit: Pass RegQueryValueEx() the actual buffer size (Coverity). Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/listview.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index fc234d4..11147a7 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -550,6 +550,7 @@ BOOL RefreshListView(HWND hwndLV, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR highli if (!valBuf) goto done; + valSize = max_val_size; if (RegQueryValueExW(hKey, NULL, NULL, &valType, valBuf, &valSize) == ERROR_FILE_NOT_FOUND) { AddEntryToList(hwndLV, NULL, REG_SZ, NULL, 0, !highlightValue); }

1 0

Hugh McMaster : regedit: Add a missing 'break' statement (Coverity).
by Alexandre Julliard May 1, 2017

May 1, 2017

Module: wine Branch: master Commit: 85e34436cde08ddfb07f21d395c0cef82633c6c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85e34436cde08ddfb07f21d39… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon May 1 09:30:21 2017 +0000 regedit: Add a missing 'break' statement (Coverity). Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/childwnd.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/regedit/childwnd.c b/programs/regedit/childwnd.c index 6ee0cdb..b20ff9a 100644 --- a/programs/regedit/childwnd.c +++ b/programs/regedit/childwnd.c @@ -381,6 +381,7 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa TrackPopupMenu(GetSubMenu(hPopupMenus, PM_NEW), TPM_RIGHTBUTTON, pt.x, pt.y, 0, hFrameWnd, NULL); } + break; } case WM_KEYDOWN:

1 0