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

Alex Henrie : shell32: Add "add printer" icon.
by Alexandre Julliard Aug. 27, 2018

Aug. 27, 2018

Module: wine Branch: master Commit: 9fef0a3f9db4df959bcba7b76a93976bf2988325 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9fef0a3f9db4df959bcba7b7… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Aug 26 22:21:01 2018 -0600 shell32: Add "add printer" 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 12517aa..ac52070 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -607,6 +607,10 @@ IDI_SHELL_OPTIONS ICON resources/control.ico /* @makedep: resources/folder.ico */ IDI_SHELL_PRINTERS_FOLDER_XP ICON resources/folder.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/printer.ico */ +IDI_SHELL_ADD_PRINTER ICON resources/printer.ico + /* @makedep: resources/trash_file.ico */ IDI_SHELL_TRASH_FILE ICON resources/trash_file.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 2da5211..bf1d52c 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -230,6 +230,7 @@ /* 136 not used on Windows */ #define IDI_SHELL_OPTIONS 137 #define IDI_SHELL_PRINTERS_FOLDER_XP 138 +#define IDI_SHELL_ADD_PRINTER 139 #define IDI_SHELL_REMOTE_PRINTER 140 #define IDI_SHELL_TO_FILE_PRINTER 141 #define IDI_SHELL_TRASH_FILE 142

1 0

Alistair Leslie-Hughes : include: Add sal.h.
by Alexandre Julliard Aug. 27, 2018

Aug. 27, 2018

Module: wine Branch: master Commit: 3178d059c69f5416f962a40cd304ae392a06b09b URL: https://source.winehq.org/git/wine.git/?a=commit;h=3178d059c69f5416f962a40c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Aug 27 01:38:41 2018 +0000 include: Add sal.h. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/sal.h | 94 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 95 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index fec158d..a89fef6 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -549,6 +549,7 @@ SOURCES = \ rstloc.idl \ rstnot.idl \ rtutils.h \ + sal.h \ sapi.idl \ sapiddk.idl \ scarderr.h \ diff --git a/include/sal.h b/include/sal.h new file mode 100644 index 0000000..6eb0a6c --- /dev/null +++ b/include/sal.h @@ -0,0 +1,94 @@ +/* + * Copyright (C) 2018 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_SAL_H__ +#define __WINE_SAL_H__ + +#define _Check_return_ + +#define _Deref_out_ +#define _Deref_out_opt_ +#define _Deref_out_opt_z_ +#define _Deref_post_opt_cap_(count) +#define _Deref_post_opt_valid_ + +#define _In_ +#define _In_bytecount_(count) +#define _In_count_(count) +#define _In_opt_ +#define _In_opt_count_(count) +#define _In_opt_z_ +#define _In_reads_(count) +#define _In_reads_bytes_(count) +#define _In_reads_opt_z_(count) +#define _In_reads_z_(count) +#define _In_z_ + +#define _Inout_ +#define _Inout_cap_(count) +#define _Inout_opt_ +#define _Inout_updates_z_(count) +#define _Inout_z_ +#define _Inout_z_bytecap_(count) +#define _Inout_z_cap_(count) +#define _Inout_z_cap_c_(count) + +#define _Null_terminated_ + +#define _Out_ +#define _Out_bytecap_(count) +#define _Out_bytecapcount_(count) +#define _Out_bytecap_post_bytecount_(count1, count2) +#define _Out_cap_(count) +#define _Out_cap_post_count_(count1, count2) +#define _Out_opt_ +#define _Out_opt_z_cap_(count) +#define _Out_opt_z_cap_post_count_(count1, count2) +#define _Out_writes_(count) +#define _Out_writes_bytes_to_(count1, count2) +#define _Out_writes_opt_(count) +#define _Out_writes_opt_z_(count) +#define _Out_writes_to_(count1, count2) +#define _Out_writes_z_(count) +#define _Out_z_cap_(count) +#define _Out_z_cap_c_(count) +#define _Out_z_cap_post_count_(count1, count2) + +#define _Outptr_result_buffer_(count) +#define _Outptr_result_maybenull_z_ + +#define _Post_invalid_ +#define _Post_writable_byte_size_(count) +#define _Post_z_ + +#define _Pre_maybenull_ +#define _Pre_notnull_ +#define _Pre_writable_size_(count) + +#define _Printf_format_string_ + +#define _Ret_maybenull_ +#define _Ret_maybenull_z_ +#define _Ret_opt_ +#define _Ret_opt_z_cap_(count) +#define _Ret_writes_bytes_maybenull_(count) +#define _Ret_z_ + +#define _Success_(exp) + +#endif

1 0

Alex Henrie : shell32: Add system search icon.
by Alexandre Julliard Aug. 27, 2018

