May 2018 - Wine-Devel - list.winehq.org

[PATCH 1/2] schedsvc: Explicitly terminate the received name in the notification buffer. (resend)
by Dmitry Timoshkov May 8, 2018

May 8, 2018

And print a FIXME if we've got multiple entries. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/schedsvc/svc_main.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/schedsvc/svc_main.c b/dlls/schedsvc/svc_main.c index ba8de0430f..937d1c2b7e 100644 --- a/dlls/schedsvc/svc_main.c +++ b/dlls/schedsvc/svc_main.c @@ -82,12 +82,17 @@ static DWORD WINAPI tasks_monitor_thread(void *arg) NULL, &ov, NULL); if (!ret) break; + if (info.data.NextEntryOffset) + FIXME("got multiple entries\n"); + events[0] = done_event; events[1] = ov.hEvent; ret = WaitForMultipleObjects(2, events, FALSE, INFINITE); if (ret == WAIT_OBJECT_0) break; + info.data.FileName[info.data.FileNameLength/sizeof(WCHAR)] = 0; + switch (info.data.Action) { case FILE_ACTION_ADDED: -- 2.16.3

1 0

[PATCH 3/5] user32: Refactor DrawTextEx() with a dynamic array for lines.
by Zhiyi Zhang May 8, 2018

May 8, 2018

