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

Alex Henrie : shell32: Add remaining folder icons.
by Alexandre Julliard 29 Aug '18

29 Aug '18

Module: wine Branch: master Commit: 5e53fb4bdf2d90b3ce276ca817f5383a76c75449 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e53fb4bdf2d90b3ce276ca8… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 28 23:47:34 2018 -0600 shell32: Add remaining folder icons. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 36 ++++++++++++++++++++++++++++++++++++ dlls/shell32/shresdef.h | 10 ++++++++++ 2 files changed, 46 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 0e595cb..5ff23f9 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -786,12 +786,28 @@ IDI_SHELL_NETWORK_FAX ICON resources/printer.ico IDI_SHELL_RESTRICTED ICON resources/restricted.ico /* FIXME: Following resource is not yet added */ +/* @makedep: resources/folder.ico */ +IDI_SHELL_DEFAULT_FOLDER ICON resources/folder.ico + +/* FIXME: Following resource is not yet added */ /* @makedep: resources/security.ico */ IDI_SHELL_USERS ICON resources/security.ico /* @makedep: resources/mydocs.ico */ IDI_SHELL_MY_DOCUMENTS ICON resources/mydocs.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/mydocs.ico */ +IDI_SHELL_MY_PICTURES ICON resources/mydocs.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/mydocs.ico */ +IDI_SHELL_MY_MUSIC ICON resources/mydocs.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/mydocs.ico */ +IDI_SHELL_MY_VIDEOS ICON resources/mydocs.ico + /* @makedep: resources/rename.ico */ IDI_SHELL_RENAME ICON resources/rename.ico @@ -802,6 +818,18 @@ IDI_SHELL_COPY ICON resources/copy.ico IDI_SHELL_EMPTY_RECYCLE_BIN2 ICON resources/trash_file.ico /* FIXME: Following resource is not yet added */ +/* @makedep: resources/folder.ico */ +IDI_SHELL_NEW_NETWORK_FOLDER ICON resources/folder.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/folder.ico */ +IDI_SHELL_TO_FOLDER ICON resources/folder.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/folder.ico */ +IDI_SHELL_SHARED_FOLDER ICON resources/folder.ico + +/* FIXME: Following resource is not yet added */ /* @makedep: resources/security.ico */ IDI_SHELL_USERS_XP ICON resources/security.ico @@ -812,9 +840,17 @@ IDI_SHELL_USERS_XP2 ICON resources/security.ico /* @makedep: resources/optical_disc.ico */ IDI_SHELL_OPTICAL_DISC ICON resources/optical_disc.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/folder.ico */ +IDI_SHELL_NEW_FOLDER ICON resources/folder.ico + /* @makedep: resources/favorites.ico */ IDI_SHELL_FAVORITES_SMALL ICON resources/favorites.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/folder.ico */ +IDI_SHELL_APP_FOLDER_SMALL ICON resources/folder.ico + /* @makedep: resources/restricted.ico */ IDI_SHELL_RESTRICTED2 ICON resources/restricted.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 73b46fd..33f28cf 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -286,16 +286,26 @@ #define IDI_SHELL_DEFAULT_NETWORK_FAX 198 #define IDI_SHELL_NETWORK_FAX 199 #define IDI_SHELL_RESTRICTED 200 +/* 201 - 209 not used on Windows */ +#define IDI_SHELL_DEFAULT_FOLDER 210 /* 211 - 219 not used on Windows */ #define IDI_SHELL_USERS 220 #define IDI_SHELL_MY_DOCUMENTS 235 +#define IDI_SHELL_MY_PICTURES 236 +#define IDI_SHELL_MY_MUSIC 237 +#define IDI_SHELL_MY_VIDEOS 238 #define IDI_SHELL_RENAME 242 #define IDI_SHELL_COPY 243 #define IDI_SHELL_EMPTY_RECYCLE_BIN2 254 +#define IDI_SHELL_NEW_NETWORK_FOLDER 258 +#define IDI_SHELL_TO_FOLDER 264 +#define IDI_SHELL_SHARED_FOLDER 267 #define IDI_SHELL_USERS_XP 269 #define IDI_SHELL_USERS_XP2 279 #define IDI_SHELL_OPTICAL_DISC 302 +#define IDI_SHELL_NEW_FOLDER 319 #define IDI_SHELL_FAVORITES_SMALL 322 +#define IDI_SHELL_APP_FOLDER_SMALL 326 #define IDI_SHELL_RESTRICTED2 338 /*

1 0

Alex Henrie : shell32: Add "power off" icon.
by Alexandre Julliard 29 Aug '18

29 Aug '18

Module: wine Branch: master Commit: 9954c08dc8dc1783098a48e1188e08a8018c6092 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9954c08dc8dc1783098a48e1… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 28 23:47:35 2018 -0600 shell32: Add "power off" 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 5ff23f9..c04a37f 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -793,6 +793,9 @@ IDI_SHELL_DEFAULT_FOLDER ICON resources/folder.ico /* @makedep: resources/security.ico */ IDI_SHELL_USERS ICON resources/security.ico +/* @makedep: resources/shut_down.ico */ +IDI_SHELL_POWER_OFF ICON resources/shut_down.ico + /* @makedep: resources/mydocs.ico */ IDI_SHELL_MY_DOCUMENTS ICON resources/mydocs.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 33f28cf..61fb1e1 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -290,6 +290,7 @@ #define IDI_SHELL_DEFAULT_FOLDER 210 /* 211 - 219 not used on Windows */ #define IDI_SHELL_USERS 220 +#define IDI_SHELL_POWER_OFF 221 #define IDI_SHELL_MY_DOCUMENTS 235 #define IDI_SHELL_MY_PICTURES 236 #define IDI_SHELL_MY_MUSIC 237