Aug. 27, 2018

Module: wine Branch: master Commit: 4daea1d7effef2c358630b30b6e00a359a17d9e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4daea1d7effef2c358630b30… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Aug 26 22:20:58 2018 -0600 shell32: Add system search 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 811ca36..ea7d618 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -596,6 +596,10 @@ IDI_SHELL_FILES ICON resources/document.ico /* @makedep: resources/search.ico */ IDI_SHELL_FILE_SEARCH ICON resources/search.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/search.ico */ +IDI_SHELL_SYSTEM_SEARCH ICON resources/search.ico + /* @makedep: resources/trash_file.ico */ IDI_SHELL_TRASH_FILE ICON resources/trash_file.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 9df9ed6..e894fb1 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -226,6 +226,7 @@ /* 55 - 132 not used on Windows */ #define IDI_SHELL_FILES 133 #define IDI_SHELL_FILE_SEARCH 134 +#define IDI_SHELL_SYSTEM_SEARCH 135 #define IDI_SHELL_REMOTE_PRINTER 140 #define IDI_SHELL_TO_FILE_PRINTER 141 #define IDI_SHELL_TRASH_FILE 142

1 0

Alex Henrie : shell32: Add shutdown confirmation icon.
by Alexandre Julliard Aug. 27, 2018

Aug. 27, 2018

Module: wine Branch: master Commit: b8bc0a3d0d0a65c50e718411f02e92f051c67517 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8bc0a3d0d0a65c50e718411… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Aug 26 22:20:53 2018 -0600 shell32: Add shutdown confirmation 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 66698e1..8ef0e1b 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -569,6 +569,9 @@ IDI_SHELL_UPDATE ICON resources/update.ico /* @makedep: resources/lock.ico */ IDI_SHELL_RIGHTS ICON resources/lock.ico +/* @makedep: resources/shut_down.ico */ +IDI_SHELL_CONFIRM_SHUTDOWN ICON resources/shut_down.ico + /* @makedep: resources/trash_file.ico */ IDI_SHELL_TRASH_FILE ICON resources/trash_file.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 960c974..fddf420 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -217,6 +217,7 @@ #define IDI_SHELL_SEARCH_FOLDER 46 #define IDI_SHELL_UPDATE 47 #define IDI_SHELL_RIGHTS 48 +#define IDI_SHELL_CONFIRM_SHUTDOWN 49 #define IDI_SHELL_REMOTE_PRINTER 140 #define IDI_SHELL_TO_FILE_PRINTER 141 #define IDI_SHELL_TRASH_FILE 142

1 0

Alex Henrie : shell32: Add unknown drive icon.
by Alexandre Julliard Aug. 27, 2018

Aug. 27, 2018

Module: wine Branch: master Commit: ef5ad6a6e75eb7cea6eb99ded8b2c0efadf24fc5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef5ad6a6e75eb7cea6eb99de… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Aug 26 22:20:55 2018 -0600 shell32: Add unknown drive 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 8889fcf..431492a 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -584,6 +584,10 @@ IDI_SHELL_BLANK3 ICON resources/blank.ico /* @makedep: resources/blank.ico */ IDI_SHELL_BLANK4 ICON resources/blank.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/drive.ico */ +IDI_SHELL_UNKNOWN_DRIVE ICON resources/drive.ico + /* @makedep: resources/trash_file.ico */ IDI_SHELL_TRASH_FILE ICON resources/trash_file.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index cbbdd71..446eee8 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -222,6 +222,7 @@ #define IDI_SHELL_BLANK2 51 #define IDI_SHELL_BLANK3 52 #define IDI_SHELL_BLANK4 53 +#define IDI_SHELL_UNKNOWN_DRIVE 54 #define IDI_SHELL_REMOTE_PRINTER 140 #define IDI_SHELL_TO_FILE_PRINTER 141 #define IDI_SHELL_TRASH_FILE 142

1 0

Alex Henrie : shell32: Add XP printer folder icon.
by Alexandre Julliard Aug. 27, 2018

Aug. 27, 2018

Module: wine Branch: master Commit: bee0d3af678d198051249c819b7d33d9bceda7f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bee0d3af678d198051249c81… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Aug 26 22:21:00 2018 -0600 shell32: Add XP printer folder 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 8b9fb10..12517aa 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -603,6 +603,10 @@ IDI_SHELL_SYSTEM_SEARCH ICON resources/search.ico /* @makedep: resources/control.ico */ IDI_SHELL_OPTIONS ICON resources/control.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/folder.ico */ +IDI_SHELL_PRINTERS_FOLDER_XP ICON resources/folder.ico + /* @makedep: resources/trash_file.ico */ IDI_SHELL_TRASH_FILE ICON resources/trash_file.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 2eda7cf..2da5211 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -229,6 +229,7 @@ #define IDI_SHELL_SYSTEM_SEARCH 135 /* 136 not used on Windows */ #define IDI_SHELL_OPTIONS 137 +#define IDI_SHELL_PRINTERS_FOLDER_XP 138 #define IDI_SHELL_REMOTE_PRINTER 140 #define IDI_SHELL_TO_FILE_PRINTER 141 #define IDI_SHELL_TRASH_FILE 142