With this patch, getting text rect height with DT_CALCRECT doesn't need a second loop with TEXT_NextLineW(). Text rect height is needed for coordinates calculation with DT_BOTTOM set. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/text.c | 102 +++++++++++++++++++++++++++++++++++---------- 1 file changed, 79 insertions(+), 23 deletions(-) diff --git a/dlls/user32/text.c b/dlls/user32/text.c index 3ba4a129cf..dbde596a1c 100644 --- a/dlls/user32/text.c +++ b/dlls/user32/text.c @@ -856,6 +856,13 @@ static void TEXT_DrawUnderscore (HDC hdc, int x, int y, const WCHAR *str, int of DeleteObject (hpen); } +struct line_info +{ + int length; + int x; + int prefix_offset; +}; + /*********************************************************************** * DrawTextExW (USER32.@) * @@ -866,7 +873,9 @@ static void TEXT_DrawUnderscore (HDC hdc, int x, int y, const WCHAR *str, int of * 3 more than a null-terminated string). If this is not so then increase * the allowance in DrawTextExA. */ -#define MAX_BUFFER 1024 +#define MIN_BUFFER_SIZE 1024 +#define INIT_BUFFER_SIZE (MIN_BUFFER_SIZE * 2) +#define INIT_LINES_COUNT 4 INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count, LPRECT rect, UINT flags, LPDRAWTEXTPARAMS dtp ) { @@ -874,11 +883,14 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count, const WCHAR *strPtr; WCHAR *retstr, *p_retstr; size_t size_retstr; - WCHAR line[MAX_BUFFER]; + WCHAR lines_buffer[INIT_BUFFER_SIZE], *lines_ptr = lines_buffer; + int used_buffer = 0, buffer_size = ARRAY_SIZE(lines_buffer), line_offset = 0; + struct line_info lines_info_buffer[INIT_LINES_COUNT], *lines_info_ptr = lines_info_buffer; + int used_lines = 0, lines_size = ARRAY_SIZE(lines_info_buffer), line_num; int len, lh, count=i_count; TEXTMETRICW tm; int lmargin = 0, rmargin = 0; - int x = rect->left, y = rect->top; + int x = rect->left, y = rect->top, xseg; int width = rect->right - rect->left; int max_width = 0; int last_line; @@ -972,28 +984,77 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count, do { - len = ARRAY_SIZE(line); + len = buffer_size - used_buffer; + if (len < MIN_BUFFER_SIZE) + { + buffer_size *= 2; + if (lines_ptr == lines_buffer) + { + lines_ptr = heap_alloc(sizeof(*lines_ptr) * buffer_size); + if (lines_ptr) memcpy(lines_ptr, lines_buffer, sizeof(lines_buffer)); + } + else + lines_ptr = heap_realloc(lines_ptr, sizeof(*lines_ptr) * buffer_size); + if (!lines_ptr) goto done; + len = buffer_size - used_buffer; + } + if (used_lines >= lines_size) + { + lines_size *= 2; + if (lines_info_ptr == lines_info_buffer) + { + lines_info_ptr = heap_alloc(sizeof(*lines_info_ptr) * lines_size); + if (lines_info_ptr) memcpy(lines_info_ptr, lines_info_buffer, sizeof(lines_info_buffer)); + } + else + lines_info_ptr = heap_realloc(lines_info_ptr, sizeof(*lines_info_ptr) * lines_size); + if (!lines_info_ptr) goto done; + } + if (invert_y) last_line = !(flags & DT_NOCLIP) && y - ((flags & DT_EDITCONTROL) ? 2*lh-1 : lh) < rect->bottom; else last_line = !(flags & DT_NOCLIP) && y + ((flags & DT_EDITCONTROL) ? 2*lh-1 : lh) > rect->bottom; - strPtr = TEXT_NextLineW(hdc, strPtr, &count, line, &len, width, flags, &size, last_line, &p_retstr, tabwidth, &prefix_offset, &ellip); + strPtr = TEXT_NextLineW(hdc, strPtr, &count, lines_ptr + used_buffer, &len, width, flags, &size, last_line, &p_retstr, tabwidth, &prefix_offset, &ellip); if (flags & DT_CENTER) x = (rect->left + rect->right - size.cx) / 2; else if (flags & DT_RIGHT) x = rect->right - size.cx; - if (flags & DT_SINGLELINE) + lines_info_ptr[used_lines].length = len; + lines_info_ptr[used_lines].x = x; + lines_info_ptr[used_lines].prefix_offset = prefix_offset; + used_buffer += len; + used_lines++; + + if (size.cx > max_width) max_width = size.cx; + + if (invert_y) + y -= lh; + else + y += lh; + if (dtp) + dtp->uiLengthDrawn += len; + } + while (strPtr && !last_line); + + if (!(flags & DT_CALCRECT)) + { + y = rect->top; + if (flags & DT_SINGLELINE) { if (flags & DT_VCENTER) y = rect->top + (rect->bottom - rect->top) / 2 - size.cy / 2; else if (flags & DT_BOTTOM) y = rect->bottom - size.cy; } - if (!(flags & DT_CALCRECT)) - { - const WCHAR *str = line; - int xseg = x; + for (line_num = 0; line_num < used_lines; line_num++) + { + const WCHAR *str = lines_ptr + line_offset; + line_offset += lines_info_ptr[line_num].length; + len = lines_info_ptr[line_num].length; + xseg = lines_info_ptr[line_num].x; + prefix_offset = lines_info_ptr[line_num].prefix_offset; while (len) { int len_seg; @@ -1041,20 +1102,13 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count, } } } - } - else if (size.cx > max_width) - max_width = size.cx; - - if (invert_y) - y -= lh; - else - y += lh; - if (dtp) - dtp->uiLengthDrawn += len; + if (invert_y) + y -= lh; + else + y += lh; + } } - while (strPtr && !last_line); - - if (flags & DT_CALCRECT) + else { rect->right = rect->left + max_width; rect->bottom = y; @@ -1067,6 +1121,8 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count, ret = y - rect->top; done: heap_free(retstr); + if (lines_ptr != lines_buffer) heap_free(lines_ptr); + if (lines_info_ptr != lines_info_buffer) heap_free(lines_info_ptr); return ret; } -- 2.17.0

2 1

wine-3.0.1-rc2 Available
by Michael Stefaniuc May 8, 2018

May 8, 2018

Hello guys, I have pushed wine-3.0.1-rc2 (with tag) to https://github.com/mstefani/wine-stable/tree/oldstable https://static-winehq.193b.starter-ca-central-1.openshiftapps.com/stable/ Changes since rc1: - Added "server: Avoid writing out of bounds in get_selector_entry()." as it fixes an already cherry-picked commit. bye michael

1 0

