March 2015 - Wine-Commits - list.winehq.org

Stefan Dösinger : ddraw/tests: Add a DDBLT_COLORFILL test.
by Alexandre Julliard March 17, 2015

March 17, 2015

Module: wine Branch: master Commit: 1d8e92c170652f449243e10c20b21f532a94e71c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d8e92c170652f449243e10c2… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Mar 16 14:48:53 2015 +0100 ddraw/tests: Add a DDBLT_COLORFILL test. --- dlls/ddraw/tests/ddraw7.c | 340 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 340 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1d8e92c170652f449243e…

1 0

Stefan Dösinger : ddraw: Add DDBLT_COLORFILL validation.
by Alexandre Julliard March 17, 2015

March 17, 2015

Module: wine Branch: master Commit: 6cb795b4b6879a9a023229fe07d8301447c515cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cb795b4b6879a9a023229fe0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Mar 16 14:48:52 2015 +0100 ddraw: Add DDBLT_COLORFILL validation. --- dlls/ddraw/surface.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index cbf11da..8b25cb9 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1537,6 +1537,28 @@ static HRESULT WINAPI ddraw_surface7_Blt(IDirectDrawSurface7 *iface, RECT *DestR wined3d_mutex_lock(); + if (Flags & DDBLT_COLORFILL) + { + if (src_surface) + { + wined3d_mutex_unlock(); + WARN("DDBLT_COLORFILL is not compatible with source surfaces, returning DDERR_INVALIDPARAMS\n"); + return DDERR_INVALIDPARAMS; + } + if (!DDBltFx) + { + wined3d_mutex_unlock(); + WARN("DDBLT_COLORFILL used with DDBltFx = NULL, returning DDERR_INVALIDPARAMS.\n"); + return DDERR_INVALIDPARAMS; + } + if (dst_surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) + { + wined3d_mutex_unlock(); + WARN("DDBLT_COLORFILL used on a depth buffer, returning DDERR_INVALIDPARAMS.\n"); + return DDERR_INVALIDPARAMS; + } + } + if (Flags & DDBLT_KEYSRC && (!src_surface || !(src_surface->surface_desc.dwFlags & DDSD_CKSRCBLT))) { WARN("DDBLT_KEYDEST blit without color key in surface, returning DDERR_INVALIDPARAMS\n");

1 0

Sebastian Lackner : user32/tests: Add tests for removing already seen messages from the queue.
by Alexandre Julliard March 17, 2015

March 17, 2015

Module: wine Branch: master Commit: 1acf20779f93603907ff2c816509a30f7e1d34d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1acf20779f93603907ff2c816… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Mar 17 04:26:33 2015 +0100 user32/tests: Add tests for removing already seen messages from the queue. --- dlls/user32/tests/msg.c | 119 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 119 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index f1236cf..5f10a89 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -10440,6 +10440,124 @@ done: flush_events(); } +static void test_PeekMessage3(void) +{ + HWND hwnd; + BOOL ret; + MSG msg; + + hwnd = CreateWindowA("TestWindowClass", "PeekMessage3", WS_OVERLAPPEDWINDOW, + 10, 10, 800, 800, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "expected hwnd != NULL\n"); + flush_events(); + + /* GetMessage() and PeekMessage(..., PM_REMOVE) should prefer messages which + * were already seen. */ + + SetTimer(hwnd, 1, 0, NULL); + while (!PeekMessageA(&msg, NULL, 0, 0, PM_NOREMOVE)); + ok(msg.message == WM_TIMER, "msg.message = %u instead of WM_TIMER\n", msg.message); + PostMessageA(hwnd, WM_USER, 0, 0); + ret = PeekMessageA(&msg, NULL, 0, 0, PM_NOREMOVE); + todo_wine + ok(ret && msg.message == WM_TIMER, "msg.message = %u instead of WM_TIMER\n", msg.message); + ret = GetMessageA(&msg, NULL, 0, 0); + todo_wine + ok(ret && msg.message == WM_TIMER, "msg.message = %u instead of WM_TIMER\n", msg.message); + ret = GetMessageA(&msg, NULL, 0, 0); + todo_wine + ok(ret && msg.message == WM_USER, "msg.message = %u instead of WM_USER\n", msg.message); + ret = PeekMessageA(&msg, NULL, 0, 0, 0); + ok(!ret, "expected PeekMessage to return FALSE, got %u\n", ret); + + SetTimer(hwnd, 1, 0, NULL); + while (!PeekMessageA(&msg, NULL, 0, 0, PM_NOREMOVE)); + ok(msg.message == WM_TIMER, "msg.message = %u instead of WM_TIMER\n", msg.message); + PostMessageA(hwnd, WM_USER, 0, 0); + ret = PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE); + todo_wine + ok(ret && msg.message == WM_TIMER, "msg.message = %u instead of WM_TIMER\n", msg.message); + ret = PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE); + todo_wine + ok(ret && msg.message == WM_USER, "msg.message = %u instead of WM_USER\n", msg.message); + ret = PeekMessageA(&msg, NULL, 0, 0, 0); + ok(!ret, "expected PeekMessage to return FALSE, got %u\n", ret); + + /* It doesn't matter if a message range is specified or not. */ + + SetTimer(hwnd, 1, 0, NULL); + while (!PeekMessageA(&msg, NULL, WM_TIMER, WM_TIMER, PM_NOREMOVE)); + ok(msg.message == WM_TIMER, "msg.message = %u instead of WM_TIMER\n", msg.message); + PostMessageA(hwnd, WM_USER, 0, 0); + ret = GetMessageA(&msg, NULL, 0, 0); + todo_wine + ok(ret && msg.message == WM_TIMER, "msg.message = %u instead of WM_TIMER\n", msg.message); + ret = GetMessageA(&msg, NULL, 0, 0); + todo_wine + ok(ret && msg.message == WM_USER, "msg.message = %u instead of WM_USER\n", msg.message); + ret = PeekMessageA(&msg, NULL, 0, 0, 0); + ok(!ret, "expected PeekMessage to return FALSE, got %u\n", ret); + + /* But not if the post messages were added before the PeekMessage() call. */ + + PostMessageA(hwnd, WM_USER, 0, 0); + SetTimer(hwnd, 1, 0, NULL); + while (!PeekMessageA(&msg, NULL, WM_TIMER, WM_TIMER, PM_NOREMOVE)); + ok(msg.message == WM_TIMER, "msg.message = %u instead of WM_TIMER\n", msg.message); + ret = GetMessageA(&msg, NULL, 0, 0); + ok(ret && msg.message == WM_USER, "msg.message = %u instead of WM_USER\n", msg.message); + ret = GetMessageA(&msg, NULL, 0, 0); + ok(ret && msg.message == WM_TIMER, "msg.message = %u instead of WM_TIMER\n", msg.message); + ret = PeekMessageA(&msg, NULL, 0, 0, 0); + ok(!ret, "expected PeekMessage to return FALSE, got %u\n", ret); + + /* More complicated test with multiple messages. */ + + PostMessageA(hwnd, WM_USER, 0, 0); + SetTimer(hwnd, 1, 0, NULL); + while (!PeekMessageA(&msg, NULL, WM_TIMER, WM_TIMER, PM_NOREMOVE)); + ok(msg.message == WM_TIMER, "msg.message = %u instead of WM_TIMER\n", msg.message); + PostMessageA(hwnd, WM_USER + 1, 0, 0); + ret = GetMessageA(&msg, NULL, 0, 0); + ok(ret && msg.message == WM_USER, "msg.message = %u instead of WM_USER\n", msg.message); + ret = GetMessageA(&msg, NULL, 0, 0); + todo_wine + ok(ret && msg.message == WM_TIMER, "msg.message = %u instead of WM_TIMER\n", msg.message); + ret = GetMessageA(&msg, NULL, 0, 0); + todo_wine + ok(ret && msg.message == WM_USER + 1, "msg.message = %u instead of WM_USER + 1\n", msg.message); + ret = PeekMessageA(&msg, NULL, 0, 0, 0); + ok(!ret, "expected PeekMessage to return FALSE, got %u\n", ret); + + /* Also works for posted messages, but the situation is a bit different, + * because both messages are in the same queue. */ + + PostMessageA(hwnd, WM_TIMER, 0, 0); + while (!PeekMessageA(&msg, NULL, WM_TIMER, WM_TIMER, PM_NOREMOVE)); + ok(msg.message == WM_TIMER, "msg.message = %u instead of WM_TIMER\n", msg.message); + PostMessageA(hwnd, WM_USER, 0, 0); + ret = GetMessageA(&msg, NULL, 0, 0); + ok(ret && msg.message == WM_TIMER, "msg.message = %u instead of WM_TIMER\n", msg.message); + ret = GetMessageA(&msg, NULL, 0, 0); + ok(ret && msg.message == WM_USER, "msg.message = %u instead of WM_USER\n", msg.message); + ret = PeekMessageA(&msg, NULL, 0, 0, 0); + ok(!ret, "expected PeekMessage to return FALSE, got %u\n", ret); + + PostMessageA(hwnd, WM_USER, 0, 0); + PostMessageA(hwnd, WM_TIMER, 0, 0); + while (!PeekMessageA(&msg, NULL, WM_TIMER, WM_TIMER, PM_NOREMOVE)); + ok(msg.message == WM_TIMER, "msg.message = %u instead of WM_TIMER\n", msg.message); + ret = GetMessageA(&msg, NULL, 0, 0); + ok(ret && msg.message == WM_USER, "msg.message = %u instead of WM_USER\n", msg.message); + ret = GetMessageA(&msg, NULL, 0, 0); + ok(ret && msg.message == WM_TIMER, "msg.message = %u instead of WM_TIMER\n", msg.message); + ret = PeekMessageA(&msg, NULL, 0, 0, 0); + ok(!ret, "expected PeekMessage to return FALSE, got %u\n", ret); + + DestroyWindow(hwnd); + flush_events(); +} + static INT_PTR CALLBACK wm_quit_dlg_proc(HWND hwnd, UINT message, WPARAM wp, LPARAM lp) { struct recvd_message msg; @@ -14563,6 +14681,7 @@ START_TEST(msg) test_ShowWindow(); test_PeekMessage(); test_PeekMessage2(); + test_PeekMessage3(); test_WaitForInputIdle( test_argv[0] ); test_scrollwindowex(); test_messages();

1 0

Stefan Dösinger : ddraw: Add DDBLT_DEPTHFILL validation.
by Alexandre Julliard March 17, 2015

March 17, 2015

Module: wine Branch: master Commit: a84980168ce948069565a65cf5d98b778c471fe1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a84980168ce948069565a65cf… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Mar 16 14:48:54 2015 +0100 ddraw: Add DDBLT_DEPTHFILL validation. --- dlls/ddraw/surface.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 8b25cb9..034e3aa 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1537,26 +1537,36 @@ static HRESULT WINAPI ddraw_surface7_Blt(IDirectDrawSurface7 *iface, RECT *DestR wined3d_mutex_lock(); - if (Flags & DDBLT_COLORFILL) + if (Flags & (DDBLT_COLORFILL | DDBLT_DEPTHFILL)) { if (src_surface) { wined3d_mutex_unlock(); - WARN("DDBLT_COLORFILL is not compatible with source surfaces, returning DDERR_INVALIDPARAMS\n"); + WARN("Depth or colorfill is not compatible with source surfaces, returning DDERR_INVALIDPARAMS\n"); return DDERR_INVALIDPARAMS; } if (!DDBltFx) { wined3d_mutex_unlock(); - WARN("DDBLT_COLORFILL used with DDBltFx = NULL, returning DDERR_INVALIDPARAMS.\n"); + WARN("Depth or colorfill used with DDBltFx = NULL, returning DDERR_INVALIDPARAMS.\n"); return DDERR_INVALIDPARAMS; } - if (dst_surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) + + if ((Flags & (DDBLT_COLORFILL | DDBLT_DEPTHFILL)) == (DDBLT_COLORFILL | DDBLT_DEPTHFILL)) + Flags &= ~DDBLT_DEPTHFILL; + + if ((dst_surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) && (Flags & DDBLT_COLORFILL)) { wined3d_mutex_unlock(); WARN("DDBLT_COLORFILL used on a depth buffer, returning DDERR_INVALIDPARAMS.\n"); return DDERR_INVALIDPARAMS; } + if (!(dst_surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) && (Flags & DDBLT_DEPTHFILL)) + { + wined3d_mutex_unlock(); + WARN("DDBLT_DEPTHFILL used on a color buffer, returning DDERR_INVALIDPARAMS.\n"); + return DDERR_INVALIDPARAMS; + } } if (Flags & DDBLT_KEYSRC && (!src_surface || !(src_surface->surface_desc.dwFlags & DDSD_CKSRCBLT)))

1 0

Stefan Dösinger : ddraw/tests: Add tests for DDBLT_DEPTHFILL.
by Alexandre Julliard March 17, 2015

March 17, 2015

Module: wine Branch: master Commit: e0edd55a2e45129c0f775f5aba230e00a819917e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0edd55a2e45129c0f775f5ab… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Mar 16 14:48:55 2015 +0100 ddraw/tests: Add tests for DDBLT_DEPTHFILL. --- dlls/ddraw/tests/ddraw7.c | 122 +++++++++++++++++++++++++++++++++++++--------- 1 file changed, 98 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e0edd55a2e45129c0f775…

1 0

Nikolay Sivov : ole32: Handle ILockBytes creation failure (PVS-Studio).
by Alexandre Julliard March 17, 2015

March 17, 2015

Module: wine Branch: master Commit: 1c2bbe8f650b79d827ecad9277c6e02baf6f152e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c2bbe8f650b79d827ecad927… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 14 01:15:59 2015 +0300 ole32: Handle ILockBytes creation failure (PVS-Studio). --- dlls/ole32/clipboard.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index c7d58d6..db1e4a8 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -576,6 +576,12 @@ static HRESULT render_embed_source_hack(IDataObject *data, LPFORMATETC fmt) hStorage = GlobalAlloc(GMEM_SHARE|GMEM_MOVEABLE, 0); if (hStorage == NULL) return E_OUTOFMEMORY; hr = CreateILockBytesOnHGlobal(hStorage, FALSE, &ptrILockBytes); + if (FAILED(hr)) + { + GlobalFree(hStorage); + return hr; + } + hr = StgCreateDocfileOnILockBytes(ptrILockBytes, STGM_SHARE_EXCLUSIVE|STGM_READWRITE, 0, &std.u.pstg); ILockBytes_Release(ptrILockBytes);

1 0

Sebastian Lackner : user32: Fix invalid memory access and leak if alloc_user_handle fails (Coverity).
by Alexandre Julliard March 17, 2015

March 17, 2015

Module: wine Branch: master Commit: a9ff334976e78808a36659df24d8b3e6a38f3b26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9ff334976e78808a36659df2… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Mar 17 06:14:45 2015 +0100 user32: Fix invalid memory access and leak if alloc_user_handle fails (Coverity). --- dlls/user32/cursoricon.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 8504bdc..f7b6bca 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -123,12 +123,14 @@ static HICON alloc_icon_handle( BOOL is_ani, UINT num_steps ) { struct cursoricon_object *obj; int icon_size; + HICON handle; if (is_ani) icon_size = FIELD_OFFSET( struct animated_cursoricon_object, frames[num_steps] ); else icon_size = sizeof( struct static_cursoricon_object ); obj = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, icon_size ); + if (!obj) return NULL; obj->delay = 0; obj->is_ani = is_ani; @@ -139,7 +141,10 @@ static HICON alloc_icon_handle( BOOL is_ani, UINT num_steps ) ani_icon_data->num_steps = num_steps; ani_icon_data->num_frames = num_steps; /* changed later for some animated cursors */ } - return alloc_user_handle( &obj->obj, USER_ICON ); + + if (!(handle = alloc_user_handle( &obj->obj, USER_ICON ))) + HeapFree( GetProcessHeap(), 0, obj ); + return handle; } static struct cursoricon_object *get_icon_ptr( HICON handle )