1 0

Alex Henrie : shell32: Add files icon.
by Alexandre Julliard Aug. 27, 2018

Aug. 27, 2018

Module: wine Branch: master Commit: c47178a50dae235717c6fbcde2f5898d2aa5c2f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c47178a50dae235717c6fbcd… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Aug 26 22:20:56 2018 -0600 shell32: Add files 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 | 2 ++ 2 files changed, 6 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 431492a..87a6582 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -588,6 +588,10 @@ IDI_SHELL_BLANK4 ICON resources/blank.ico /* @makedep: resources/drive.ico */ IDI_SHELL_UNKNOWN_DRIVE ICON resources/drive.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/document.ico */ +IDI_SHELL_FILES ICON resources/document.ico + /* @makedep: resources/trash_file.ico */ IDI_SHELL_TRASH_FILE ICON resources/trash_file.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 446eee8..5649c6b 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -223,6 +223,8 @@ #define IDI_SHELL_BLANK3 52 #define IDI_SHELL_BLANK4 53 #define IDI_SHELL_UNKNOWN_DRIVE 54 +/* 55 - 132 not used on Windows */ +#define IDI_SHELL_FILES 133 #define IDI_SHELL_REMOTE_PRINTER 140 #define IDI_SHELL_TO_FILE_PRINTER 141 #define IDI_SHELL_TRASH_FILE 142

1 0

Alex Henrie : shell32: Add remote printer icon.
by Alexandre Julliard Aug. 27, 2018

Aug. 27, 2018

Module: wine Branch: master Commit: 8c250c618fadd8b3ce2347f5058da1122e4b85ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c250c618fadd8b3ce2347f5… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Aug 26 22:21:02 2018 -0600 shell32: Add remote printer icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index ac52070..689534d 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -611,6 +611,10 @@ IDI_SHELL_PRINTERS_FOLDER_XP ICON resources/folder.ico /* @makedep: resources/printer.ico */ IDI_SHELL_ADD_PRINTER ICON resources/printer.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/printer.ico */ +IDI_SHELL_REMOTE_PRINTER ICON resources/printer.ico + /* @makedep: resources/trash_file.ico */ IDI_SHELL_TRASH_FILE ICON resources/trash_file.ico

1 0

Alex Henrie : shell32: Add options icon.
by Alexandre Julliard Aug. 27, 2018

Aug. 27, 2018

Module: wine Branch: master Commit: 9fb7f21b61b2f384f37040ad308d6b1bd00563a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9fb7f21b61b2f384f37040ad… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Aug 26 22:20:59 2018 -0600 shell32: Add options 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 | 2 ++ 2 files changed, 5 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index ea7d618..8b9fb10 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -600,6 +600,9 @@ IDI_SHELL_FILE_SEARCH ICON resources/search.ico /* @makedep: resources/search.ico */ IDI_SHELL_SYSTEM_SEARCH ICON resources/search.ico +/* @makedep: resources/control.ico */ +IDI_SHELL_OPTIONS ICON resources/control.ico + /* @makedep: resources/trash_file.ico */ IDI_SHELL_TRASH_FILE ICON resources/trash_file.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index e894fb1..2eda7cf 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -227,6 +227,8 @@ #define IDI_SHELL_FILES 133 #define IDI_SHELL_FILE_SEARCH 134 #define IDI_SHELL_SYSTEM_SEARCH 135 +/* 136 not used on Windows */ +#define IDI_SHELL_OPTIONS 137 #define IDI_SHELL_REMOTE_PRINTER 140 #define IDI_SHELL_TO_FILE_PRINTER 141 #define IDI_SHELL_TRASH_FILE 142

1 0

Alistair Leslie-Hughes : dpnet: Implement IDirectPlay8Peer SetSPCaps.
by Alexandre Julliard Aug. 27, 2018

Aug. 27, 2018

