August 2018 - Wine-Commits - list.winehq.org

Alex Henrie : shell32: Add visual settings icon.
by Alexandre Julliard Aug. 29, 2018

Aug. 29, 2018

Module: wine Branch: master Commit: a90f24322eb28ceefe0854b2bd80bf9433da5dce URL: https://source.winehq.org/git/wine.git/?a=commit;h=a90f24322eb28ceefe0854b2… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 28 23:47:24 2018 -0600 shell32: Add visual settings icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 3 +++ dlls/shell32/shresdef.h | 1 + 2 files changed, 4 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 749d24e..43fe27d 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -711,6 +711,9 @@ IDI_SHELL_NET_CONNECTIONS ICON resources/network.ico /* @makedep: resources/folder.ico */ IDI_SHELL_NEW_WEB_FOLDER ICON resources/folder.ico +/* @makedep: resources/control.ico */ +IDI_SHELL_VISUAL_SETTINGS ICON resources/control.ico + /* FIXME: Following resource is not yet added */ /* @makedep: resources/document.ico */ IDI_SHELL_NEW_WEB_PAGE ICON resources/document.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 0e6d070..dc45821 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -264,6 +264,7 @@ #define IDI_SHELL_CHECKLIST_FOLDER 174 #define IDI_SHELL_NET_CONNECTIONS 175 #define IDI_SHELL_NEW_WEB_FOLDER 176 +#define IDI_SHELL_VISUAL_SETTINGS 177 #define IDI_SHELL_NEW_WEB_PAGE 178 #define IDI_SHELL_WEB_FOLDERS 193 #define IDI_SHELL_MY_DOCUMENTS 235

1 0

Alex Henrie : shell32: Add remote connection icon.
by Alexandre Julliard Aug. 29, 2018

Aug. 29, 2018

Module: wine Branch: master Commit: 2c3d0b76720c4f4b882dc1375256d5b219333ee5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c3d0b76720c4f4b882dc137… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 28 23:47:25 2018 -0600 shell32: Add remote connection icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 4 ++++ dlls/shell32/shresdef.h | 1 + 2 files changed, 5 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 43fe27d..2b34345 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -718,6 +718,10 @@ IDI_SHELL_VISUAL_SETTINGS ICON resources/control.ico /* @makedep: resources/document.ico */ IDI_SHELL_NEW_WEB_PAGE ICON resources/document.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/internet.ico */ +IDI_SHELL_REMOTE_CONNECTION ICON resources/internet.ico + /* @makedep: resources/internet.ico */ IDI_SHELL_WEB_FOLDERS ICON resources/internet.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index dc45821..f7e51dc 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -266,6 +266,7 @@ #define IDI_SHELL_NEW_WEB_FOLDER 176 #define IDI_SHELL_VISUAL_SETTINGS 177 #define IDI_SHELL_NEW_WEB_PAGE 178 +#define IDI_SHELL_REMOTE_CONNECTION 179 #define IDI_SHELL_WEB_FOLDERS 193 #define IDI_SHELL_MY_DOCUMENTS 235 #define IDI_SHELL_RENAME 242

1 0

Alex Henrie : shell32: Add demo window icons.
by Alexandre Julliard Aug. 29, 2018

Aug. 29, 2018