1 0

Alex Henrie : shell32: Rename icon 12 from "cdrom" to "optical drive".
by Alexandre Julliard 29 Aug '18

29 Aug '18

Module: wine Branch: master Commit: f1f9b81e29fd8a23450fab9d95d5114af51e9118 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1f9b81e29fd8a23450fab9d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 28 23:47:36 2018 -0600 shell32: Rename icon 12 from "cdrom" to "optical drive". Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/Makefile.in | 2 +- dlls/shell32/folders.c | 2 +- dlls/shell32/resources/{cdrom.ico => optical_drive.ico} | Bin dlls/shell32/resources/{cdrom.svg => optical_drive.svg} | 0 dlls/shell32/shell32.rc | 4 ++-- dlls/shell32/shresdef.h | 2 +- 6 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in index 7411def..74a3c13 100644 --- a/dlls/shell32/Makefile.in +++ b/dlls/shell32/Makefile.in @@ -63,7 +63,6 @@ IDL_SRCS = \ SVG_SRCS = \ resources/blank.svg \ - resources/cdrom.svg \ resources/control.svg \ resources/copy.svg \ resources/delete.svg \ @@ -85,6 +84,7 @@ SVG_SRCS = \ resources/netdrive2.svg \ resources/network.svg \ resources/optical_disc.svg \ + resources/optical_drive.svg \ resources/printer.svg \ resources/ramdisk.svg \ resources/recent.svg \ diff --git a/dlls/shell32/folders.c b/dlls/shell32/folders.c index c18369f..5bb1a33 100644 --- a/dlls/shell32/folders.c +++ b/dlls/shell32/folders.c @@ -255,7 +255,7 @@ static HRESULT WINAPI IExtractIconW_fnGetIconLocation(IExtractIconW * iface, UIN switch(GetDriveTypeA(sTemp)) { case DRIVE_REMOVABLE: icon_idx = IDI_SHELL_FLOPPY; break; - case DRIVE_CDROM: icon_idx = IDI_SHELL_CDROM; break; + case DRIVE_CDROM: icon_idx = IDI_SHELL_OPTICAL_DRIVE; break; case DRIVE_REMOTE: icon_idx = IDI_SHELL_NETDRIVE; break; case DRIVE_RAMDISK: icon_idx = IDI_SHELL_RAMDISK; break; } diff --git a/dlls/shell32/resources/cdrom.ico b/dlls/shell32/resources/optical_drive.ico similarity index 100% rename from dlls/shell32/resources/cdrom.ico rename to dlls/shell32/resources/optical_drive.ico diff --git a/dlls/shell32/resources/cdrom.svg b/dlls/shell32/resources/optical_drive.svg similarity index 100% rename from dlls/shell32/resources/cdrom.svg rename to dlls/shell32/resources/optical_drive.svg diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index c04a37f..0b0c54a 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -462,8 +462,8 @@ IDI_SHELL_NETDRIVE ICON resources/netdrive.ico /* @makedep: resources/netdrive2.ico */ IDI_SHELL_NETDRIVE2 ICON resources/netdrive2.ico -/* @makedep: resources/cdrom.ico */ -IDI_SHELL_CDROM ICON resources/cdrom.ico +/* @makedep: resources/optical_drive.ico */ +IDI_SHELL_OPTICAL_DRIVE ICON resources/optical_drive.ico /* @makedep: resources/ramdisk.ico */ IDI_SHELL_RAMDISK ICON resources/ramdisk.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 61fb1e1..c529bdf 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -180,7 +180,7 @@ #define IDI_SHELL_DRIVE 9 #define IDI_SHELL_NETDRIVE 10 #define IDI_SHELL_NETDRIVE2 11 -#define IDI_SHELL_CDROM 12 +#define IDI_SHELL_OPTICAL_DRIVE 12 #define IDI_SHELL_RAMDISK 13 #define IDI_SHELL_ENTIRE_NETWORK 14 #define IDI_SHELL_NETWORK 15

1 0

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

29 Aug '18

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

Louis Lenders : kernel32: Add stub for GetApplicationRestartSettings.
by Alexandre Julliard 29 Aug '18

29 Aug '18

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

Guillaume Charifi : iphlpapi: Implement GetUdp6Table().
by Alexandre Julliard 29 Aug '18

29 Aug '18

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 29 Aug '18

29 Aug '18

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

Jacek Caban : mshtml: Move value fixups to set_style_property.
by Alexandre Julliard 29 Aug '18

29 Aug '18

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

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

29 Aug '18

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

Francois Gouget : testbot: Add a note regarding the detection of new errors.
by Alexandre Julliard 29 Aug '18

29 Aug '18

Module: tools Branch: master Commit: bcf229e0da4356a86bd49301125a5ae7eac07173 URL: https://source.winehq.org/git/tools.git/?a=commit;h=bcf229e0da4356a86bd4930… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Aug 26 10:17:47 2018 +0200 testbot: Add a note regarding the detection of new errors. The detection of new errors may be based on a WineTest report which is not up-to-date. However this should not be a real issue in practice. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineSendLog.pl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index f3b56d8..b0efa8c 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -266,6 +266,12 @@ EOF # Build a job summary with only the new errors # + # Note that this may be a bit inaccurate right after a Wine commit if this + # job's patch got compiled on top of the new Wine before all the reference + # WineTest results were updated. This is made more likely by the job + # priorities: high for Wine updates, and low for WineTest runs. + # However in practice this would only be an issue if the patch reintroduced + # an error that just disappeared in the latest Wine which is highly unlikely. my @Messages; foreach my $Key (@SortedKeys) {

1 0