[PATCH 2/5] user32: Use common cleanup code in DrawTextExW().
by Zhiyi Zhang May 8, 2018

May 8, 2018

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/text.c | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/dlls/user32/text.c b/dlls/user32/text.c index e9c6c71068..3ba4a129cf 100644 --- a/dlls/user32/text.c +++ b/dlls/user32/text.c @@ -886,6 +886,7 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count, int prefix_offset; ellipsis_data ellip; BOOL invert_y=FALSE; + int ret = 0; TRACE("%s, %d, [%s] %08x\n", debugstr_wn (str, count), count, wine_dbgstr_rect(rect), flags); @@ -1002,11 +1003,7 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count, const WCHAR *p; p = str; while (p < str+len && *p != TAB) p++; len_seg = p - str; - if (len_seg != len && !GetTextExtentPointW(hdc, str, len_seg, &size)) - { - heap_free(retstr); - return 0; - } + if (len_seg != len && !GetTextExtentPointW(hdc, str, len_seg, &size)) goto done; } else len_seg = len; @@ -1015,10 +1012,7 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count, ((flags & DT_NOCLIP) ? 0 : ETO_CLIPPED) | ((flags & DT_RTLREADING) ? ETO_RTLREADING : 0), rect, str, len_seg, NULL )) - { - heap_free(retstr); - return 0; - } + goto done; if (prefix_offset != -1 && prefix_offset < len_seg) { TEXT_DrawUnderscore (hdc, xseg, y + tm.tmAscent + 1, str, prefix_offset, (flags & DT_NOCLIP) ? NULL : rect); @@ -1067,12 +1061,13 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count, if (dtp) rect->right += lmargin + rmargin; } - if (retstr) - { - memcpy (str, retstr, size_retstr); - heap_free(retstr); - } - return y - rect->top; + + if (retstr) memcpy(str, retstr, size_retstr); + + ret = y - rect->top; +done: + heap_free(retstr); + return ret; } /*********************************************************************** -- 2.17.0

2 1

[PATCH 1/5] user32: Use the heap_*() functions in text.c where possible.
by Zhiyi Zhang May 8, 2018

May 8, 2018

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/text.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/user32/text.c b/dlls/user32/text.c index 0b5bd47461..e9c6c71068 100644 --- a/dlls/user32/text.c +++ b/dlls/user32/text.c @@ -41,6 +41,7 @@ #include "usp10.h" #include "user_private.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(text); @@ -365,7 +366,7 @@ static void TEXT_WordBreak (HDC hdc, WCHAR *str, unsigned int max_str, assert (format & DT_WORDBREAK); assert (chars_fit < *len_str); - sla = HeapAlloc(GetProcessHeap(), 0, sizeof(SCRIPT_LOGATTR) * *len_str); + sla = heap_alloc(sizeof(SCRIPT_LOGATTR) * *len_str); memset(&sa, 0, sizeof(SCRIPT_ANALYSIS)); sa.eScript = SCRIPT_UNDEFINED; @@ -445,7 +446,7 @@ static void TEXT_WordBreak (HDC hdc, WCHAR *str, unsigned int max_str, } /* Remeasure the string */ GetTextExtentExPointW (hdc, str, *len_str, 0, NULL, NULL, size); - HeapFree(GetProcessHeap(),0, sla); + heap_free(sla); } /********************************************************************* @@ -957,7 +958,7 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count, if (flags & DT_MODIFYSTRING) { size_retstr = (count + 4) * sizeof (WCHAR); - retstr = HeapAlloc(GetProcessHeap(), 0, size_retstr); + retstr = heap_alloc(size_retstr); if (!retstr) return 0; memcpy (retstr, str, size_retstr); } @@ -1003,7 +1004,7 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count, len_seg = p - str; if (len_seg != len && !GetTextExtentPointW(hdc, str, len_seg, &size)) { - HeapFree (GetProcessHeap(), 0, retstr); + heap_free(retstr); return 0; } } @@ -1015,7 +1016,7 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count, ((flags & DT_RTLREADING) ? ETO_RTLREADING : 0), rect, str, len_seg, NULL )) { - HeapFree (GetProcessHeap(), 0, retstr); + heap_free(retstr); return 0; } if (prefix_offset != -1 && prefix_offset < len_seg) @@ -1069,7 +1070,7 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count, if (retstr) { memcpy (str, retstr, size_retstr); - HeapFree (GetProcessHeap(), 0, retstr); + heap_free(retstr); } return y - rect->top; } @@ -1128,7 +1129,7 @@ INT WINAPI DrawTextExA( HDC hdc, LPSTR str, INT count, wmax += 4; amax += 4; } - wstr = HeapAlloc(GetProcessHeap(), 0, wmax * sizeof(WCHAR)); + wstr = heap_alloc(wmax * sizeof(WCHAR)); if (wstr) { MultiByteToWideChar( cp, 0, str, count, wstr, wcount ); @@ -1147,7 +1148,7 @@ INT WINAPI DrawTextExA( HDC hdc, LPSTR str, INT count, for (i=4, p=wstr+wcount; i-- && *p != 0xFFFE; p++) wcount++; WideCharToMultiByte( cp, 0, wstr, wcount, str, amax, NULL, NULL ); } - HeapFree(GetProcessHeap(), 0, wstr); + heap_free(wstr); } return ret; } @@ -1417,11 +1418,11 @@ LONG WINAPI TabbedTextOutA( HDC hdc, INT x, INT y, LPCSTR lpstr, INT count, { LONG ret; DWORD len = MultiByteToWideChar( CP_ACP, 0, lpstr, count, NULL, 0 ); - LPWSTR strW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); + LPWSTR strW = heap_alloc( len * sizeof(WCHAR) ); if (!strW) return 0; MultiByteToWideChar( CP_ACP, 0, lpstr, count, strW, len ); ret = TabbedTextOutW( hdc, x, y, strW, len, cTabStops, lpTabPos, nTabOrg ); - HeapFree( GetProcessHeap(), 0, strW ); + heap_free( strW ); return ret; } @@ -1470,11 +1471,11 @@ DWORD WINAPI GetTabbedTextExtentA( HDC hdc, LPCSTR lpstr, INT count, { LONG ret; DWORD len = MultiByteToWideChar( CP_ACP, 0, lpstr, count, NULL, 0 ); - LPWSTR strW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); + LPWSTR strW = heap_alloc( len * sizeof(WCHAR) ); if (!strW) return 0; MultiByteToWideChar( CP_ACP, 0, lpstr, count, strW, len ); ret = GetTabbedTextExtentW( hdc, strW, len, cTabStops, lpTabPos ); - HeapFree( GetProcessHeap(), 0, strW ); + heap_free( strW ); return ret; } -- 2.17.0

2 1

[resend PATCH] user32: Avoid touching last error on successful path of GetClassInfo()
by Nikolay Sivov May 8, 2018

May 8, 2018

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Resending to make it appear on patch list. dlls/user32/class.c | 5 ++++- dlls/user32/tests/class.c | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/user32/class.c b/dlls/user32/class.c index d4e7951d39..ce2830fe25 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -333,6 +333,7 @@ const WCHAR *CLASS_GetVersionedName( const WCHAR *name, UINT *basename_offset, B ULONG module_offset; } *wndclass; const WCHAR *module, *ret; + UNICODE_STRING name_us; HMODULE hmod; if (basename_offset) @@ -345,7 +346,9 @@ const WCHAR *CLASS_GetVersionedName( const WCHAR *name, UINT *basename_offset, B return name; data.cbSize = sizeof(data); - if (!FindActCtxSectionStringW(0, NULL, ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION, name, &data)) + RtlInitUnicodeString(&name_us, name); + if (RtlFindActivationContextSectionString(0, NULL, ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION, + &name_us, &data)) return name; wndclass = (struct wndclass_redirect_data *)data.lpData; diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index a9eee4109c..92b9ad93a2 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -998,6 +998,7 @@ if (0) { /* crashes under XP */ SetLastError(0xdeadbeef); ret = GetClassInfoExA(0, "static", &wcx); ok(ret, "GetClassInfoExA() error %d\n", GetLastError()); + ok(GetLastError() == 0xdeadbeef, "Unexpected error code %d\n", GetLastError()); ok(wcx.cbSize == 0, "expected 0, got %u\n", wcx.cbSize); ok(wcx.lpfnWndProc != NULL, "got null proc\n"); -- 2.17.0

