wine-commits August 2018

wine-commits@winehq.org

2 participants
618 discussions

Alex Henrie : shell32: Add shutdown confirmation icon.
by Alexandre Julliard 27 Aug '18

27 Aug '18

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 rights icon.
by Alexandre Julliard 27 Aug '18

27 Aug '18

Module: wine Branch: master Commit: 5f82532b218c9b25064d65f389e674668dbd361c URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f82532b218c9b25064d65f3… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Aug 26 22:20:52 2018 -0600 shell32: Add rights icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/Makefile.in | 1 + dlls/shell32/resources/lock.ico | Bin 0 -> 32810 bytes dlls/shell32/resources/lock.svg | 532 ++++++++++++++++++++++++++++++++++++++++ dlls/shell32/shell32.rc | 3 + dlls/shell32/shresdef.h | 1 + 5 files changed, 537 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5f82532b218c9b25064d…

1 0

Alex Henrie : shell32: Add update icon.
by Alexandre Julliard 27 Aug '18

27 Aug '18

Module: wine Branch: master Commit: 661457821bb793b8ff3dc5b99f38fd92147e8c61 URL: https://source.winehq.org/git/wine.git/?a=commit;h=661457821bb793b8ff3dc5b9… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Aug 26 22:20:51 2018 -0600 shell32: Add update icon. Adapted from software-update-available in the Tango Icon Library. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/Makefile.in | 1 + dlls/shell32/resources/update.ico | Bin 0 -> 47370 bytes dlls/shell32/resources/update.svg | 583 ++++++++++++++++++++++++++++++++++++++ dlls/shell32/shell32.rc | 3 + dlls/shell32/shresdef.h | 1 + 5 files changed, 588 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=661457821bb793b8ff3d…

1 0

Alex Henrie : shell32: Add folder search icon.
by Alexandre Julliard 27 Aug '18

27 Aug '18

Module: wine Branch: master Commit: 15c0612914f50d38f8d6f9fb3cd8c2e66d811541 URL: https://source.winehq.org/git/wine.git/?a=commit;h=15c0612914f50d38f8d6f9fb… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Aug 26 22:20:50 2018 -0600 shell32: Add folder search icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/resources/search.ico | Bin 78155 -> 78154 bytes dlls/shell32/shell32.rc | 4 ++++ dlls/shell32/shresdef.h | 1 + 3 files changed, 5 insertions(+) diff --git a/dlls/shell32/resources/search.ico b/dlls/shell32/resources/search.ico index 8697c8a..ca73425 100644 Binary files a/dlls/shell32/resources/search.ico and b/dlls/shell32/resources/search.ico differ diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index fb6b627..f203122 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -559,6 +559,10 @@ IDI_SHELL_FAVORITES ICON resources/favorites.ico /* @makedep: resources/log_off.ico */ IDI_SHELL_LOG_OFF ICON resources/log_off.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/search.ico */ +IDI_SHELL_SEARCH_FOLDER 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 d0e08ba..c5c7df0 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -214,6 +214,7 @@ #define IDI_SHELL_REMOTE_FOLDER 43 #define IDI_SHELL_FAVORITES 44 #define IDI_SHELL_LOG_OFF 45 +#define IDI_SHELL_SEARCH_FOLDER 46 #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 logoff icon.
by Alexandre Julliard 27 Aug '18

27 Aug '18

Module: wine Branch: master Commit: 856e68e131275b7ff61f365483c2dbf9f3dd789b URL: https://source.winehq.org/git/wine.git/?a=commit;h=856e68e131275b7ff61f3654… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Aug 26 22:20:49 2018 -0600 shell32: Add logoff icon. Adapted from system-log-out in the Tango Icon Library. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/Makefile.in | 1 + dlls/shell32/resources/log_off.ico | Bin 0 -> 48648 bytes dlls/shell32/resources/log_off.svg | 875 +++++++++++++++++++++++++++++++++++++ dlls/shell32/shell32.rc | 3 + dlls/shell32/shresdef.h | 1 + 5 files changed, 880 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=856e68e131275b7ff61f…

1 0

Alex Henrie : shell32: Add favorites icon.
by Alexandre Julliard 27 Aug '18

27 Aug '18