Module: wine Branch: master Commit: 069897ad9f5ffd17c3241b2c0cc921cf2217b639 URL: https://source.winehq.org/git/wine.git/?a=commit;h=069897ad9f5ffd17c3241b2c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Aug 27 01:26:09 2018 +0000 dpnet: Implement IDirectPlay8Peer SetSPCaps. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpnet/peer.c | 12 ++++++++++-- dlls/dpnet/tests/client.c | 25 +++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/dpnet/peer.c b/dlls/dpnet/peer.c index e8a60c3..3e3cd9b 100644 --- a/dlls/dpnet/peer.c +++ b/dlls/dpnet/peer.c @@ -526,9 +526,17 @@ static HRESULT WINAPI IDirectPlay8PeerImpl_SetCaps(IDirectPlay8Peer *iface, cons static HRESULT WINAPI IDirectPlay8PeerImpl_SetSPCaps(IDirectPlay8Peer *iface, const GUID * const pguidSP, const DPN_SP_CAPS * const pdpspCaps, const DWORD dwFlags ) { - FIXME("(%p)->(%p,%p,%x): stub\n", iface, pguidSP, pdpspCaps, dwFlags); + IDirectPlay8PeerImpl* This = impl_from_IDirectPlay8Peer(iface); - return DPNERR_GENERIC; + TRACE("(%p)->(%p,%p,%x): stub\n", iface, pguidSP, pdpspCaps, dwFlags); + + if(!This->msghandler || pdpspCaps->dwSize != sizeof(DPN_SP_CAPS)) + return DPNERR_INVALIDPARAM; + + /* Only dwSystemBufferSize is set by this call. */ + This->spcaps.dwSystemBufferSize = pdpspCaps->dwSystemBufferSize; + + return DPN_OK; } static HRESULT WINAPI IDirectPlay8PeerImpl_GetSPCaps(IDirectPlay8Peer *iface, const GUID * const pguidSP, diff --git a/dlls/dpnet/tests/client.c b/dlls/dpnet/tests/client.c index 431203b..47d8b01 100644 --- a/dlls/dpnet/tests/client.c +++ b/dlls/dpnet/tests/client.c @@ -561,6 +561,9 @@ static void test_init_dp_peer(void) memset(&caps, 0, sizeof(DPN_SP_CAPS)); caps.dwSize = sizeof(DPN_SP_CAPS); + hr = IDirectPlay8Peer_SetSPCaps(peer, &CLSID_DP8SP_TCPIP, &caps, 0); + ok(hr == DPNERR_INVALIDPARAM, "SetSPCaps failed with %x\n", hr); + hr = IDirectPlay8Peer_GetSPCaps(peer, &CLSID_DP8SP_TCPIP, &caps, 0); ok(hr == DPNERR_UNINITIALIZED, "GetSPCaps failed with %x\n", hr); @@ -815,6 +818,28 @@ static void test_get_sp_caps_peer(void) ok(caps.dwBuffersPerThread == 1, "expected 1, got %d\n", caps.dwBuffersPerThread); ok(caps.dwSystemBufferSize == 0x10000 || broken(caps.dwSystemBufferSize == 0x2000 /* before Win8 */), "expected 0x10000, got 0x%x\n", caps.dwSystemBufferSize); + + caps.dwNumThreads = 2; + caps.dwDefaultEnumCount = 3; + caps.dwDefaultEnumRetryInterval = 1400; + caps.dwDefaultEnumTimeout = 1400; + caps.dwMaxEnumPayloadSize = 900; + caps.dwBuffersPerThread = 2; + caps.dwSystemBufferSize = 0x0ffff; + hr = IDirectPlay8Peer_SetSPCaps(peer, &CLSID_DP8SP_TCPIP, &caps, 0); + ok(hr == DPN_OK, "SetSPCaps failed with %x\n", hr); + + hr = IDirectPlay8Peer_GetSPCaps(peer, &CLSID_DP8SP_TCPIP, &caps, 0); + ok(hr == DPN_OK, "GetSPCaps failed with %x\n", hr); + + ok(caps.dwSize == sizeof(DPN_SP_CAPS), "got %d\n", caps.dwSize); + ok(caps.dwNumThreads >= 3, "got %d\n", caps.dwNumThreads); + ok(caps.dwDefaultEnumCount == 5, "expected 5, got %d\n", caps.dwDefaultEnumCount); + ok(caps.dwDefaultEnumRetryInterval == 1500, "expected 1500, got %d\n", caps.dwDefaultEnumRetryInterval); + ok(caps.dwDefaultEnumTimeout == 1500, "expected 1500, got %d\n", caps.dwDefaultEnumTimeout); + ok(caps.dwMaxEnumPayloadSize == 983, "expected 983, got %d\n", caps.dwMaxEnumPayloadSize); + ok(caps.dwBuffersPerThread == 1, "expected 1, got %d\n", caps.dwBuffersPerThread); + ok(caps.dwSystemBufferSize == 0x0ffff, "expected 0x0ffff, got 0x%x\n", caps.dwSystemBufferSize); } static void test_player_info_peer(void)

1 0