Module: wine Branch: master Commit: 408bbe56737e21e1c9f85fab7e9d3884c648e76f URL: https://source.winehq.org/git/wine.git/?a=commit;h=408bbe56737e21e1c9f85fab… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 28 23:47:27 2018 -0600 shell32: Add demo window icons. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 16 ++++++++++++++++ dlls/shell32/shresdef.h | 4 ++++ 2 files changed, 20 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index c01b8be..cfd7006 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -730,6 +730,22 @@ IDI_SHELL_WINDOW_ON_MONITOR ICON resources/mycomputer.ico /* @makedep: resources/mycomputer.ico */ IDI_SHELL_DESKTOP_ON_MONITOR ICON resources/mycomputer.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/window.ico */ +IDI_SHELL_WINDOW_WITH_SIDEBAR ICON resources/window.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/window.ico */ +IDI_SHELL_WINDOW_WITHOUT_SIDEBAR ICON resources/window.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/window.ico */ +IDI_SHELL_MAXIMIZED_WINDOW ICON resources/window.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/window.ico */ +IDI_SHELL_FLOATING_WINDOWS ICON resources/window.ico + /* @makedep: resources/internet.ico */ IDI_SHELL_WEB_FOLDERS ICON resources/internet.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index f70b084..3876c16 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -269,6 +269,10 @@ #define IDI_SHELL_REMOTE_CONNECTION 179 #define IDI_SHELL_WINDOW_ON_MONITOR 180 #define IDI_SHELL_DESKTOP_ON_MONITOR 181 +#define IDI_SHELL_WINDOW_WITH_SIDEBAR 182 +#define IDI_SHELL_WINDOW_WITHOUT_SIDEBAR 183 +#define IDI_SHELL_MAXIMIZED_WINDOW 184 +#define IDI_SHELL_FLOATING_WINDOWS 185 #define IDI_SHELL_WEB_FOLDERS 193 #define IDI_SHELL_MY_DOCUMENTS 235 #define IDI_SHELL_RENAME 242

1 0

Guillaume Charifi : iphlpapi: Implement GetUdp6Table().
by Alexandre Julliard Aug. 29, 2018

Aug. 29, 2018

Module: wine Branch: master Commit: 88e44332fe0129c5c2d6c0f11ed8a6ed95fe1b40 URL: https://source.winehq.org/git/wine.git/?a=commit;h=88e44332fe0129c5c2d6c0f1… Author: Guillaume Charifi <guillaume.charifi(a)sfr.fr> Date: Mon Aug 27 11:08:37 2018 +0200 iphlpapi: Implement GetUdp6Table(). Signed-off-by: Guillaume Charifi <guillaume.charifi(a)sfr.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/iphlpapi_main.c | 30 ++++-- dlls/iphlpapi/ipstats.c | 244 ++++++++++++++++++++++++++++++++++++++++++ dlls/iphlpapi/ipstats.h | 1 + include/iphlpapi.h | 2 + include/udpmib.h | 51 +++++++++ include/ws2ipdef.h | 35 ++++-- 7 files changed, 349 insertions(+), 16 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=88e44332fe0129c5c2d6…

1 0

Guillaume Charifi : iphlpapi/tests: Add tests for GetUdp6Table().
by Alexandre Julliard Aug. 29, 2018

Aug. 29, 2018