1 0

Re: Alexandre Julliard : Revert "user32: SetWindowPos() should check the final window position in screen coords before adding SWP_NOMOVE. "
by Dmitry Timoshkov May 8, 2018

May 8, 2018

Alexandre Julliard <julliard(a)winehq.org> wrote: > Author: Alexandre Julliard <julliard(a)winehq.org> > Date: Sun May 6 11:09:33 2018 +0200 > > Revert "user32: SetWindowPos() should check the final window position in screen coords before adding SWP_NOMOVE." > > This reverts commit 38a76ecb0386d37d30b06b7947ed52be77ec9f1e. > It has no effect, the coordinates are identical either way. Just for the record: the coordinates are not indentical after the SetParent() call, and that patch was needed for SetParent() implementation at that time because SetParent() called SetWindowPos() directly. Since then the SetParent() implementation has changed and this no longer has an effect. -- Dmitry.

2 1

[PATCH] include: Move AllocateAndGet* functions to public header
by Alistair Leslie-Hughes May 8, 2018

May 8, 2018

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/iphlpapi/ipstats.c | 1 + dlls/iphlpapi/ipstats.h | 5 ----- include/iphlpapi.h | 5 +++++ 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 327a601..863edd3 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -153,6 +153,7 @@ #define NONAMELESSUNION #include "ifenum.h" #include "ipstats.h" +#include "iphlpapi.h" #include "wine/debug.h" #include "wine/server.h" diff --git a/dlls/iphlpapi/ipstats.h b/dlls/iphlpapi/ipstats.h index bf5bb92..d742d63 100644 --- a/dlls/iphlpapi/ipstats.h +++ b/dlls/iphlpapi/ipstats.h @@ -32,11 +32,6 @@ */ DWORD getInterfaceStatsByName(const char *name, PMIB_IFROW entry) DECLSPEC_HIDDEN; -DWORD WINAPI AllocateAndGetUdpTableFromStack(PMIB_UDPTABLE *ppUdpTable, BOOL bOrder, HANDLE heap, DWORD flags) DECLSPEC_HIDDEN; -DWORD WINAPI AllocateAndGetTcpTableFromStack(PMIB_TCPTABLE *ppTcpTable, BOOL bOrder, HANDLE heap, DWORD flags) DECLSPEC_HIDDEN; -DWORD WINAPI AllocateAndGetIpNetTableFromStack(PMIB_IPNETTABLE *ppIpNetTable, BOOL bOrder, HANDLE heap, DWORD flags) DECLSPEC_HIDDEN; -DWORD WINAPI AllocateAndGetIpForwardTableFromStack(PMIB_IPFORWARDTABLE *ppIpForwardTable, BOOL bOrder, HANDLE heap, DWORD flags) DECLSPEC_HIDDEN; - DWORD build_tcp_table(TCP_TABLE_CLASS, void **, BOOL, HANDLE, DWORD, DWORD *) DECLSPEC_HIDDEN; DWORD build_udp_table(UDP_TABLE_CLASS, void **, BOOL, HANDLE, DWORD, DWORD *) DECLSPEC_HIDDEN; diff --git a/include/iphlpapi.h b/include/iphlpapi.h index ca8e48f..54d93d1 100644 --- a/include/iphlpapi.h +++ b/include/iphlpapi.h @@ -154,6 +154,11 @@ ULONG WINAPI GetAdaptersAddresses(ULONG family, ULONG flags, PVOID reserved, PIP_ADAPTER_ADDRESSES aa, PULONG buflen); #endif +DWORD WINAPI AllocateAndGetUdpTableFromStack(PMIB_UDPTABLE *ppUdpTable, BOOL bOrder, HANDLE heap, DWORD flags); +DWORD WINAPI AllocateAndGetTcpTableFromStack(PMIB_TCPTABLE *ppTcpTable, BOOL bOrder, HANDLE heap, DWORD flags); +DWORD WINAPI AllocateAndGetIpNetTableFromStack(PMIB_IPNETTABLE *ppIpNetTable, BOOL bOrder, HANDLE heap, DWORD flags); +DWORD WINAPI AllocateAndGetIpForwardTableFromStack(PMIB_IPFORWARDTABLE *ppIpForwardTable, BOOL bOrder, HANDLE heap, DWORD flags); + #ifdef __cplusplus } #endif -- 1.9.1