Module: wine Branch: master Commit: 27b74b5a2c04acaf3b7e991c022e4626c057088b URL: https://source.winehq.org/git/wine.git/?a=commit;h=27b74b5a2c04acaf3b7e991c… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Aug 26 22:20:48 2018 -0600 shell32: Add favorites icon. Adapted from emblem-favorite in the Tango Icon Library. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/Makefile.in | 1 + dlls/shell32/resources/favorites.ico | Bin 0 -> 49876 bytes dlls/shell32/resources/favorites.svg | 548 +++++++++++++++++++++++++++++++++++ dlls/shell32/shell32.rc | 11 +- dlls/shell32/shresdef.h | 4 +- 5 files changed, 560 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=27b74b5a2c04acaf3b7e…

1 0

Fabian Maurer : comctl32/tests: Add a test for base class names.
by Alexandre Julliard 27 Aug '18

27 Aug '18

Module: wine Branch: master Commit: 48e8e579bc2b699847b9e3edcd830568662c901a URL: https://source.winehq.org/git/wine.git/?a=commit;h=48e8e579bc2b699847b9e3ed… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Mon Aug 27 09:14:12 2018 +0300 comctl32/tests: Add a test for base class names. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/misc.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index eca85d4..85f339b 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -345,6 +345,9 @@ static void check_class( const char *name, int must_exist, UINT style, UINT igno if (GetClassInfoA( 0, name, &wc )) { + char buff[64]; + HWND hwnd; + todo_wine_if(strcmp(name, "Button") && strcmp(name, "ComboBox") && strcmp(name, "Edit") && @@ -356,6 +359,12 @@ todo_wine_if(strcmp(name, "Button") && ok( !(wc.style & ~style), "System class %s has extra bits %x (%08x/%08x)\n", name, wc.style & ~style, wc.style, style ); ok( !wc.hInstance, "System class %s has hInstance %p\n", name, wc.hInstance ); + + hwnd = CreateWindowA(name, 0, 0, 0, 0, 0, 0, 0, NULL, GetModuleHandleA(NULL), 0); + ok( hwnd != NULL, "Failed to create window for class %s.\n", name ); + GetClassNameA(hwnd, buff, ARRAY_SIZE(buff)); + ok( !strcmp(name, buff), "Unexpected class name %s, expected %s.\n", buff, name ); + DestroyWindow(hwnd); } else ok( !must_exist, "System class %s does not exist\n", name );

1 0

Nikolay Sivov : user32: When registering redirected class use correct base class name.
by Alexandre Julliard 27 Aug '18

27 Aug '18