Module: wine Branch: master Commit: d292c4713f21838d152bce007dc7b3c6a4094588 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d292c4713f21838d152bce00… Author: Guillaume Charifi <guillaume.charifi(a)sfr.fr> Date: Mon Aug 27 11:08:38 2018 +0200 iphlpapi/tests: Add tests for GetUdp6Table(). Signed-off-by: Guillaume Charifi <guillaume.charifi(a)sfr.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/tests/iphlpapi.c | 55 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 0d35c26..1be9f3c 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -74,6 +74,7 @@ static DWORD (WINAPI *pGetTcpStatisticsEx)(PMIB_TCPSTATS,DWORD); static DWORD (WINAPI *pGetUdpStatisticsEx)(PMIB_UDPSTATS,DWORD); static DWORD (WINAPI *pGetTcpTable)(PMIB_TCPTABLE,PDWORD,BOOL); static DWORD (WINAPI *pGetUdpTable)(PMIB_UDPTABLE,PDWORD,BOOL); +static DWORD (WINAPI *pGetUdp6Table)(PMIB_UDP6TABLE,PDWORD,BOOL); static DWORD (WINAPI *pGetPerAdapterInfo)(ULONG,PIP_PER_ADAPTER_INFO,PULONG); static DWORD (WINAPI *pGetAdaptersAddresses)(ULONG,ULONG,PVOID,PIP_ADAPTER_ADDRESSES,PULONG); static DWORD (WINAPI *pGetUnicastIpAddressEntry)(MIB_UNICASTIPADDRESS_ROW*); @@ -129,6 +130,7 @@ static void loadIPHlpApi(void) pGetUdpStatisticsEx = (void *)GetProcAddress(hLibrary, "GetUdpStatisticsEx"); pGetTcpTable = (void *)GetProcAddress(hLibrary, "GetTcpTable"); pGetUdpTable = (void *)GetProcAddress(hLibrary, "GetUdpTable"); + pGetUdp6Table = (void *)GetProcAddress(hLibrary, "GetUdp6Table"); pGetPerAdapterInfo = (void *)GetProcAddress(hLibrary, "GetPerAdapterInfo"); pGetAdaptersAddresses = (void *)GetProcAddress(hLibrary, "GetAdaptersAddresses"); pGetUnicastIpAddressEntry = (void *)GetProcAddress(hLibrary, "GetUnicastIpAddressEntry"); @@ -171,6 +173,23 @@ static const char *ntoa( DWORD ip ) return buffer; } +static const char *ntoa6( IN6_ADDR *ip ) +{ + static char buffer[40]; + char *buf = buffer; + unsigned short *p = ip->u.Word; + unsigned int i = 0; + + while (i < 8) + { + if (i > 0) + *buf++ = ':'; + buf += sprintf( buf, "%x", htons(p[i]) ); + i++; + } + return buffer; +} + /* still-to-be-tested 98-only functions: GetUniDirectionalAdapterInfo @@ -2220,6 +2239,41 @@ static void test_ConvertLengthToIpv4Mask(void) ok( mask == INADDR_NONE, "ConvertLengthToIpv4Mask mask value 0x%08x, expected 0x%08x\n", mask, INADDR_NONE ); } +static void test_GetUdp6Table(void) +{ + if (pGetUdp6Table) { + DWORD apiReturn; + ULONG dwSize = 0; + + apiReturn = pGetUdp6Table(NULL, &dwSize, FALSE); + if (apiReturn == ERROR_NOT_SUPPORTED) { + skip("GetUdp6Table is not supported\n"); + return; + } + ok(apiReturn == ERROR_INSUFFICIENT_BUFFER, + "GetUdp6Table(NULL, &dwSize, FALSE) returned %d, expected ERROR_INSUFFICIENT_BUFFER\n", + apiReturn); + if (apiReturn == ERROR_INSUFFICIENT_BUFFER) { + PMIB_UDP6TABLE buf = HeapAlloc(GetProcessHeap(), 0, dwSize); + + apiReturn = pGetUdp6Table(buf, &dwSize, FALSE); + ok(apiReturn == NO_ERROR, + "GetUdp6Table(buf, &dwSize, FALSE) returned %d, expected NO_ERROR\n", + apiReturn); + + if (apiReturn == NO_ERROR && winetest_debug > 1) + { + DWORD i; + trace( "UDP6 table: %u entries\n", buf->dwNumEntries ); + for (i = 0; i < buf->dwNumEntries; i++) + trace( "%u: %s%%%u:%u\n", + i, ntoa6(&buf->table[i].dwLocalAddr), ntohs(buf->table[i].dwLocalScopeId), ntohs(buf->table[i].dwLocalPort) ); + } + HeapFree(GetProcessHeap(), 0, buf); + } + } +} + START_TEST(iphlpapi) { @@ -2248,6 +2302,7 @@ START_TEST(iphlpapi) test_GetUnicastIpAddressEntry(); test_GetUnicastIpAddressTable(); test_ConvertLengthToIpv4Mask(); + test_GetUdp6Table(); freeIPHlpApi(); } }

1 0

Alistair Leslie-Hughes : ntoskrnl.exe: Add DbgQueryDebugFilterState stub.
by Alexandre Julliard Aug. 29, 2018

Aug. 29, 2018

Module: wine Branch: master Commit: 6b3f6657876980f86d09e06bb1f35737acf96d12 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b3f6657876980f86d09e06b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Aug 29 01:30:02 2018 +0000 ntoskrnl.exe: Add DbgQueryDebugFilterState stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45655 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 6 ++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 280bf27..e587d05 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3722,3 +3722,9 @@ void WINAPI IoReleaseRemoveLockAndWaitEx(PIO_REMOVE_LOCK lock, PVOID tag, ULONG { FIXME("stub: %p %p %u\n", lock, tag, size); } + +NTSTATUS WINAPI DbgQueryDebugFilterState(ULONG component, ULONG level) +{ + FIXME("stub: %d %d\n", component, level); + return STATUS_NOT_IMPLEMENTED; +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 71ac860..8079114 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -111,7 +111,7 @@ @ varargs DbgPrintEx(long long str) @ stub DbgPrintReturnControlC @ stub DbgPrompt -@ stub DbgQueryDebugFilterState +@ stdcall DbgQueryDebugFilterState(long long) @ stub DbgSetDebugFilterState @ stdcall ExAcquireResourceExclusiveLite(ptr long) @ stub ExAcquireResourceSharedLite diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index d2f84d2..0cd1673 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1367,6 +1367,7 @@ static inline void IoSetCompletionRoutine(IRP *irp, PIO_COMPLETION_ROUTINE routi #define SYMBOLIC_LINK_QUERY 0x0001 #define SYMBOLIC_LINK_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | 0x1) +NTSTATUS WINAPI DbgQueryDebugFilterState(ULONG, ULONG); void WINAPI ExAcquireFastMutexUnsafe(PFAST_MUTEX); PVOID WINAPI ExAllocatePool(POOL_TYPE,SIZE_T); PVOID WINAPI ExAllocatePoolWithQuota(POOL_TYPE,SIZE_T);

1 0

Jacek Caban : mshtml: Move value fixups to set_style_property.
by Alexandre Julliard Aug. 29, 2018

Aug. 29, 2018

Module: wine Branch: master Commit: 7732b879016fd6d5fdaa683cbe7ec76f47a515b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7732b879016fd6d5fdaa683c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 29 14:08:57 2018 +0200 mshtml: Move value fixups to set_style_property. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 66 ++++++++++++++++++++++++++----------------------- 1 file changed, 35 insertions(+), 31 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 51e4fbe..31d38c8 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -506,32 +506,10 @@ static LPWSTR fix_url_value(LPCWSTR val) static HRESULT set_nsstyle_property(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, const WCHAR *value) { nsAString str_name, str_value, str_empty; - LPWSTR val = NULL; nsresult nsres; - HRESULT hres = S_OK; - - if(value && *value) { - unsigned flags = style_tbl[sid].flags; - if(flags & ATTR_FIX_PX) - val = fix_px_value(value); - else if(flags & ATTR_FIX_URL) - val = fix_url_value(value); - - if(style_tbl[sid].allowed_values) { - const WCHAR **iter; - for(iter = style_tbl[sid].allowed_values; *iter; iter++) { - if(!strcmpiW(*iter, value)) - break; - } - if(!*iter) { - hres = E_INVALIDARG; - value = emptyW; - } - } - } nsAString_InitDepend(&str_name, style_tbl[sid].name); - nsAString_InitDepend(&str_value, val ? val : value); + nsAString_InitDepend(&str_value, value); nsAString_InitDepend(&str_empty, emptyW); nsres = nsIDOMCSSStyleDeclaration_SetProperty(nsstyle, &str_name, &str_value, &str_empty); @@ -541,9 +519,8 @@ static HRESULT set_nsstyle_property(nsIDOMCSSStyleDeclaration *nsstyle, styleid_ nsAString_Finish(&str_name); nsAString_Finish(&str_value); nsAString_Finish(&str_empty); - heap_free(val); - return hres; + return S_OK; } static HRESULT var_to_styleval(const VARIANT *v, styleid_t sid, WCHAR *buf, const WCHAR **ret) @@ -583,6 +560,38 @@ static HRESULT var_to_styleval(const VARIANT *v, styleid_t sid, WCHAR *buf, cons } } +static inline HRESULT set_style_property(HTMLStyle *style, styleid_t sid, const WCHAR *value) +{ + WCHAR *val = NULL; + HRESULT hres; + + if(value && *value) { + unsigned flags = style_tbl[sid].flags; + + if(style_tbl[sid].allowed_values) { + const WCHAR **iter; + for(iter = style_tbl[sid].allowed_values; *iter; iter++) { + if(!strcmpiW(*iter, value)) + break; + } + if(!*iter) { + WARN("invalid value %s\n", debugstr_w(value)); + set_nsstyle_property(style->nsstyle, sid, emptyW); + return E_INVALIDARG; + } + } + + if(flags & ATTR_FIX_PX) + val = fix_px_value(value); + else if(flags & ATTR_FIX_URL) + val = fix_url_value(value); + } + + hres = set_nsstyle_property(style->nsstyle, sid, val ? val : value); + heap_free(val); + return hres; +} + static HRESULT set_style_property_var(HTMLStyle *style, styleid_t sid, VARIANT *value) { const WCHAR *val; @@ -593,12 +602,7 @@ static HRESULT set_style_property_var(HTMLStyle *style, styleid_t sid, VARIANT * if(FAILED(hres)) return hres; - return set_nsstyle_property(style->nsstyle, sid, val); -} - -static inline HRESULT set_style_property(HTMLStyle *style, styleid_t sid, const WCHAR *value) -{ - return set_nsstyle_property(style->nsstyle, sid, value); + return set_style_property(style, sid, val); } static HRESULT get_nsstyle_attr_nsval(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, nsAString *value)

1 0

Louis Lenders : kernel32: Add stub for GetApplicationRestartSettings.
by Alexandre Julliard Aug. 29, 2018

Aug. 29, 2018

Module: wine Branch: master Commit: ad8f45095777839156168e80ff1d8fba5cc265d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad8f45095777839156168e80… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Mon Aug 27 18:26:29 2018 +0200 kernel32: Add stub for GetApplicationRestartSettings. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-windowserrorreporting-l1-1-0.spec | 2 +- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/process.c | 10 +++++++++- dlls/kernelbase/kernelbase.spec | 2 +- include/winbase.h | 1 + 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-core-windowserrorreporting-l1-1-0/api-ms-win-core-windowserrorreporting-l1-1-0.spec b/dlls/api-ms-win-core-windowserrorreporting-l1-1-0/api-ms-win-core-windowserrorreporting-l1-1-0.spec index 96511a7..180ffed 100644 --- a/dlls/api-ms-win-core-windowserrorreporting-l1-1-0/api-ms-win-core-windowserrorreporting-l1-1-0.spec +++ b/dlls/api-ms-win-core-windowserrorreporting-l1-1-0/api-ms-win-core-windowserrorreporting-l1-1-0.spec @@ -1,5 +1,5 @@ @ stub GetApplicationRecoveryCallback -@ stub GetApplicationRestartSettings +@ stdcall GetApplicationRestartSettings(long ptr ptr ptr) kernel32.GetApplicationRestartSettings @ stdcall WerRegisterFile(wstr long long) kernel32.WerRegisterFile @ stdcall WerRegisterMemoryBlock(ptr long) kernel32.WerRegisterMemoryBlock @ stdcall WerRegisterRuntimeExceptionModule(wstr ptr) kernel32.WerRegisterRuntimeExceptionModule diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index c53276c..f1d75b8 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -543,7 +543,7 @@ @ stdcall GetActiveProcessorCount(long) @ stdcall GetActiveProcessorGroupCount() # @ stub GetApplicationRecoveryCallback -# @ stub GetApplicationRestartSettings +@ stdcall GetApplicationRestartSettings(long ptr ptr ptr) @ stdcall GetAtomNameA(long ptr long) @ stdcall GetAtomNameW(long ptr long) @ stdcall GetBinaryType(str ptr) GetBinaryTypeA diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index b12c37f..7ac7477 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -3937,7 +3937,6 @@ BOOL WINAPI CmdBatNotification( BOOL bBatchRunning ) return FALSE; } - /*********************************************************************** * RegisterApplicationRestart (KERNEL32.@) */ @@ -4007,6 +4006,15 @@ HRESULT WINAPI RegisterApplicationRecoveryCallback(APPLICATION_RECOVERY_CALLBACK return E_FAIL; } +/*********************************************************************** + * GetApplicationRestartSettings (KERNEL32.@) + */ +HRESULT WINAPI GetApplicationRestartSettings(HANDLE process, WCHAR *cmdline, DWORD *size, DWORD *flags) +{ + FIXME("%p, %p, %p, %p)\n", process, cmdline, size, flags); + return E_NOTIMPL; +} + /********************************************************************** * GetNumaHighestNodeNumber (KERNEL32.@) */ diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 5865ee7..89fad2c 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -414,7 +414,7 @@ # @ stub GetAppDataFolder # @ stub GetAppModelVersion # @ stub GetApplicationRecoveryCallback -# @ stub GetApplicationRestartSettings +@ stdcall GetApplicationRestartSettings(long ptr ptr ptr) kernel32.GetApplicationRestartSettings # @ stub GetApplicationUserModelId # @ stub GetApplicationUserModelIdFromToken # @ stub GetAppliedGPOListInternalA diff --git a/include/winbase.h b/include/winbase.h index aa57dae..8b26308 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2038,6 +2038,7 @@ WINBASEAPI BOOL WINAPI FreeResource(HGLOBAL); WINADVAPI PVOID WINAPI FreeSid(PSID); WINADVAPI BOOL WINAPI GetAce(PACL,DWORD,LPVOID*); WINADVAPI BOOL WINAPI GetAclInformation(PACL,LPVOID,DWORD,ACL_INFORMATION_CLASS); +WINBASEAPI HRESULT WINAPI GetApplicationRestartSettings(HANDLE,WCHAR*,DWORD*,DWORD*); WINBASEAPI UINT WINAPI GetAtomNameA(ATOM,LPSTR,INT); WINBASEAPI UINT WINAPI GetAtomNameW(ATOM,LPWSTR,INT); #define GetAtomName WINELIB_NAME_AW(GetAtomName)