1 0

[PATCH 2/2] include: Add IApplicationActivationManager interface declaration.
by Alistair Leslie-Hughes May 8, 2018

May 8, 2018

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/shobjidl.idl | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/include/shobjidl.idl b/include/shobjidl.idl index e0fe01c..73278e4 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -3713,6 +3713,35 @@ interface IItemNameLimits : IUnknown [out] int *max_length); } +typedef [v1_enum] enum ACTIVATEOPTIONS +{ + AO_NONE = 0x00000000, + AO_DESIGNMODE = 0x00000001, + AO_NOERRORUI = 0x00000002, + AO_NOSPLASHSCREEN = 0x00000004, + AO_PRELAUNCH = 0x02000000 +} ACTIVATEOPTIONS; + +[ + uuid(2e941141-7f97-4756-ba1d-9decde894a3d), + object, + pointer_default(unique) +] +interface IApplicationActivationManager : IUnknown +{ + HRESULT ActivateApplication([in] LPCWSTR appusermodelid, + [in, unique] LPCWSTR arguments, + [in] ACTIVATEOPTIONS options, + [out] DWORD *processid); + HRESULT ActivateForFile([in] LPCWSTR appusermodelid, + [in] IShellItemArray *itemarray, + [in, unique] LPCWSTR verb, + [out] DWORD *processid); + HRESULT ActivateForProtocol([in] LPCWSTR appusermodelid, + [in] IShellItemArray *itemarray, + [out] DWORD *processid); +} + /***************************************************************************** * ShellObjects typelibrary */ @@ -3817,4 +3846,12 @@ library ShellObjects { interface IQueryCancelAutoPlay; } + + [ + uuid(45ba127d-10a8-46ea-8ab7-56ea9078943c) + ] + coclass ApplicationActivationManager + { + interface IApplicationActivationManager; + } } -- 1.9.1