1 0

Sebastian Lackner : kernel32: Fix leak of dynamic_buffer in QueryFullProcessImageNameW (Coverity).
by Alexandre Julliard March 17, 2015

March 17, 2015

Module: wine Branch: master Commit: 5bab75166c2beeb2d3d3aead3e508c98c73c26ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bab75166c2beeb2d3d3aead3… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Mar 17 06:34:03 2015 +0100 kernel32: Fix leak of dynamic_buffer in QueryFullProcessImageNameW (Coverity). --- dlls/kernel32/process.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 199b2f3..2c8074b 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -3568,8 +3568,8 @@ BOOL WINAPI QueryFullProcessImageNameW(HANDLE hProcess, DWORD dwFlags, LPWSTR lp ntlen = devlen + (result->Length/sizeof(WCHAR) - 2); if (ntlen + 1 > *pdwSize) { - SetLastError(ERROR_INSUFFICIENT_BUFFER); - return FALSE; + status = STATUS_BUFFER_TOO_SMALL; + goto cleanup; } *pdwSize = ntlen;

1 0

Stefan Dösinger : ddraw: Add validation and tests for DDBLT_ROP.
by Alexandre Julliard March 17, 2015

March 17, 2015

Module: wine Branch: master Commit: 948202c47f1f11d558611620e3f7775331eb43a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=948202c47f1f11d558611620e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Mar 16 23:06:57 2015 +0100 ddraw: Add validation and tests for DDBLT_ROP. --- dlls/ddraw/surface.c | 16 ++++++++ dlls/ddraw/tests/ddraw7.c | 98 +++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 98 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=948202c47f1f11d558611…

1 0

Sebastian Lackner : ntdll: RtlFindActivationContextSectionString should accept a NULL pointer as data.
by Alexandre Julliard March 17, 2015

March 17, 2015

Module: wine Branch: master Commit: ab91c011121b76bcc46fc7e3b3addefd1b3acca2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab91c011121b76bcc46fc7e3b… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Mar 16 03:38:58 2015 +0100 ntdll: RtlFindActivationContextSectionString should accept a NULL pointer as data. --- dlls/kernel32/actctx.c | 8 ++++- dlls/kernel32/tests/actctx.c | 10 ++++-- dlls/ntdll/actctx.c | 81 ++++++++++++++++++++++++-------------------- 3 files changed, 59 insertions(+), 40 deletions(-) diff --git a/dlls/kernel32/actctx.c b/dlls/kernel32/actctx.c index bcf95ec..2eb1c2a 100644 --- a/dlls/kernel32/actctx.c +++ b/dlls/kernel32/actctx.c @@ -227,7 +227,7 @@ BOOL WINAPI FindActCtxSectionStringA(DWORD dwFlags, const GUID* lpExtGuid, TRACE("%08x %s %u %s %p\n", dwFlags, debugstr_guid(lpExtGuid), ulId, debugstr_a(lpSearchStr), pInfo); - if (!lpSearchStr) + if (!lpSearchStr || !pInfo) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; @@ -255,6 +255,12 @@ BOOL WINAPI FindActCtxSectionStringW(DWORD dwFlags, const GUID* lpExtGuid, UNICODE_STRING us; NTSTATUS status; + if (!pInfo) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + RtlInitUnicodeString(&us, lpSearchStr); if ((status = RtlFindActivationContextSectionString(dwFlags, lpExtGuid, ulId, &us, pInfo))) { diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index 887c6b0..7512aed 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -2148,9 +2148,13 @@ static void ntdll_find(ULONG section, const char *string_to_find, BOOL should_fi "RtlFindActivationContextSectionString: unexpected status 0x%x\n", ret); ret = pRtlFindActivationContextSectionString(0, NULL, section, &string_to_findW, NULL); - todo_wine - ok_(__FILE__, line)(ret == (should_find ? STATUS_SUCCESS : STATUS_SXS_KEY_NOT_FOUND), - "RtlFindActivationContextSectionString: unexpected status 0x%x\n", ret); + if (todo) + todo_wine + ok_(__FILE__, line)(ret == (should_find ? STATUS_SUCCESS : STATUS_SXS_KEY_NOT_FOUND), + "RtlFindActivationContextSectionString: unexpected status 0x%x\n", ret); + else + ok_(__FILE__, line)(ret == (should_find ? STATUS_SUCCESS : STATUS_SXS_KEY_NOT_FOUND), + "RtlFindActivationContextSectionString: unexpected status 0x%x\n", ret); pRtlFreeUnicodeString(&string_to_findW); } diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 6ea7b54..4552e40 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -3133,19 +3133,22 @@ static NTSTATUS find_dll_redirection(ACTIVATION_CONTEXT* actctx, const UNICODE_S index = find_string_index(actctx->dllredirect_section, name); if (!index) return STATUS_SXS_KEY_NOT_FOUND; - dll = get_dllredirect_data(actctx, index); + if (data) + { + dll = get_dllredirect_data(actctx, index); - data->ulDataFormatVersion = 1; - data->lpData = dll; - data->ulLength = dll->size; - data->lpSectionGlobalData = NULL; - data->ulSectionGlobalDataLength = 0; - data->lpSectionBase = actctx->dllredirect_section; - data->ulSectionTotalLength = RtlSizeHeap( GetProcessHeap(), 0, actctx->dllredirect_section ); - data->hActCtx = NULL; + data->ulDataFormatVersion = 1; + data->lpData = dll; + data->ulLength = dll->size; + data->lpSectionGlobalData = NULL; + data->ulSectionGlobalDataLength = 0; + data->lpSectionBase = actctx->dllredirect_section; + data->ulSectionTotalLength = RtlSizeHeap( GetProcessHeap(), 0, actctx->dllredirect_section ); + data->hActCtx = NULL; - if (data->cbSize >= FIELD_OFFSET(ACTCTX_SECTION_KEYED_DATA, ulAssemblyRosterIndex) + sizeof(ULONG)) - data->ulAssemblyRosterIndex = index->rosterindex; + if (data->cbSize >= FIELD_OFFSET(ACTCTX_SECTION_KEYED_DATA, ulAssemblyRosterIndex) + sizeof(ULONG)) + data->ulAssemblyRosterIndex = index->rosterindex; + } return STATUS_SUCCESS; } @@ -3342,20 +3345,23 @@ static NTSTATUS find_window_class(ACTIVATION_CONTEXT* actctx, const UNICODE_STRI if (!index) return STATUS_SXS_KEY_NOT_FOUND; - class = get_wndclass_data(actctx, index); + if (data) + { + class = get_wndclass_data(actctx, index); - data->ulDataFormatVersion = 1; - data->lpData = class; - /* full length includes string length with nulls */ - data->ulLength = class->size + class->name_len + class->module_len + 2*sizeof(WCHAR); - data->lpSectionGlobalData = NULL; - data->ulSectionGlobalDataLength = 0; - data->lpSectionBase = actctx->wndclass_section; - data->ulSectionTotalLength = RtlSizeHeap( GetProcessHeap(), 0, actctx->wndclass_section ); - data->hActCtx = NULL; + data->ulDataFormatVersion = 1; + data->lpData = class; + /* full length includes string length with nulls */ + data->ulLength = class->size + class->name_len + class->module_len + 2*sizeof(WCHAR); + data->lpSectionGlobalData = NULL; + data->ulSectionGlobalDataLength = 0; + data->lpSectionBase = actctx->wndclass_section; + data->ulSectionTotalLength = RtlSizeHeap( GetProcessHeap(), 0, actctx->wndclass_section ); + data->hActCtx = NULL; - if (data->cbSize >= FIELD_OFFSET(ACTCTX_SECTION_KEYED_DATA, ulAssemblyRosterIndex) + sizeof(ULONG)) - data->ulAssemblyRosterIndex = index->rosterindex; + if (data->cbSize >= FIELD_OFFSET(ACTCTX_SECTION_KEYED_DATA, ulAssemblyRosterIndex) + sizeof(ULONG)) + data->ulAssemblyRosterIndex = index->rosterindex; + } return STATUS_SUCCESS; } @@ -4397,19 +4403,22 @@ static NTSTATUS find_progid_redirection(ACTIVATION_CONTEXT* actctx, const UNICOD index = find_string_index(actctx->progid_section, name); if (!index) return STATUS_SXS_KEY_NOT_FOUND; - progid = get_progid_data(actctx, index); + if (data) + { + progid = get_progid_data(actctx, index); - data->ulDataFormatVersion = 1; - data->lpData = progid; - data->ulLength = progid->size; - data->lpSectionGlobalData = (BYTE*)actctx->progid_section + actctx->progid_section->global_offset; - data->ulSectionGlobalDataLength = actctx->progid_section->global_len; - data->lpSectionBase = actctx->progid_section; - data->ulSectionTotalLength = RtlSizeHeap( GetProcessHeap(), 0, actctx->progid_section ); - data->hActCtx = NULL; + data->ulDataFormatVersion = 1; + data->lpData = progid; + data->ulLength = progid->size; + data->lpSectionGlobalData = (BYTE*)actctx->progid_section + actctx->progid_section->global_offset; + data->ulSectionGlobalDataLength = actctx->progid_section->global_len; + data->lpSectionBase = actctx->progid_section; + data->ulSectionTotalLength = RtlSizeHeap( GetProcessHeap(), 0, actctx->progid_section ); + data->hActCtx = NULL; - if (data->cbSize >= FIELD_OFFSET(ACTCTX_SECTION_KEYED_DATA, ulAssemblyRosterIndex) + sizeof(ULONG)) - data->ulAssemblyRosterIndex = index->rosterindex; + if (data->cbSize >= FIELD_OFFSET(ACTCTX_SECTION_KEYED_DATA, ulAssemblyRosterIndex) + sizeof(ULONG)) + data->ulAssemblyRosterIndex = index->rosterindex; + } return STATUS_SUCCESS; } @@ -4441,7 +4450,7 @@ static NTSTATUS find_string(ACTIVATION_CONTEXT* actctx, ULONG section_kind, if (status != STATUS_SUCCESS) return status; - if (flags & FIND_ACTCTX_SECTION_KEY_RETURN_HACTCTX) + if (data && (flags & FIND_ACTCTX_SECTION_KEY_RETURN_HACTCTX)) { actctx_addref(actctx); data->hActCtx = actctx; @@ -5008,7 +5017,7 @@ NTSTATUS WINAPI RtlFindActivationContextSectionString( ULONG flags, const GUID * FIXME("unknown flags %08x\n", flags); return STATUS_INVALID_PARAMETER; } - if (!data || data->cbSize < offsetof(ACTCTX_SECTION_KEYED_DATA, ulAssemblyRosterIndex) || + if ((data && data->cbSize < offsetof(ACTCTX_SECTION_KEYED_DATA, ulAssemblyRosterIndex)) || !section_name || !section_name->Buffer) { WARN("invalid parameter\n");

1 0