1 0

Francois Gouget : testbot: Fix detection of new exceptions and too much data errors.
by Alexandre Julliard Aug. 29, 2018

Aug. 29, 2018

Module: tools Branch: master Commit: 2c997c0003c54cf2fcb9751fe843373648e60ddb URL: https://source.winehq.org/git/tools.git/?a=commit;h=2c997c0003c54cf2fcb9751… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Aug 26 10:17:54 2018 +0200 testbot: Fix detection of new exceptions and too much data errors. The address of the crashing code changes with each patch and should thus be ignored. The exact amount of data printed does not change the error. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 19a39aa..a9ab20b 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -756,6 +756,12 @@ sub _GetLineKey($) # Remove the line number $Line =~ s/^([_a-z0-9]+\.c:)\d+:( Test (?:failed|succeeded inside todo block): )/$1$2/; + # Remove the crash code address: it changes whenever the test is recompiled + $Line =~ s/^(Unhandled exception: .* code) $0x[0-9a-fA-F]{8,16}$\.$/$1/; + + # The exact amount of data printed does not change the error + $Line =~ s/^([_.a-z0-9-]+:[_a-z0-9]* prints too much data )$[0-9]+ bytes$$/$1/; + # Note: Only the 'done (258)' lines are reported as errors and they are # modified by GetLogErrors() so that they no longer contain the pid. # So there is no need to remove the pid from the done lines.

1 0

Francois Gouget : testbot/WineSendLog: Use LogUtils to identify (new) errors.
by Alexandre Julliard Aug. 29, 2018

Aug. 29, 2018

Module: tools Branch: master Commit: 49c5f27bb747c84999254d4b6b36a2b29a7b0d9e URL: https://source.winehq.org/git/tools.git/?a=commit;h=49c5f27bb747c84999254d4… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Aug 26 10:17:16 2018 +0200 testbot/WineSendLog: Use LogUtils to identify (new) errors. Added LogUtils::GetNewLogErrors() to identify new errors in test reports and their associated extra errors files. Note that unlike WineSendLog.pl's old CompareLogs() function GetNewLogErrors() can deal with reports containing the errors for multiple modules, which is a requirement for running the tests on Wine. WineSendLog.pl now uses LogUtils instead of duplicating the code. Besides reaping the benefits from the improved GetNewLogErrors() this also improves error detection and ensures it is consistent with JobDetails.pl. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineSendLog.pl | 380 ++++++++---------------------------- testbot/lib/WineTestBot/LogUtils.pm | 106 +++++++++- 2 files changed, 183 insertions(+), 303 deletions(-) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=49c5f27bb747c849992…

1 0