1 0

[PATCH 1/2] ntdll: Add stub for RtlQueryPackageIdentity.
by Alistair Leslie-Hughes May 8, 2018

May 8, 2018

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/rtl.c | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index c260b0d..38ffad3 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -813,6 +813,7 @@ @ stdcall RtlQueryInformationActivationContext(long long ptr long ptr long ptr) @ stub RtlQueryInformationActiveActivationContext @ stub RtlQueryInterfaceMemoryStream +@ stdcall RtlQueryPackageIdentity(long ptr ptr ptr ptr ptr) @ stub RtlQueryProcessBackTraceInformation @ stdcall RtlQueryProcessDebugInformation(long long ptr) @ stub RtlQueryProcessHeapInformation diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 09a9c92..8ade752 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -1672,3 +1672,13 @@ RTL_UNLOAD_EVENT_TRACE * WINAPI RtlGetUnloadEventTrace(void) FIXME("stub!\n"); return NULL; } + +/********************************************************************* + * RtlQueryPackageIdentity [NTDLL.@] + */ +NTSTATUS WINAPI RtlQueryPackageIdentity(HANDLE token, WCHAR *fullname, SIZE_T *fullname_size, + WCHAR *appid, SIZE_T *appid_size, BOOLEAN *packaged) +{ + FIXME("(%p, %p, %p, %p, %p, %p): stub\n", token, fullname, fullname_size, appid, appid_size, packaged); + return STATUS_NOT_FOUND; +} -- 1.9.1

1 0