Module: wine Branch: master Commit: 78236592df22e152c6be3b43871a3e1faeb41df0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=78236592df22e152c6be3b43… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 27 09:14:11 2018 +0300 user32: When registering redirected class use correct base class name. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45689 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/class.c | 31 +++++++++++++++++++++---------- dlls/user32/user_private.h | 2 +- dlls/user32/win.c | 2 +- 3 files changed, 23 insertions(+), 12 deletions(-) diff --git a/dlls/user32/class.c b/dlls/user32/class.c index 07d36f0..5383b67 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -320,7 +320,7 @@ static void CLASS_FreeClass( CLASS *classPtr ) USER_Unlock(); } -const WCHAR *CLASS_GetVersionedName( const WCHAR *name, UINT *basename_offset, BOOL register_class ) +const WCHAR *CLASS_GetVersionedName( const WCHAR *name, UINT *basename_offset, WCHAR *combined, BOOL register_class ) { ACTCTX_SECTION_KEYED_DATA data; struct wndclass_redirect_data @@ -335,9 +335,12 @@ const WCHAR *CLASS_GetVersionedName( const WCHAR *name, UINT *basename_offset, B const WCHAR *module, *ret; UNICODE_STRING name_us; HMODULE hmod; + UINT offset; - if (basename_offset) - *basename_offset = 0; + if (!basename_offset) + basename_offset = &offset; + + *basename_offset = 0; if (IS_INTRESOURCE( name )) return name; @@ -352,14 +355,21 @@ const WCHAR *CLASS_GetVersionedName( const WCHAR *name, UINT *basename_offset, B return name; wndclass = (struct wndclass_redirect_data *)data.lpData; - if (basename_offset) - *basename_offset = wndclass->name_len / sizeof(WCHAR) - strlenW(name); + *basename_offset = wndclass->name_len / sizeof(WCHAR) - strlenW(name); module = (const WCHAR *)((BYTE *)data.lpSectionBase + wndclass->module_offset); if (!(hmod = GetModuleHandleW( module ))) hmod = LoadLibraryW( module ); + /* Combined name is used to register versioned class name. Base name part will match exactly + original class name and won't be reused from context data. */ ret = (const WCHAR *)((BYTE *)wndclass + wndclass->name_offset); + if (combined) + { + memcpy(combined, ret, *basename_offset * sizeof(WCHAR)); + strcpyW(&combined[*basename_offset], name); + ret = combined; + } if (register_class && hmod) { @@ -409,7 +419,7 @@ static CLASS *CLASS_FindClass( LPCWSTR name, HINSTANCE hinstance ) if (!name) return NULL; - name = CLASS_GetVersionedName( name, NULL, TRUE ); + name = CLASS_GetVersionedName( name, NULL, NULL, TRUE ); for (;;) { @@ -662,8 +672,8 @@ ATOM WINAPI RegisterClassW( const WNDCLASSW* wc ) */ ATOM WINAPI RegisterClassExA( const WNDCLASSEXA* wc ) { + WCHAR name[MAX_ATOM_LEN + 1], combined[MAX_ATOM_LEN + 1]; const WCHAR *classname = NULL; - WCHAR name[MAX_ATOM_LEN + 1]; ATOM atom; CLASS *classPtr; HINSTANCE instance; @@ -682,7 +692,7 @@ ATOM WINAPI RegisterClassExA( const WNDCLASSEXA* wc ) { UINT basename_offset; if (!MultiByteToWideChar( CP_ACP, 0, wc->lpszClassName, -1, name, MAX_ATOM_LEN + 1 )) return 0; - classname = CLASS_GetVersionedName( name, &basename_offset, FALSE ); + classname = CLASS_GetVersionedName( name, &basename_offset, combined, FALSE ); classPtr = CLASS_RegisterClass( classname, basename_offset, instance, !(wc->style & CS_GLOBALCLASS), wc->style, wc->cbClsExtra, wc->cbWndExtra ); } @@ -720,6 +730,7 @@ ATOM WINAPI RegisterClassExA( const WNDCLASSEXA* wc ) */ ATOM WINAPI RegisterClassExW( const WNDCLASSEXW* wc ) { + WCHAR name[MAX_ATOM_LEN + 1]; const WCHAR *classname; UINT basename_offset; ATOM atom; @@ -736,7 +747,7 @@ ATOM WINAPI RegisterClassExW( const WNDCLASSEXW* wc ) } if (!(instance = wc->hInstance)) instance = GetModuleHandleW( NULL ); - classname = CLASS_GetVersionedName( wc->lpszClassName, &basename_offset, FALSE ); + classname = CLASS_GetVersionedName( wc->lpszClassName, &basename_offset, name, FALSE ); if (!(classPtr = CLASS_RegisterClass( classname, basename_offset, instance, !(wc->style & CS_GLOBALCLASS), wc->style, wc->cbClsExtra, wc->cbWndExtra ))) return 0; @@ -789,7 +800,7 @@ BOOL WINAPI UnregisterClassW( LPCWSTR className, HINSTANCE hInstance ) GetDesktopWindow(); /* create the desktop window to trigger builtin class registration */ - className = CLASS_GetVersionedName( className, NULL, FALSE ); + className = CLASS_GetVersionedName( className, NULL, NULL, FALSE ); SERVER_START_REQ( destroy_class ) { req->instance = wine_server_client_ptr( hInstance ); diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 73a2bad..0ee7dbe 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -273,7 +273,7 @@ extern BOOL WINPROC_call_window( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar LRESULT *result, BOOL unicode, enum wm_char_mapping mapping ) DECLSPEC_HIDDEN; extern const WCHAR *CLASS_GetVersionedName(const WCHAR *classname, UINT *basename_offset, - BOOL register_class) DECLSPEC_HIDDEN; + WCHAR *combined, BOOL register_class) DECLSPEC_HIDDEN; /* message spy definitions */ diff --git a/dlls/user32/win.c b/dlls/user32/win.c index e7bbc4e..2a55ab4 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1349,7 +1349,7 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, CBT_CREATEWNDW cbtc; CREATESTRUCTW cbcs; - className = CLASS_GetVersionedName(className, NULL, TRUE); + className = CLASS_GetVersionedName(className, NULL, NULL, TRUE); TRACE("%s %s%s%s ex=%08x style=%08x %d,%d %dx%d parent=%p menu=%p inst=%p params=%p\n", unicode ? debugstr_w(cs->lpszName) : debugstr_a((LPCSTR)cs->lpszName),

1 0

Alistair Leslie-Hughes : include: Add sal.h.
by Alexandre Julliard 27 Aug '18

27 Aug '18

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

Alistair Leslie-Hughes : dpnet: Implement IDirectPlay8Peer SetSPCaps.
by Alexandre Julliard 27 Aug '18

27 Aug '18

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

← Newer
1
...
18
19
20
21
22
23
24
...
62
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2018